Skip to content
This repository has been archived by the owner on Oct 31, 2020. It is now read-only.

Commit

Permalink
Merge pull request #8 from projectblacklight/issue2
Browse files Browse the repository at this point in the history
Fix #2; Change color scheme.
  • Loading branch information
jcoyne authored Oct 16, 2017
2 parents 10ddad7 + 59db159 commit d99882c
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/assets/stylesheets/blacklight.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import 'blacklight/overwrite_bootstrap';
@import 'bootstrap';

@import 'blacklight/overrides';
Expand Down
28 changes: 28 additions & 0 deletions app/assets/stylesheets/blacklight/overwrite_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

$color1: #ffc1a7; // Salmon
$color2: #337ab7; // Dark blue
$color3: #a3871e; // Gold


$gray-600: #868e96 !default;
$cyan: #17a2b8 !default;
$yellow: #ffc107 !default;
$red: #dc3545 !default;
$gray-100: #f8f9fa !default;
$gray-800: #343a40 !default;

$theme-colors: () !default;
$theme-colors: map-merge((
"primary": $color2,
"secondary": $gray-600,
"success": $color3,
"info": $cyan,
"warning": $yellow,
"danger": $red,
"light": $gray-100,
"dark": $gray-800
), $theme-colors);

.topbar {
background-color: $color1;
}
18 changes: 18 additions & 0 deletions app/views/shared/_header_navbar.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<nav class="navbar navbar-expand-md navbar-dark topbar" role="navigation">
<div class="<%= container_classes %>">
<%= link_to application_name, root_path, class: "navbar-brand" %>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
<%= render 'shared/user_util_links' %>
</div>
</div>
</nav>

<div class="navbar-search navbar navbar-light bg-faded" role="navigation">
<div class="<%= container_classes %>">
<%= render_search_bar %>
</div>
</div>

0 comments on commit d99882c

Please sign in to comment.