Skip to content

Commit

Permalink
Updating map to match new branding (#77)
Browse files Browse the repository at this point in the history
* updating map to match new branding
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch committed Sep 22, 2021
1 parent 9055e14 commit a0de38a
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 27 deletions.
10 changes: 5 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# If you are building a simple GitHub user page (https://username.github.io) then use these settings:
url: "https://us-rse.org"
baseurl: "/usrse-map" # for testing, also check .circleci/circle_urls.sh
title-img: /assets/img/rse_logo_background.svg # baseurl will be prepended
twitter-img: /assets/img/logo_600px.png # url + baseurl will be prepended
title-img: /assets/img/main_logo_transparent.png # baseurl will be prepended
twitter-img: /assets/img/main_logo_transparent.png # url + baseurl will be prepended
mapbox: "pk.eyJ1IjoidnNvY2giLCJhIjoiY2sxdXE4dGZ6MGxveTNibzBqc2E5OXpzbiJ9.OdVyKYmHLhSsk03iQoN1kw"

# Name of website
Expand All @@ -21,7 +21,7 @@ description: US Research Software Engineer Association Map

# Image to show in the navigation bar - image must be a square (width = height)
# Remove this parameter if you don't want an image in the navbar
avatar: "/assets/img/avatar-icon.png"
avatar: "/assets/img/callout.png"

# List of links in the navigation bar
navbar-links:
Expand All @@ -31,10 +31,10 @@ navbar-links:

# Personalize the colors in your website. Colour values can be any valid CSS colour

navbar-col: "#F5F5F5"
navbar-col: "#741755"
navbar-text-col: "#ffffff"
navbar-children-col: "#500e3d"
page-col: "#FFFFFF"
page-col: "#741755"
link-col: "#008AFF"
hover-col: "#0085A1"
footer-col: "#F5F5F5"
Expand Down
2 changes: 1 addition & 1 deletion _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</li>
{% endif %}
{% endfor %}
<li><a href="https://github.com/{{ site.github_url }}" class="no-after" target="_blank"> github</i></a></li>
<li><a href="https://github.com/{{ site.github_url }}" class="no-after" target="_blank"> GitHub</i></a></li>
<li><a href="{{ site.url }}/search" class="no-after" id="search-toggle"> <i class="fa fa-search" style="margin-right:20px"></i></a></li>
</ul>
</div>
Expand Down
16 changes: 8 additions & 8 deletions assets/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

/* make logo larger than the default, and add shadow */
.navbar-custom .navbar-brand-logo img {
height: 150px;
-webkit-box-shadow: 0 0 2px rgba(0, 0, 0, .8);
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, .8);
box-shadow: 0 0 3px rgba(0, 0, 0, .8);
height: 180px;
padding-top: 65px;
}

/* make headers bold instead of extra-bold */
h1,h2,h3,h4,h5,h6 {
font-weight: 700;
font-weight: 400;
}
.navbar-custom .navbar-brand,
.navbar-custom .nav li a {
font-weight: 700;
font-weight: 400;
font-family: -apple-system,BlinkMacSystemFont,"Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Arial,sans-serif;
}
}
.post-preview .post-read-more {
font-weight: 700;
font-weight: 400;
}
.pager li a {
font-weight: 700;
font-weight: 400;
}

13 changes: 1 addition & 12 deletions assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ body {
color: #404040;
position: relative;
background-color: {{ site.page-col }};
{% if site.page-img %}background-image: url({{ site.page-img }});
background-attachment: fixed;{% endif %}
}
p {
line-height: 1.5;
Expand Down Expand Up @@ -120,17 +118,11 @@ img {

.navbar-custom {
background-color: {{ site.navbar-col }};
border-bottom: 1px solid #EAEAEA;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
{% if site.navbar-img %}
background-image: url({{ site.navbar-img }});
background-attachment: fixed;
{% endif %}
}

.navbar-custom .nav li a {
text-transform: uppercase;
font-size: 12px;
font-size: 18px;
letter-spacing: 1px;
}

Expand Down Expand Up @@ -168,7 +160,6 @@ img {

@media only screen and (min-width: 768px) {
.navbar-custom {
padding: 20px 0;
-webkit-transition: background .5s ease-in-out,padding .5s ease-in-out;
-moz-transition: background .5s ease-in-out,padding .5s ease-in-out;
transition: background .5s ease-in-out,padding .5s ease-in-out;
Expand Down Expand Up @@ -241,7 +232,6 @@ img {
}
.navbar-custom .nav .navlinks-container .navlinks-children a {
display: block;
padding: 10px;
padding-left: 30px;
background-color: {{ site.navbar-children-col }};
text-decoration: none !important;
Expand Down Expand Up @@ -701,7 +691,6 @@ code table, code table td, code table th, code table tbody, code table tr,
td.gutter pre {
padding: 0;
border: none;
background-color: #fff;
}
.highlight > pre {
padding: 0;
Expand Down
Binary file added assets/img/callout-white.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/callout.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/main_logo_transparent.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pages/map.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permalink: /
<style>
#map {
position: absolute;
top: 90px;
top: 50px;
width: 100%;
min-height:900px;
bottom:0px;
Expand Down

0 comments on commit a0de38a

Please sign in to comment.