Skip to content

Commit

Permalink
add sec images
Browse files Browse the repository at this point in the history
  • Loading branch information
miladbrown committed Jun 3, 2024
1 parent fbd9758 commit 14e4348
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 47 deletions.
40 changes: 17 additions & 23 deletions committee/adhoc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>


<link rel="shortcut icon" href="/static/favicon-32x32.png"/>



<link href="https://fonts.googleapis.com/css2?family=Crimson+Text&family=Markazi+Text:wght@600&family=Nunito+Sans&family=Raleway:wght@500&display=swap" rel="stylesheet">



<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
<link rel="stylesheet" href="/static/style.css">
Expand Down Expand Up @@ -49,7 +49,7 @@
src="/static/ucbmun_logo_high_def.png"
style="max-width: 18vh; width: 18vh;"
/></a>

<button
class="navbar-toggler"
type="button"
Expand All @@ -67,7 +67,7 @@
</li>

<li class="nav-item dropdown">

<a
class="nav-link dropdown-toggle bg-textcolor"
href="/about"
Expand Down Expand Up @@ -96,7 +96,7 @@
</li>

<li class="nav-item dropdown">

<a
class="nav-link dropdown-toggle bg-textcolor"
href="/handbook"
Expand Down Expand Up @@ -124,7 +124,7 @@
</li>

<li class="nav-item dropdown">

<a
class="nav-link dropdown-toggle bg-textcolor"
href="/committees"
Expand Down Expand Up @@ -187,9 +187,9 @@
</header>
<div id="content" class="text-light" style="padding-top:5rem !important;">
<div class="container text-center">

<div class="row" style="height: 10vh"></div>


<div class="row">
<div class="col">
Expand All @@ -201,21 +201,15 @@
<h1>
Ad&ndash;Hoc Committee of the Secretary&ndash;General
</h1>

</div>
</div>
<div class="row">
<div class="col">
<p class="text-light">
<a href="/static/BGs/AdHoc.pdf" class="bg-link" target="_blank">Background Guide</a>
<a href="/static/BGs/adhoc1.pdf" class="bg-link" target="_blank">HINT 1</a>
<br>
<a href="/static/BGs/AdHoc.pdf" class="bg-link" target="_blank">HINT 2</a>
<br>
<a href="/static/BGs/AdHoc3.pdf" class="bg-link" target="_blank">HINT 3</a>

<br>
<p>
<p>

</p>
<!--
Expand Down Expand Up @@ -260,7 +254,7 @@ <h5></h5>
<div style="text-align: left;">
<p>Hello everyone, my name is Priya Sharma (she/her), and I will be your ???????? for the Ad-Hoc Committee of the Secretary-General for UCBMUN XXVIII. I am in my fourth year at the University of California, Berkeley, and studying political economy and public policy. I have been involved in UCBMUN since the Fall of 2020 and am the organization&rsquo;s current president. I formerly served as the Secretary-General of UCBMUN XXVII as well. This Ad-Hoc aims to embody the spirit of Ad-Hoc and will provide delegates with a challenge fitting with our combined delegate styles. We will provide no further hints or suggestions on the topic prior to February 2024 and hope to provide a truly Ad-Hoc experience to all of our delegates. I am particularly enthused to see our ideas executed in a timely fashion as we address our wide-reaching topic. Join us at the Intercontinental San Francisco for a new age of Ad-Hoc, and an experience like no other.</p>

Best,
Best,
<br>
Supriya Sharma
<br>
Expand Down Expand Up @@ -296,7 +290,7 @@ <h5></h5>
<br>
Vishwaa Sofat
<br>
Ad&ndash;Hoc Committee of the Secretary&ndash;General
Ad&ndash;Hoc Committee of the Secretary&ndash;General
</div>
</div>

Expand Down Expand Up @@ -346,7 +340,7 @@ <h5></h5>
</div>
<div>
<footer class="bg-transperant footer">

<div class=container>
<span class="text-light" >
<div class="row" style="height: 5vh"></div>
Expand Down Expand Up @@ -376,8 +370,8 @@ <h5></h5>
</p>
<div class="row" style="height: 5vh"></div>
</span>


