Skip to content

Commit

Permalink
deploy design changes!
Browse files Browse the repository at this point in the history
  • Loading branch information
wlinchiun9gmailcom committed Jan 19, 2025
1 parent f03cbf6 commit 8b057cd
Show file tree
Hide file tree
Showing 60 changed files with 2,733 additions and 742 deletions.
163 changes: 129 additions & 34 deletions about/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,105 @@
</nav>
</header>
<div id="content" class="text-light" style="padding-top:5rem !important;">
<head>
<link href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700&display=swap" rel="stylesheet">
<style>
.full-background {
/* /* all: unset; */
background-color: white;
width: 100%; /* Spans full width of parent/container */
/* min-height: 50vh; */
/* margin: 0; */
/* margin-top: 50vh; */
/* padding: 0; */
/* position: relative; */
/* display: block; */
/* overflow: hidden; */
}
.full-background, .full-background * {
color: black;
font-family: 'Merriweather', serif;

}

body {
background: url("/static/about_pics/about.jpeg") no-repeat center center fixed; */
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
padding-bottom: 0;
}
button {
background: lightgrey;
border: 3px solid white;
border-color: #FFFFFF;
color: white;
padding: 15px 32px;
text-align: center;
text-decoration: none;
display:inline-block;
}
.register-button {
display: inline-block;
padding: 15px 30px;
text-align: center;
font-size: 16px;
color: #636363;
border: 2px solid #636363;
background-color: white;
text-transform: uppercase;
text-decoration: none;
transition: all 0.3s ease-in-out;
}

.register-button:hover {
color: white;
background-color: black;
border: 2px solid black;
}
.tail-background {
/* /* all: unset; */
background-color: #032c4e;
width: 100%; /* Spans full width of parent/container */
}
</style>
</head>

<div class="container text-center">
</div>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<h1 style="font-size: 4rem; text-align: center;">
ABOUT UCBMUN
</h1>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>

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


<div class="full-background" style="">
<div class="container text-center">
<div class="row">
<div class="col">
<h4 class="display-4">
ABOUT
</h4>
</div>
</div>

Expand Down Expand Up @@ -378,43 +467,49 @@ <h3>Staff</h3>
/>
</div>
</div>
<br>
<br>
</div>
</div>
</div>

</div>
<div>
<footer class="bg-transperant footer">

<div class=container>
<span class="text-light" >
<div class="row" style="height: 5vh"></div>
<div class="row">
<div class="col" style="width: 20vw">
<a href="https://www.instagram.com/ucbmun/" target="_blank" style="color: white;">
<img
src="/static/instagram.png"
style="width: 3vw; min-width: 35px; padding: 2%;"
/>
<strong>@ucbmun</strong>
</a>
</div>
<div class="col" style="width: 20vw"></div>
<a href="https://www.facebook.com/UCBMUNconference" target="_blank" style="color: white;">
<img
src="/static/facebook.png"
style="width: 2vw; min-width: 35px; padding: 2%;"
/>
<strong>@UCBMUNconference</strong>
</a>
</div>
</div>
<div class="row" style="height: 5vh"></div>
<p style="margin-top: 12px; text-align: center; color: white">
&copy; Copyright 2023 by UC Berkeley Model UN
</p>
<div class="row" style="height: 5vh"></div>
</span>


<div class="tail-background">
<div class=container>
<span class="text-light" >
<div class="row" style="height: 5vh"></div>
<div class="row">
<div class="col" style="width: 20vw">
<a href="https://www.instagram.com/ucbmun/" target="_blank" style="color: white;">
<img
src="/static/instagram.png"
style="width: 3vw; min-width: 35px; padding: 2%;"
/>
<strong>@ucbmun</strong>
</a>
</div>
<div class="col" style="width: 20vw"></div>
<a href="https://www.facebook.com/UCBMUNconference" target="_blank" style="color: white;">
<img
src="/static/facebook.png"
style="width: 2vw; min-width: 35px; padding: 2%;"
/>
<strong>@UCBMUNconference</strong>
</a>
</div>
</div>
<div class="row" style="height: 5vh"></div>
<p style="margin-top: 12px; text-align: center; color: white">
&copy; Copyright 2023 by UC Berkeley Model UN
</p>
<div class="row" style="height: 5vh"></div>
</span>

</div>

</div>
</footer>
</div>
Expand Down
162 changes: 130 additions & 32 deletions awards/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,108 @@
</nav>
</header>
<div id="content" class="text-light" style="padding-top:5rem !important;">
<head>
<link href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700&display=swap" rel="stylesheet">
<style>
.full-background {
/* /* all: unset; */
background-color: white;
width: 100%; /* Spans full width of parent/container */
/* min-height: 50vh; */
/* margin: 0; */
/* margin-top: 50vh; */
/* padding: 0; */
/* position: relative; */
/* display: block; */
/* overflow: hidden; */
}
.full-background, .full-background * {
color: black;
font-family: 'Merriweather', serif;

}

body {
background: url("/static/about_pics/awards.jpeg") no-repeat center center fixed; */
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
padding-bottom: 0;
}
button {
background: lightgrey;
border: 3px solid white;
border-color: #FFFFFF;
color: white;
padding: 15px 32px;
text-align: center;
text-decoration: none;
display:inline-block;
}
.register-button {
display: inline-block;
padding: 15px 30px;
text-align: center;
font-size: 16px;
color: #636363;
border: 2px solid #636363;
background-color: white;
text-transform: uppercase;
text-decoration: none;
transition: all 0.3s ease-in-out;
}

.register-button:hover {
color: white;
background-color: black;
border: 2px solid black;
}
.tail-background {
/* /* all: unset; */
background-color: #032c4e;
width: 100%; /* Spans full width of parent/container */
}
</style>
</head>
<div class="container text-center">
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<h1 style="font-size: 4rem; text-align: center;">
AWARDS
</h1>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
</div>

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



<div class="full-background" style="">
<div class="container text-center">
<div class="row text-left">
<div class="col-md-2">
</div>
<div class="col-md-8">
<br>
<p><!-- This is a comment and will not appear in the rendered output --></p>
<h2>Award Guidelines</h2>
<p>UCBMUN will follow Best Delegate’s most recent system for allocating points for awards:</p>
Expand All @@ -307,48 +400,53 @@ <h2>Individual Delegate Awards</h2>
<h2>Delegation Awards</h2>
<p>Best Large Delegation, Best Small Delegation, Outstanding Large Delegation, and Outstanding Small Delegation.</p><p>Small delegations are delegations between six and twelve delegates, while large delegations are thirteen or more delegates.</p><p>Questions about award guidelines can be directed to [email protected] or [email protected].</p><p><strong>UCBMUN’s Delegation Awards are:</strong></p>
<p>Best Large Delegation, Best Small Delegation, Outstanding Large Delegation, and Outstanding Small Delegation.</p>
<p>Small delegations are delegations between eight and twelve delegates, while large delegations are thirteen or more delegates.</p>
<p>Small delegations are delegations between six and twelve delegates, while large delegations are thirteen or more delegates.</p>
<p>Questions about award guidelines can be directed to <a href="mailto:[email protected]">[email protected]</a> or <a href="mailto:[email protected]">[email protected]</a>.</p>

<br>
</div>
</div>
</div>
</div>
</div>

</div>
<div>
<footer class="bg-transperant footer">

<div class=container>
<span class="text-light" >
<div class="row" style="height: 5vh"></div>
<div class="row">
<div class="col" style="width: 20vw">
<a href="https://www.instagram.com/ucbmun/" target="_blank" style="color: white;">
<img
src="/static/instagram.png"
style="width: 3vw; min-width: 35px; padding: 2%;"
/>
<strong>@ucbmun</strong>
</a>
</div>
<div class="col" style="width: 20vw"></div>
<a href="https://www.facebook.com/UCBMUNconference" target="_blank" style="color: white;">
<img
src="/static/facebook.png"
style="width: 2vw; min-width: 35px; padding: 2%;"
/>
<strong>@UCBMUNconference</strong>
</a>
</div>
</div>
<div class="row" style="height: 5vh"></div>
<p style="margin-top: 12px; text-align: center; color: white">
&copy; Copyright 2023 by UC Berkeley Model UN
</p>
<div class="row" style="height: 5vh"></div>
</span>


<div class="tail-background">
<div class=container>
<span class="text-light" >
<div class="row" style="height: 5vh"></div>
<div class="row">
<div class="col" style="width: 20vw">
<a href="https://www.instagram.com/ucbmun/" target="_blank" style="color: white;">
<img
src="/static/instagram.png"
style="width: 3vw; min-width: 35px; padding: 2%;"
/>
<strong>@ucbmun</strong>
</a>
</div>
<div class="col" style="width: 20vw"></div>
<a href="https://www.facebook.com/UCBMUNconference" target="_blank" style="color: white;">
<img
src="/static/facebook.png"
style="width: 2vw; min-width: 35px; padding: 2%;"
/>
<strong>@UCBMUNconference</strong>
</a>
</div>
</div>
<div class="row" style="height: 5vh"></div>
<p style="margin-top: 12px; text-align: center; color: white">
&copy; Copyright 2023 by UC Berkeley Model UN
</p>
<div class="row" style="height: 5vh"></div>
</span>

</div>

</div>
</footer>
</div>
Expand Down
Loading

0 comments on commit 8b057cd

Please sign in to comment.