-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Removed twitter-bootstrap-rails and added bootstrap-sass port - Updated Gemfile - Added necessary include files. Removed `require`s and added `@import`s - Moved custom wheel specific styles to new file `base`. - Added bootstrap custom instead of the whole file for easily removing unwanted stuff per project - bootstrap_flash doesn’t work anymore now that gem is changed. Fixed this by adding custom erb. Added this file to views/shared - changed bootstrap_flash calls to partial calls - Added font-awesome SASS gem - Updated Gemfile.lock after resolving conflicts - Deprecation warning. Removed by renaming .css.scss to .scss - Move sass require in gemfile - Split css in respective files - Use 1.9 hash - convert flash key to string, to avoid string/symbol discrepencies - Cleanup empty class
- Loading branch information
1 parent
4dc3cb3
commit c278fa1
Showing
19 changed files
with
234 additions
and
186 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
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 @@ | ||
| //= require jquery | ||
| //= require jquery_ujs | ||
| //= require twitter/bootstrap | ||
| //= require bootstrap-sprockets | ||
| // | ||
| //= require_tree ./common |
This file was deleted.
Oops, something went wrong.
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,11 @@ | ||
| @import "bootstrap-sprockets"; | ||
| @import "bootstrap/custom"; | ||
|
|
||
| @import "common/base"; | ||
| @import "common/alerts"; | ||
|
|
||
| @import "font-awesome-sprockets"; | ||
| @import "font-awesome"; | ||
|
|
||
| @import "bootstrap/devise_forms"; | ||
| @import "environment/ribbon"; |
File renamed without changes.
File renamed without changes.
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,50 @@ | ||
| // Core variables and mixins | ||
| @import "bootstrap/variables"; | ||
| @import "bootstrap/mixins"; | ||
|
|
||
| // Reset and dependencies | ||
| @import "bootstrap/normalize"; | ||
| @import "bootstrap/print"; | ||
| @import "bootstrap/glyphicons"; | ||
|
|
||
| // Core CSS | ||
| @import "bootstrap/scaffolding"; | ||
| @import "bootstrap/type"; | ||
| @import "bootstrap/code"; | ||
| @import "bootstrap/grid"; | ||
| @import "bootstrap/tables"; | ||
| @import "bootstrap/forms"; | ||
| @import "bootstrap/buttons"; | ||
|
|
||
| // Components | ||
| @import "bootstrap/component-animations"; | ||
| @import "bootstrap/dropdowns"; | ||
| @import "bootstrap/button-groups"; | ||
| @import "bootstrap/input-groups"; | ||
| @import "bootstrap/navs"; | ||
| @import "bootstrap/navbar"; | ||
| @import "bootstrap/breadcrumbs"; | ||
| @import "bootstrap/pagination"; | ||
| @import "bootstrap/pager"; | ||
| @import "bootstrap/labels"; | ||
| @import "bootstrap/badges"; | ||
| @import "bootstrap/jumbotron"; | ||
| @import "bootstrap/thumbnails"; | ||
| @import "bootstrap/alerts"; | ||
| @import "bootstrap/progress-bars"; | ||
| @import "bootstrap/media"; | ||
| @import "bootstrap/list-group"; | ||
| @import "bootstrap/panels"; | ||
| @import "bootstrap/responsive-embed"; | ||
| @import "bootstrap/wells"; | ||
| @import "bootstrap/close"; | ||
|
|
||
| // Components w/ JavaScript | ||
| @import "bootstrap/modals"; | ||
| @import "bootstrap/tooltip"; | ||
| @import "bootstrap/popovers"; | ||
| @import "bootstrap/carousel"; | ||
|
|
||
| // Utility classes | ||
| @import "bootstrap/utilities"; | ||
| @import "bootstrap/responsive-utilities"; |
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,59 @@ | ||
| .bootstrap-center-form { | ||
| padding: 19px 29px 29px; | ||
| margin: 0 auto 20px; | ||
| background-color: #fff; | ||
| border: 1px solid #e5e5e5; | ||
| -webkit-border-radius: 5px; | ||
| -moz-border-radius: 5px; | ||
| border-radius: 5px; | ||
| -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05); | ||
| -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05); | ||
| box-shadow: 0 1px 2px rgba(0,0,0,.05); | ||
|
|
||
| .form-controls { | ||
| margin-top: 1em; | ||
| margin-bottom: 1em; | ||
| } | ||
|
|
||
| .form-buttons { | ||
| margin-top: 1em; | ||
| margin-bottom: 1em; | ||
| } | ||
|
|
||
| h2 { | ||
| margin-top: 10px; | ||
| margin-bottom: 30px; | ||
| } | ||
| } | ||
|
|
||
| .bootstrap-center-form-small { | ||
| @extend .bootstrap-center-form; | ||
| max-width: 300px; | ||
| } | ||
|
|
||
| .bootstrap-center-form-medium { | ||
| @extend .bootstrap-center-form; | ||
| max-width: 500px; | ||
| } | ||
|
|
||
| .sessions, .passwords, .registrations { | ||
| background: #e4eaef; | ||
|
|
||
| .navbar { | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| .page { | ||
| padding-top: 40px; | ||
| } | ||
|
|
||
| .user_remember_me { | ||
| position: relative; | ||
| left: 20px; | ||
| } | ||
| .devise-links { | ||
| border-top: 1px solid #e4eaef; | ||
| padding: 10px 30px; | ||
| margin: 0px -30px -20px; | ||
| } | ||
| } |
File renamed without changes.
Oops, something went wrong.