diff --git a/.gitignore b/.gitignore index f129506..cd60056 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ app/views/branded/* app/assets/**/* config/locales/static_pages/*.yml +app/assets/stylesheets/*-branded.scss # Ignore gemfile.lock #Gemfile.lock diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index df35cd6..848fba6 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -19,14 +19,20 @@ *= require jquery-ui-dist/jquery-ui.structure.min *= require jquery-ui-dist/jquery-ui.theme.min */ - @import "font-awesome"; +/* SASS Variables */ @import "dmproadmap"; -@import "dmproadmap/base"; +@import "dmproadmap-branded"; /* Place your customizations to the SASS variables in this file */ +/* These will eventually go away once Boostrap is in place */ +@import "dmproadmap/base"; @import "dmproadmap/tabs"; @import "dmproadmap/accordions"; @import "dmproadmap/modals"; @import "dmproadmap/tables"; -@import "dmproadmap/forms"; \ No newline at end of file +@import "dmproadmap/forms"; + +/* Overrides to Bootstrap styling */ +@import "overrides"; +@import "overrides-branded"; /* Place your customizations to the general CSS in this file */ diff --git a/app/assets/stylesheets/dmproadmap-branded.scss.example b/app/assets/stylesheets/dmproadmap-branded.scss.example new file mode 100644 index 0000000..8ecace1 --- /dev/null +++ b/app/assets/stylesheets/dmproadmap-branded.scss.example @@ -0,0 +1,6 @@ +/* This file is intended for you to use to override the sites SASS variables */ +/* This file is loaded immediately after dmproadmap.scss and before dmproadmap.scss */ +/* ----------------------------------------------------------------------------------- */ + +$background-color: #FFF; +$color: $dark-grey; /* This example makes use of one of the variables defined in dmproadmap.scss */ \ No newline at end of file diff --git a/app/assets/stylesheets/dmproadmap.scss b/app/assets/stylesheets/dmproadmap.scss index 86aec57..803f2f1 100644 --- a/app/assets/stylesheets/dmproadmap.scss +++ b/app/assets/stylesheets/dmproadmap.scss @@ -44,4 +44,17 @@ $header-logo-top-margin: 20px; $header-logo-left-margin: 10px; -$body-background: $white; \ No newline at end of file +$body-background: $white; + + + +/* EVERYTHING BELOW THIS LINE IS SPECIFIC TO THE BOOSTRAP 3.x IMPLEMENTATION OF ROADMAP */ +/* ------------------------------------------------------------------------------------ */ +/* SASS variables */ +$background-color: #FFF; + +$footer-background: $background-color; +$footer-color: $medium-grey; +$footer-margin-top: 40px; + + diff --git a/app/assets/stylesheets/overrides-branded.scss.example b/app/assets/stylesheets/overrides-branded.scss.example new file mode 100644 index 0000000..ea1c275 --- /dev/null +++ b/app/assets/stylesheets/overrides-branded.scss.example @@ -0,0 +1,2 @@ +/* Place your overrides to the generic site's styling here. */ +/* -------------------------------------------------------- */