</div>
</footer>
</div>
Expand All @@ -386,4 +380,4 @@ <h5></h5>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
<script src="/static/script.js"></script>
</body>
</html>
</html>
10 changes: 1 addition & 9 deletions committee/adhoc_ga/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,7 @@ <h1>
<div class="row">
<div class="col">
<p class="text-light">
<<<<<<< HEAD
<a href="/static/BGs/AdHocGA.pdf" class="bg-link" target="_blank">Background Guide</a>
=======
<a href="/static/BGs/AdHocGA.pdf" class="bg-link" target="_blank">HINT 1</a>
<br>
<a href="/static/BGs/AdHocGA2.pdf" class="bg-link" target="_blank">HINT 2</a>
<br>
<a href="/static/BGs/AdHoc3.pdf" class="bg-link" target="_blank">HINT 3</a>
>>>>>>> 1d35b70d5ce11721199bcc5694b0d20c66c72b2e
<br>
<p>

Expand Down Expand Up @@ -388,4 +380,4 @@ <h5></h5>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
<script src="/static/script.js"></script>
</body>
</html>
</html>
14 changes: 5 additions & 9 deletions rules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
<link rel="stylesheet" href="/static/style.css">
<title>
Rules of Procedure - UCBMUN XXVIII
Coming Soon - Resources - UCBMUN XXVIII
</title>
</head>
<body style="padding-top: 0px; width: 100%; overflow-x: hidden;">
Expand Down Expand Up @@ -194,13 +194,9 @@
<div class="row filler-space"> </div>
<div class="row">
<div class="col">
<form action='/static/rop.pdf' target="_blank">
<button class="btn btn-primary" type="submit" target="_blank">View Rules of Procedure</button>
</form>
<form action='/static/conduct.pdf' target="_blank">
<button class="btn btn-primary" type="submit" target="_blank">View Code of Conduct</button>
</form>

<h4 class="display-4">
<strong> COMING SOON </strong>
</h4>
</div>
</div>
<div class="row">
Expand Down Expand Up @@ -255,4 +251,4 @@
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
<script src="/static/script.js"></script>
</body>
</html>
</html>
12 changes: 6 additions & 6 deletions staff/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ <h3>Christina Mueller</h3>
"
>
<img
src="/static/secretariat/olivia.png"
src="/static/secretariat/vish.png"
style="width: 256px; padding-bottom: 5%"
/>
<h3>Laia Malburet-Breuil</h3>
Expand Down Expand Up @@ -516,7 +516,7 @@ <h3>Nastaasia Haq</h3>
"
>
<img
src="/static/secretariat/adi.png"
src="/static/secretariat/romi.png"
style="width: 256px; padding-bottom: 5%"
/>
<h3>Romi Lisboa</h3>
Expand Down Expand Up @@ -559,7 +559,7 @@ <h3>Romi Lisboa</h3>
"
>
<img
src="/static/secretariat/shahbano.png"
src="/static/secretariat/sameera.png"
style="width: 256px; padding-bottom: 5%"
/>
<h3>Sameera Menon</h3>
Expand Down Expand Up @@ -611,7 +611,7 @@ <h3>Sameera Menon</h3>
"
>
<img
src="/static/secretariat/teeron.png"
src="/static/secretariat/audrey.png"
style="width: 256px; padding-bottom: 5%"
/>
<h3>Audrey Watson</h3>
Expand Down Expand Up @@ -649,7 +649,7 @@ <h3>Audrey Watson</h3>
"
>
<img
src="/static/secretariat/jackson.png"
src="/static/secretariat/anushka.png"
style="width: 256px; padding-bottom: 5%"
/>
<h3>Anushka Rajasekhar</h3>
Expand Down Expand Up @@ -698,7 +698,7 @@ <h3>Anushka Rajasekhar</h3>
"
>
<img
src="/static/secretariat/drishti.png"
src="/static/secretariat/nick.png"
style="width: 256px; padding-bottom: 5%"
/>
<h3>Nicholas Carone</h3>
Expand Down
Binary file added static/secretariat/anushka.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/secretariat/audrey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/secretariat/nick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/secretariat/romi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/secretariat/sameera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 14e4348

Please sign in to comment.