Skip to content
This repository was archived by the owner on Jul 21, 2019. It is now read-only.

Add more styles #113

Merged
mattstratton merged 3 commits into from
Jan 18, 2017
Merged

Add more styles #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
befd6f7
Add some more CSS styles
mattstratton Jan 18, 2017
8daf3db
Add some more CSS styles
mattstratton Jan 18, 2017
544db7c
Merge branch 'add-more-styles' of github.com:devopsdays/devopsdays-th…
mattstratton Jan 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
454 changes: 227 additions & 227 deletions config.codekit3
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions layouts/partials/global_navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@


<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
<nav class="navbar navbar-toggleable-md navbar-light">

<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="#">
<a class="navbar-brand" href="/">
<img src="/img/devopsdays-brain.png" width="30" height="30" class="d-inline-block align-top" alt="">
DevOpsDays
</a>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item global-navigation"><a class="nav-link" href="/contact">Contact</a></li>
<li class="nav-item global-navigation"><a class="nav-link" href="/events">Events</a></li>
<li class="nav-item global-navigation"><a class="nav-link" href="/blog">Blog</a></li>
<li class="nav-item global-navigation"><a class="nav-link" href="/sponsor">Sponsor</a></li>
<li class="nav-item global-navigation"><a class="nav-link" href="/speaking">Speaking</a></li>
<li class="nav-item global-navigation"><a class="nav-link" href="/organizing">Organizing</a></li>
<li class="nav-item global-navigation"><a class = "nav-link" href="/contact">Contact</a></li>
<li class="nav-item global-navigation"><a class = "nav-link" href="/events">Events</a></li>
<li class="nav-item global-navigation"><a class = "nav-link" href="/blog">Blog</a></li>
<li class="nav-item global-navigation"><a class = "nav-link" href="/sponsor">Sponsor</a></li>
<li class="nav-item global-navigation"><a class = "nav-link" href="/speaking">Speaking</a></li>
<li class="nav-item global-navigation"><a class = "nav-link" href="/organizing">Organizing</a></li>
</ul>
</div>
</nav>
2 changes: 1 addition & 1 deletion layouts/partials/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
</script>

<script type="text/javascript" src="https://maps-api-ssl.google.com/maps/api/js?key=AIzaSyC1bvNK9qFJGEhoWNbQuojmJJ1Tg0DoOew"></script>
<script type="text/javascript" src="/js/googlemaps_label.js"></script>
<script type="text/javascript" src="/js/googlemaps_label-min.js"></script>
<!-- <script type="text/javascript" src="/js/googlemaps_content.js"></script> -->
<div class="embed-responsive embed-responsive-16by9">
<div id="map_canvas" class="embed-responsive-item"></div>
Expand Down
6 changes: 4 additions & 2 deletions static/css/site.css
View file
Open in desktop

Large diffs are not rendered by default.

106 changes: 105 additions & 1 deletion static/css/site.css.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions static/js/googlemaps_label-min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions static/scss/custom-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$navbar-light-color: #0082AB;
22 changes: 14 additions & 8 deletions static/scss/custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ body {
.nav-link {
color: #0082AB;
}

.global-navigation {
font-family: 'Roboto', sans-serif;
font-weight: 900;
Expand All @@ -39,14 +40,26 @@ body {
text-transform: uppercase;
}

.navbar>li>a{
color: red;
}

.event-navigation {
font-family: 'Roboto Condensed', sans-serif;
font-weight: 300;
font-size: 9pt;
color: #000000;
// color: #000000;
color: green;
text-transform: uppercase;
}

.navbar-light {
background-color:transparent !important;
border-color:transparent;
background-image:none;
box-shadow:none;
}

/* Left navigation */
/* TODO: all of these left-nav elements can probably be collapsed */
.left-nav-navs {
Expand Down Expand Up @@ -179,10 +192,3 @@ div.panel {
overflow: hidden;
transition: max-height 0.2s ease-out;
}

.navbar-light {
background-color:transparent !important;
border-color:transparent;
background-image:none;
box-shadow:none;
}