spec/dummy/app/assets/stylesheets/application.css.scss in message_train-0.5.2 vs spec/dummy/app/assets/stylesheets/application.css.scss in message_train-0.5.3

- old
+ new

@@ -1,35 +1,19 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any styles - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new - * file per style scope. - * - *= require_tree . - *= require_self - */ +// 'bootstrap-sprockets' must be imported before 'bootstrap' and 'bootstrap/variables' +@import 'bootstrap-sprockets'; +@import 'bootstrap'; +@import 'message_train'; -// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables" -@import "bootstrap-sprockets"; -@import "bootstrap"; -@import "message_train"; - .navbar-header { overflow: hidden; } .navbar-brand { display: block; width: 300px; } .logo { - height: 2em; - margin: -0.5em 1em -0.5em 0; float: left; -} \ No newline at end of file + height: 2em; + margin: -.5em 1em -.5em 0; +}