diff --git a/app/assets/stylesheets/admin-manifest.sass b/app/assets/stylesheets/admin-manifest.sass index 8ea1689d6..07ca92aaa 100644 --- a/app/assets/stylesheets/admin-manifest.sass +++ b/app/assets/stylesheets/admin-manifest.sass @@ -1,4 +1,5 @@ -//= require 'shared/custom-boostrap' +//= require 'shared/general-bootstrap' +//= require 'admin/admin-bootstrap' @import shared/fonts @import shared/general @import nprogress diff --git a/app/assets/stylesheets/admin/admin-bootstrap.sass b/app/assets/stylesheets/admin/admin-bootstrap.sass new file mode 100644 index 000000000..c0e9402cd --- /dev/null +++ b/app/assets/stylesheets/admin/admin-bootstrap.sass @@ -0,0 +1,13 @@ +$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif +$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif +$navbar-default-bg: #F69240 +$navbar-default-brand-color: #fff +$navbar-default-link-color: #fff +$border-radius-base: 2px +$body-bg: #F8F8F8 +$container-large-desktop: 860px +$font-size-h1: 26px +$navbar-default-link-active-color: #333 + +@import "bootstrap-sprockets" +@import "bootstrap" diff --git a/app/assets/stylesheets/admin/admin.sass b/app/assets/stylesheets/admin/admin.sass index a4fce7711..16fa27c51 100644 --- a/app/assets/stylesheets/admin/admin.sass +++ b/app/assets/stylesheets/admin/admin.sass @@ -100,7 +100,7 @@ sub .container border-radius: 3px - width: 860px + body > .container background: #F8F8F8 margin-bottom: 50px diff --git a/app/assets/stylesheets/registrar-manifest.sass b/app/assets/stylesheets/registrar-manifest.sass index ee44ea42d..780ab4e89 100644 --- a/app/assets/stylesheets/registrar-manifest.sass +++ b/app/assets/stylesheets/registrar-manifest.sass @@ -1,4 +1,5 @@ -//= require 'shared/custom-boostrap' +//= require 'shared/general-bootstrap' +//= require 'registrar/registrar-bootstrap' @import shared/fonts @import shared/general @import nprogress diff --git a/app/assets/stylesheets/registrar/registrar-bootstrap.sass b/app/assets/stylesheets/registrar/registrar-bootstrap.sass new file mode 100644 index 000000000..205141701 --- /dev/null +++ b/app/assets/stylesheets/registrar/registrar-bootstrap.sass @@ -0,0 +1,13 @@ +$navbar-default-bg: #F69240 +$navbar-default-brand-color: #fff +$navbar-default-link-color: #fff +$border-radius-base: 2px +$body-bg: #F8F8F8 +$container-large-desktop: 1040px +$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif +$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif +$font-size-h1: 26px +$navbar-default-link-active-color: #333 + +@import "bootstrap-sprockets" +@import "bootstrap" diff --git a/app/assets/stylesheets/registrar/registrar.sass b/app/assets/stylesheets/registrar/registrar.sass index f13058f3b..be1c4b937 100644 --- a/app/assets/stylesheets/registrar/registrar.sass +++ b/app/assets/stylesheets/registrar/registrar.sass @@ -1,14 +1,3 @@ -$navbar-default-bg: #F69240 -$navbar-default-brand-color: #fff -$navbar-default-link-color: #fff -$border-radius-base: 2px -$body-bg: #F8F8F8 -$container-large-desktop: 1040px -$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif -$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif -$font-size-h1: 26px -$navbar-default-link-active-color: #333 - html position: relative min-height: 100% diff --git a/app/assets/stylesheets/shared/custom-boostrap.sass b/app/assets/stylesheets/shared/general-bootstrap.sass similarity index 79% rename from app/assets/stylesheets/shared/custom-boostrap.sass rename to app/assets/stylesheets/shared/general-bootstrap.sass index 4f19c1eb1..4928ada5e 100644 --- a/app/assets/stylesheets/shared/custom-boostrap.sass +++ b/app/assets/stylesheets/shared/general-bootstrap.sass @@ -1,17 +1,3 @@ -$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif -$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif -$navbar-default-bg: #F69240 -$navbar-default-brand-color: #fff -$navbar-default-link-color: #fff -$border-radius-base: 2px -$body-bg: #F8F8F8 -$container-large-desktop: 1040px -$font-size-h1: 26px -$navbar-default-link-active-color: #333 - -@import "bootstrap-sprockets" -@import "bootstrap" - // http://stackoverflow.com/questions/18153234/center-a-column-using-twitter-bootstrap-3 .center-block float: none !important