From 268524597c8a4001f2965201dbff4c2dea3cb086 Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Mon, 3 Jun 2013 11:41:06 -0700 Subject: [PATCH] fix a few text weights and moved ugly mixins to mixin file and implemented in shame file --- lms/static/sass/_shame.scss | 13 +++++++++++++ lms/static/sass/base/_mixins.scss | 8 ++++++++ lms/static/sass/base/_variables.scss | 12 ------------ lms/static/sass/multicourse/_account.scss | 12 ++---------- lms/static/sass/shared/_footer.scss | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/lms/static/sass/_shame.scss b/lms/static/sass/_shame.scss index d3cc0b9a80..ac6ac24b41 100644 --- a/lms/static/sass/_shame.scss +++ b/lms/static/sass/_shame.scss @@ -98,3 +98,16 @@ } } } + +//-------------------------------------- +// The Following is to enable themes to +// display H1s on login and register pages +//-------------------------------------- +.view-login .introduction header h1, +.view-register .introduction header h1 { + @include login_register_h1_style; +} + +footer .references { + @include footer_references_style; +} \ No newline at end of file diff --git a/lms/static/sass/base/_mixins.scss b/lms/static/sass/base/_mixins.scss index 97703e8f0f..0b2b82dad8 100644 --- a/lms/static/sass/base/_mixins.scss +++ b/lms/static/sass/base/_mixins.scss @@ -42,3 +42,11 @@ overflow: hidden; display: block; } + + +//----------------- +// Theme Mixin Styles +//----------------- +@mixin login_register_h1_style {} + +@mixin footer_references_style {} \ No newline at end of file diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 35629afbf9..f4d049e49a 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -133,15 +133,3 @@ $login-banner-image: 'transparent url("../images/bg-banner-login.png") 0 0 no-re $register-banner-image: 'transparent url("../images/bg-banner-register.png") 0 0 no-repeat'; $video-thumb-url: '../images/courses/video-thumb.jpg'; - -//----------------- -// Mixin Styles -// -// THIS MIGHT BE A GOOD WAY TO DEAL WITH LARGE CHUNKS OF SASS THAT WE WANT TO ALLOW THEMING ON... -// WE MAY WANT TO SEPERATE THEM OUT INTO ITS OWN "MIXINS" SCSS FILE -//----------------- -@mixin login_register_h1_style {} - -@mixin footer_references_style { - margin: -10px 0 0 0; -} diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index 7d3a3c5696..818dcc9fe9 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -20,7 +20,7 @@ .heading-2 { font-size: 25px; margin: 0 0 $baseline 0; - font-weight: bold; + font-weight: 300; text-transform: uppercase; color: $link-color; } @@ -143,7 +143,7 @@ &:link, &:visited, &:hover, &:active { color: $link-color; - font-weight: bold; + font-weight: 400; text-decoration: none !important; font-family: $sans-serif; } @@ -494,10 +494,6 @@ height: 120px; border-bottom: 1px solid $m-gray; background: $login-banner-image; - - h1 { - @include login_register_h1_style; - } } } } @@ -512,10 +508,6 @@ height: 120px; border-bottom: 1px solid $m-gray; background: transparent url("../images/bg-banner-register.png") 0 0 no-repeat; - - h1 { - @include login_register_h1_style; - } } } } diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index 55d9d07fd7..3c89c54faf 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -82,7 +82,7 @@ // references .references { - @include footer_references_style; + margin: -10px 0 0 0; width: flex-grid(4,12); float: right;