lib/generators/chaltron/templates/app/assets/stylesheets/chaltron_custom.scss in chaltron-1.1.7 vs lib/generators/chaltron/templates/app/assets/stylesheets/chaltron_custom.scss in chaltron-2.0.0

- old
+ new

@@ -1,22 +1,36 @@ /* * See http://getbootstrap.com/docs/4.0/getting-started/theming to learn customization */ - $font-size-base: 0.85rem; +$font-size-base: 0.85rem; // $theme-colors: ( // 'primary': #343A40, // Bootstrap dark color // 'primary': #6C757D // Bootstrap secondary color // ); - @import 'chaltron'; +// to keep space for navbars (top and bottom) +div#content { + margin-top: 2.7em; + margin-bottom: 2.7em; +} - // to keep space for navbars (top and bottom) - div#content { - margin-top: 2.7em; - margin-bottom: 2.7em; - } +.flash-container { + top: 4em; +} - .flash-container { - top: 4em; - } +@import 'bootstrap'; + +// font-awesome +@import 'font-awesome-sprockets'; +@import 'font-awesome'; + +// bootstrap_form +@import 'rails_bootstrap_forms'; + +// nprogress +@import 'nprogress'; +@import 'nprogress-bootstrap'; + +// at last +@import 'chaltron';