Skip to content

Commit

Permalink
Restore logo to header
Browse files Browse the repository at this point in the history
Connected to UCLALibrary/ursus#15
Connected to UCLALibrary/amalgamated-samvera#132
  • Loading branch information
little9 committed Oct 18, 2018
1 parent 6a6c4ca commit 6373cc2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
10 changes: 5 additions & 5 deletions app/assets/stylesheets/ursus.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import 'ursus/fonts';
@import 'ursus/colors';
@import 'ursus/body';
@import 'ursus/buttons';
@import 'ursus/navbar';
@import 'ursus/colors';
@import 'ursus/facets';
@import 'ursus/facets';
@import 'ursus/fonts';
@import 'ursus/footer';
@import 'ursus/body';
@import 'ursus/logo';
@import 'ursus/facets';
@import 'ursus/navbar';
7 changes: 4 additions & 3 deletions app/assets/stylesheets/ursus/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'colors';

.footer {
background-color: $ucla-secondary-blue-dark;
// height: 100px;
Expand All @@ -8,14 +10,13 @@
}

a:hover {
color: $ucla-gold;
color: $ucla-tertiary-yellow;
text-decoration: none;
}

.footer-links {
padding-top: 15px;
text-align: center;
font-size: 12px;
}

hr {
Expand All @@ -37,4 +38,4 @@
// float: right;
// margin: 1em;
// margin-top: 2em;
// }
// }
8 changes: 8 additions & 0 deletions app/assets/stylesheets/ursus/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@
margin-left: 0 !important;
background: transparent image_url('logo.svg') no-repeat top left !important;
}

.nav-link:hover {
color: $ucla-tertiary-yellow !important;
}

.navbar-right {
margin-top:10px;
}
4 changes: 4 additions & 0 deletions app/views/_user_util_links.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<ul class="navbar-nav navbar-right nav">
<li class="nav-item"><a class="nav-link" href="http://www.library.ucla.edu">UCLA Library</a></li>
<li class="nav-item"><a class="nav-link" href="http://digital2.library.ucla.edus">UCLA Library Digital Collections</a></li>
</ul>

0 comments on commit 6373cc2

Please sign in to comment.