From 63960ee4a276941e1a70b91c1baa3b2c55f19234 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 11:26:34 -0400 Subject: [PATCH 1/4] style change for is-set --- cms/static/sass/views/_unit.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 74a354d09d..c320996095 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -506,6 +506,7 @@ body.course.unit { .mode { display: inline-block; + margin-left: 8px; &.inactive-mode{ display: none; @@ -518,13 +519,13 @@ body.course.unit { &.is-set { @include linear-gradient($blue, $blue); color: $blue-d1; - box-shadow: inset 1px 1px 1px $shadow-d1; - background-color: $blue; + box-shadow: inset 0 1px 2px 2px $shadow; + background-color: $blue-d4; cursor: default; &:hover { - box-shadow: inset 1px 1px 1px $shadow-d1; - background-color: $blue; + box-shadow: inset 0 1px 2px 2px $shadow; + background-color: $blue-d4; } } } From 56df114edbc5ebed03edfc96e5bfd85616af015f Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 11:41:19 -0400 Subject: [PATCH 2/4] style changes to component header --- cms/static/sass/views/_unit.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index c320996095..590ce59cd4 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -477,7 +477,7 @@ body.course.unit { .component-edit-header { @include box-sizing(border-box); - padding: 15px 0 15px 20px; + padding: 18px 0 18px 20px; top: 0; right: 0; background-color: $blue; @@ -502,7 +502,7 @@ body.course.unit { right: 0; top: 0; position: absolute; - padding: 10px; + padding: 15px; .mode { display: inline-block; From 0422350e8c5f26199b5d7325a2c062f60e3f69c9 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 12:05:43 -0400 Subject: [PATCH 3/4] final changes to codemirror styling, and clean up style for settings button clearing --- cms/static/sass/views/_unit.scss | 4 +--- common/lib/xmodule/xmodule/css/codemirror/codemirror.scss | 1 - common/static/js/vendor/CodeMirror/codemirror.css | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 590ce59cd4..9956762c98 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -677,7 +677,6 @@ body.course.unit { select { @include box-shadow(0 1px 2px $shadow-l1 inset); - background: none repeat scroll #F2F2F2; &:focus { @include box-shadow(0 0 1px $shadow); @@ -692,7 +691,6 @@ body.course.unit { .action.setting-clear { @include font-size(11); - background-color: $gray-l4; color: $gray; width: 25px; height: 25px; @@ -702,7 +700,7 @@ body.course.unit { margin: 0 10px; box-shadow: none; text-shadow: none; - border: 1px solid $gray-l4; + border: 1px solid $gray-l1; &:hover { @include box-shadow(0 1px 1px $shadow); diff --git a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss b/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss index 91c79d970f..0dc07919ae 100644 --- a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss +++ b/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss @@ -2,5 +2,4 @@ background: #fff; font-size: 13px; color: #3c3c3c; - padding: 15px; } \ No newline at end of file diff --git a/common/static/js/vendor/CodeMirror/codemirror.css b/common/static/js/vendor/CodeMirror/codemirror.css index 2d79f4aa79..08beee406d 100644 --- a/common/static/js/vendor/CodeMirror/codemirror.css +++ b/common/static/js/vendor/CodeMirror/codemirror.css @@ -1,6 +1,7 @@ .CodeMirror { line-height: 1em; font-family: monospace; + padding: 15px; } .CodeMirror-scroll { From b3e41d19f6192c4a9c84fb719dcdc87c5d547afd Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 15 May 2013 13:29:35 -0400 Subject: [PATCH 4/4] styling for static pages updated --- cms/static/sass/views/_static-pages.scss | 37 ++++++------------- cms/static/sass/views/_unit.scss | 2 +- .../lib/xmodule/xmodule/css/editor/edit.scss | 5 +++ .../js/vendor/CodeMirror/codemirror.css | 1 - 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/cms/static/sass/views/_static-pages.scss b/cms/static/sass/views/_static-pages.scss index 759b03cfc7..09d3957bb0 100644 --- a/cms/static/sass/views/_static-pages.scss +++ b/cms/static/sass/views/_static-pages.scss @@ -31,38 +31,23 @@ body.course.static-pages { @include edit-box; @include box-shadow(none); display: none; - padding: 20px; + padding: 0; border-radius: 2px 2px 0 0; - .metadata_edit { - margin-bottom: 20px; - font-size: 13px; - - li { - margin-bottom: 10px; - } - - label { - display: inline-block; - margin-right: 10px; - } + //Overrides general edit-box mixin + .row { + margin-bottom: 0px; } - h3 { - margin-bottom: 10px; - font-size: 18px; - font-weight: 700; - } + // This duplicates the styling from Unit page editing + .module-actions { + @include box-shadow(inset 0 1px 1px $shadow); + padding: 0px 0 10px 10px; + background-color: $gray-l6; - h5 { - margin-bottom: 8px; - color: #fff; - font-weight: 700; - } - - .save-button { - margin-top: 10px; + .save-button { margin: 15px 8px 0 0; + } } } } diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index 9956762c98..eff7aa0c0f 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -457,7 +457,7 @@ body.course.unit { margin-bottom: 0px; } - // Module Actions + // Module Actions, also used for Static Pages .module-actions { @include box-shadow(inset 0 1px 1px $shadow); padding: 0px 0 10px 10px; diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss index d30f69bcd2..dec070264a 100644 --- a/common/lib/xmodule/xmodule/css/editor/edit.scss +++ b/common/lib/xmodule/xmodule/css/editor/edit.scss @@ -4,6 +4,11 @@ .row { position: relative; + + //testing + .CodeMirror { + padding: 15px; + } } .editor-bar { diff --git a/common/static/js/vendor/CodeMirror/codemirror.css b/common/static/js/vendor/CodeMirror/codemirror.css index 08beee406d..2d79f4aa79 100644 --- a/common/static/js/vendor/CodeMirror/codemirror.css +++ b/common/static/js/vendor/CodeMirror/codemirror.css @@ -1,7 +1,6 @@ .CodeMirror { line-height: 1em; font-family: monospace; - padding: 15px; } .CodeMirror-scroll {