From 0aaaf84f62236ac19d9270831b815b3fe912ab24 Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 14 May 2013 08:22:36 -0400 Subject: [PATCH] added number metadata template, cleaned up editor theme ui bordering and settings styles --- .../metadata_number_entry.html | 8 ++++ .../metadata_option_entry.html | 2 +- .../metadata_string_entry.html | 2 +- cms/static/sass/views/_unit.scss | 40 +++++-------------- cms/templates/component.html | 5 +-- .../themes/advanced/skins/studio/ui.css | 2 +- 6 files changed, 24 insertions(+), 35 deletions(-) create mode 100644 cms/static/client_templates/metadata_number_entry.html diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html new file mode 100644 index 0000000000..5ccea65d5d --- /dev/null +++ b/cms/static/client_templates/metadata_number_entry.html @@ -0,0 +1,8 @@ +
+ + + +
+<%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_option_entry.html b/cms/static/client_templates/metadata_option_entry.html index b0c8d83ba9..d2053e497a 100644 --- a/cms/static/client_templates/metadata_option_entry.html +++ b/cms/static/client_templates/metadata_option_entry.html @@ -10,7 +10,7 @@ <% }) %> <%= model.get('help') %> diff --git a/cms/static/client_templates/metadata_string_entry.html b/cms/static/client_templates/metadata_string_entry.html index 647e48400a..74d64d58af 100644 --- a/cms/static/client_templates/metadata_string_entry.html +++ b/cms/static/client_templates/metadata_string_entry.html @@ -2,7 +2,7 @@ <%= model.get('help') %> diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss index b2d89c095b..d5fb7cbfbd 100644 --- a/cms/static/sass/views/_unit.scss +++ b/cms/static/sass/views/_unit.scss @@ -461,7 +461,7 @@ body.course.unit { .module-actions { @include box-shadow(inset 0 1px 1px $shadow); padding: 0px 0 10px 10px; - background-color: $gray-l4; + background-color: $gray-l6; .save-button { margin: 15px 8px 0 0; @@ -533,9 +533,7 @@ body.course.unit { } // Editor Wrapper -.wrapper-comp-editor { - //TO-DO -} +.wrapper-comp-editor { } // Settings Wrapper .wrapper-comp-settings { @@ -585,7 +583,6 @@ body.course.unit { } &:hover { - //TO-DO review existing patterns for hover on field @include transition(opacity 0.25s ease-in-out); opacity: 1; } @@ -595,9 +592,7 @@ body.course.unit { background-color: $white; //setting-label - .setting-label { - //color: $blue-l1; - } + .setting-label { } //setting-input .setting-input { @@ -605,9 +600,7 @@ body.course.unit { } //setting-clear - .setting-clear { - //... - } + .setting-clear { } } .wrapper-comp-setting{ @@ -620,9 +613,7 @@ body.course.unit { label.setting-label { @extend .t-copy-sub1; @include transition(color, 0.15s, ease-in-out); - //margin: 0 0 ($baseline/4) 0; WILL BE REMOVED PRIOR TO PUSH font-weight: 400; - display: inline-block; position: relative; left: 0; @@ -663,9 +654,8 @@ body.course.unit { } select { - //border: 1px solid $gray-l2; - background: none repeat scroll #F2F2F2; @include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset); + background: none repeat scroll #F2F2F2; &:focus { @include box-shadow(0 0 1px $shadow); @@ -682,6 +672,7 @@ body.course.unit { .action.setting-clear { @include font-size(11); + background-color: $gray-l4; color: $gray; width: 25px; height: 25px; @@ -695,7 +686,7 @@ body.course.unit { &:hover { @include box-shadow(0 1px 1px $shadow); - @include transition(opacity 0.25s ease-in-out); + @include transition(opacity 0.15s ease-in-out); background-color: $blue-s3; border: 1px solid $blue-s3; color: $white; @@ -706,11 +697,13 @@ body.course.unit { } } - tip.setting-help { + .tip.setting-help { @include font-size(12); + margin-top: 5px; display: inline-block; font-color: $gray-l6; - //max-width: 50%; + min-width: 280px; + width: 50%; vertical-align: top; } } @@ -942,15 +935,4 @@ body.unit { .view-button { display: none; } -} - - -//OLD Meta-data Styling -//TO-DO port over old styling -.metadata_edit { - - label { - display: inline-block; - margin-right: 10px; - } } \ No newline at end of file diff --git a/cms/templates/component.html b/cms/templates/component.html index 5883bd55d5..012618ec8c 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -2,16 +2,15 @@
Editing: Name of Component -
diff --git a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css index c973248384..77afc23874 100644 --- a/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css +++ b/common/static/js/vendor/tiny_mce/themes/advanced/skins/studio/ui.css @@ -25,7 +25,7 @@ /* Layout */ .studioSkin table.mceLayout {border:0;} -.studioSkin table.mceLayout tr.mceFirst td {border-top: 1px solid #D1DCE6;} +.studioSkin table.mceLayout tr.mceFirst td {border-top: 1px solid #D1DCE6; border-left: none; border-right:none;} .studioSkin table.mceLayout tr.mceLast td {border-bottom:none;} .studioSkin table.mceToolbar, .studioSkin tr.mceFirst .mceToolbar tr td, .studioSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;} .studioSkin td.mceToolbar {