Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from pikesley/styles
Styles
- Loading branch information
Showing
8 changed files
with
130 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| [](https://travis-ci.org/pikesley/CorrectionDose) | ||
| [](https://gemnasium.com/pikesley/CorrectionDose) | ||
| [](https://coveralls.io/r/pikesley/CorrectionDose) | ||
| [](https://codeclimate.com/github/pikesley/CorrectionDose) | ||
| [](https://travis-ci.org/pikesley/correctiondose) | ||
| [](https://gemnasium.com/pikesley/correctiondose) | ||
| [](https://coveralls.io/r/pikesley/correctiondose) | ||
| [](https://codeclimate.com/github/pikesley/correctiondose) | ||
| [](http://pikesley.mit-license.org) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,71 @@ | ||
| @import "bootstrap"; | ||
| @import 'colours'; | ||
| @import 'fonts'; | ||
| @import 'bootstrap'; | ||
|
|
||
| /* Dragones below this line */ | ||
|
|
||
| nav { | ||
| background-color: $brand-primary; | ||
| } | ||
|
|
||
| .navbar-default .navbar-nav > .active > a { | ||
| } | ||
|
|
||
| .navbar { | ||
| border: 0px; | ||
| background-color: $gray-lighter; | ||
| } | ||
|
|
||
| /* navbar */ | ||
| .navbar-default { | ||
| } | ||
| /* title */ | ||
| .navbar-default .navbar-brand { | ||
| color: white; | ||
| } | ||
| .navbar-default .navbar-brand:hover, | ||
| .navbar-default .navbar-brand:focus { | ||
| } | ||
| /* link */ | ||
| .navbar-default .navbar-nav > li > a { | ||
| color: white; | ||
| } | ||
| .navbar-default .navbar-nav > li > a:hover, | ||
| .navbar-default .navbar-nav > li > a:focus { | ||
| } | ||
| .navbar-default .navbar-nav > .active > a, | ||
| .navbar-default .navbar-nav > .active > a:hover, | ||
| .navbar-default .navbar-nav > .active > a:focus { | ||
| opacity: 0.5; | ||
| } | ||
| .navbar-default .navbar-nav > .open > a, | ||
| .navbar-default .navbar-nav > .open > a:hover, | ||
| .navbar-default .navbar-nav > .open > a:focus { | ||
| opacity: 0.5; | ||
| } | ||
|
|
||
| .navbar { | ||
| -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; | ||
| } | ||
|
|
||
| /* mobile version */ | ||
| .navbar-default .navbar-toggle { | ||
| border-color: #DDD; | ||
| } | ||
| .navbar-default .navbar-toggle:hover, | ||
| .navbar-default .navbar-toggle:focus { | ||
| background-color: #DDD; | ||
| } | ||
| .navbar-default .navbar-toggle .icon-bar { | ||
| background-color: #CCC; | ||
| } | ||
|
|
||
| @media (max-width: 767px) { | ||
| .navbar-default .navbar-nav .open .dropdown-menu > li > a { | ||
| color: #777; | ||
| } | ||
| .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, | ||
| .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { | ||
| color: #333; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| $brand-primary: #fa8100; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| @import url(http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css); | ||
| @import url('http://fonts.googleapis.com/css?family=NTR'); | ||
|
|
||
| $font-family-sans-serif: "NTR", sans-serif; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,26 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>RollerCoaster</title> | ||
| <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> | ||
| <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> | ||
| <%= csrf_meta_tags %> | ||
| </head> | ||
| <body> | ||
| <% if signed_in? %> | ||
| Signed in as: <%= current_user.email %> | ||
| <%= button_to 'Sign out', sign_out_path, method: :delete %> | ||
| <% else %> | ||
| <%= link_to 'Sign in', sign_in_path %> | ||
| <% end %> | ||
|
|
||
| <div id="flash"> | ||
| <% flash.each do |key, value| %> | ||
| <div class="flash <%= key %>"><%= value %></div> | ||
| <% end %> | ||
| <head> | ||
| <title>RollerCoaster</title> | ||
| <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> | ||
| <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> | ||
| <%= csrf_meta_tags %> | ||
| </head> | ||
| <body> | ||
| <%= render 'shared/nav' %> | ||
| <div class='container'> | ||
| <div class='row'> | ||
| <div class='col-md-2'></div> | ||
| <div class='col-md-8'> | ||
| <%= yield %> | ||
| </div> | ||
| <div class='col-md-2'></div> | ||
| </div> | ||
| <div id="flash"> | ||
| <% flash.each do |key, value| %> | ||
| <div class="flash <%= key %>"><%= value %></div> | ||
| <% end %> | ||
| </div> | ||
| </div> | ||
| <%= yield %> | ||
|
|
||
| </body> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,25 @@ | ||
| <nav class='navbar navbar-default' role='navigation'> | ||
| <!-- Brand and toggle get grouped for better mobile display --> | ||
| <div class='navbar-header'> | ||
| <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#navbar-collapse'> | ||
| <span class='sr-only'>Toggle navigation</span> | ||
| <span class='icon-bar'></span> | ||
| <span class='icon-bar'></span> | ||
| <span class='icon-bar'></span> | ||
| </button> | ||
| </div> | ||
| <div class='collapse navbar-collapse' id='navbar-collapse'> | ||
| <div class='container-fluid'> | ||
| <!-- Brand and toggle get grouped for better mobile display --> | ||
| <div class='navbar-header'> | ||
| <!-- <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#navbar-collapse'> | ||
| <span class='sr-only'>Toggle navigation</span> | ||
| <span class='icon-bar'></span> | ||
| <span class='icon-bar'></span> | ||
| <span class='icon-bar'></span> | ||
| </button> --> | ||
| <% if signed_in? %> | ||
| <p class="navbar-text navbar-right"> | ||
| Signed in as <%= current_user.email %> | ||
| <%= link_to 'Sign out', sign_out_path, method: :delete %> | ||
| </p> | ||
| <% else %> | ||
| <%= link_to 'Sign in', sign_in_path %> | ||
| <% end %> | ||
| </div> | ||
|
|
||
| <!-- mobile --> | ||
| <ul class='nav hidden-md hidden-lg mobile' role='tablist'> | ||
| <li> | ||
| derp | ||
| </li> | ||
| </ul> | ||
|
|
||
| <!-- desktop --> | ||
| <ul class='nav nav-stacked nav-pills pull-right hidden-xs hidden-sm' role='tablist'> | ||
| <li> | ||
| derp | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </nav | ||
| <!-- Collect the nav links, forms, and other content for toggling --> | ||
| <div class='collapse navbar-collapse' id='navbar-collapse'> | ||
| </div><!-- /.navbar-collapse --> | ||
| </div><!-- /.container-fluid --> | ||
| </nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters