diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
commit | e4ae559d8189519586e044238196ee45b2a10c6b (patch) | |
tree | 3d4977292aa234ea93ce604095f13d50484250a1 /app/assets/stylesheets/custom.css.scss | |
parent | 2f450dd30bb210fdc4cb8899c72e6da945a163ba (diff) | |
parent | da95cb4f0f48731c2713c61f17b522b048647fd1 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/layouts/application.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/assets/stylesheets/custom.css.scss')
-rw-r--r-- | app/assets/stylesheets/custom.css.scss | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index b0692d8..25cac21 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -1 +1,6 @@ -@import "bootstrap";
\ No newline at end of file +@import "bootstrap"; + +header > nav { + @extend .navbar; + @extend .navbar-inverse; +} |