Permalink
Browse files

change the navbar color to match the footer

  • Loading branch information...
birarda committed Sep 9, 2016
1 parent c6557f7 commit cfa91f4b77b1bbee65f686af454ae75e3d6290bf
View
@@ -62,6 +62,9 @@ gem 'rails_admin', '>= 1.0.0.rc'
# dalli for rails caching
gem 'dalli'
# use inline SVG to inline discord logo
gem 'inline_svg'
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
View
@@ -134,6 +134,10 @@ GEM
tilt
http_parser.rb (0.6.0)
i18n (0.7.0)
inline_svg (0.11.0)
activesupport (>= 4.0)
loofah (>= 2.0)
nokogiri (~> 1.6)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
@@ -307,6 +311,7 @@ DEPENDENCIES
guard-annotate
guard-livereload
guard-rails
inline_svg
jbuilder (~> 2.5)
jquery-rails
kaminari
View
@@ -31,7 +31,7 @@
# zeus: false # enables zeus gem.
# CLI: 'rails server' # customizes runner command. Omits all options except `pid_file`!
guard 'rails' do
guard 'rails', host: '0.0.0.0' do
watch('Gemfile.lock')
watch(%r{^(config|lib)/.*})
end
@@ -16,6 +16,7 @@
@import "bootstrap-sprockets";
$brand-primary: #243D64;
$highlight-color: #D1E8FF;
@import "bootstrap";
@@ -9,7 +9,7 @@ footer {
#logo {
text-align: center;
margin-top: 5px;
margin-top: 8px;
img {
height: 25px;
}
@@ -28,14 +28,30 @@ footer {
.icon {
color: white;
&:hover {
color: $highlight-color;
}
font-size: 30px;
&.ion-social-reddit {
position: relative;
top: -2px;
}
}
#discord-svg {
position: relative;
top: -6px;
top: 10px;
left: -5px;
height: 40px;
&:hover {
.st0 {
fill: $highlight-color;
}
}
}
}
}
@@ -1,18 +1,57 @@
.navbar.navbar-default {
// background-color: $brand-primary;
//
// li a {
// color: white;
// }
//
// .dropdown-menu {
// background-color: $brand-primary;
// }
a.navbar-brand {
img {
height: 25px;
margin-top: -2px;
.navbar-header {
background-color: $brand-primary;
}
$muted-blue: #415770;
.navbar-toggle {
border-color: $muted-blue;
.icon-bar {
background-color: white;
}
&:hover, &:focus {
background-color: $muted-blue;
}
}
@media(min-width: $screen-sm-min) {
background-color: $brand-primary;
.active, .open {
> a {
background-color: $muted-blue;
color: $highlight-color;
&:hover, &:focus {
background-color: $muted-blue;
color: $highlight-color;
}
}
}
li a {
color: white;
&:hover {
color: $highlight-color;
}
}
.dropdown-menu {
li a {
color: #333333;
}
}
}
}
a.navbar-brand {
img {
height: 25px;
margin-top: -2px;
}
}
@@ -7,7 +7,7 @@ footer
= link_to 'https://reddit.com/r/RocketLeagueExchange', target: '_blank' do
i.icon.ion-social-reddit
= link_to 'https://discord.gg/3U87mfj', target: '_blank' do
= image_tag 'discord.svg', id: 'discord-svg'
= inline_svg 'discord.svg', id: 'discord-svg'
end
#logo
= link_to root_path do
@@ -12,7 +12,7 @@ end
| items available via in-game Player-to-Player trading.
br
| Contact the owner on their platform or look for them in
= link_to 'our Discord channel', 'https://discord.gg/3U87mfj'
= link_to 'our Discord channel', 'https://discord.gg/3U87mfj', target: '_blank'
| to discuss a trade.
.row

0 comments on commit cfa91f4

Please sign in to comment.