Skip to content

E
edx-platform
Commit 1a402090 by Tom Giannattasio
Options

cleaned up editor styles; cleaned up static tabs page

parent 6d898352
Showing with 26 additions and 29 deletions
cms/static/coffee/src/views/module_edit.coffee
...@@ -74,4 +74,5 @@ class CMS.Views.ModuleEdit extends Backbone.View ...@@ -74,4 +74,5 @@ class CMS.Views.ModuleEdit extends Backbone.View
event.preventDefault() event.preventDefault()
@$el.addClass('editing') @$el.addClass('editing')
@$component_editor().slideDown(150) @$component_editor().slideDown(150)
# $modalCover.show()
@loadEdit() @loadEdit()
cms/static/sass/_base.scss
...@@ -9,7 +9,7 @@ body { ...@@ -9,7 +9,7 @@ body {
background: #eaecf3; background: #eaecf3;
font-size: 16px; font-size: 16px;
line-height: 1.6; line-height: 1.6;
color: #3c3c3c; color: $baseFontColor;
} }
body, body,
...@@ -93,7 +93,7 @@ input[type="password"] { ...@@ -93,7 +93,7 @@ input[type="password"] {
@include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset); @include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset);
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
font-size: 11px; font-size: 11px;
color: #3c3c3c; color: $baseFontColor;
outline: 0; outline: 0;
&::-webkit-input-placeholder, &::-webkit-input-placeholder,
...@@ -110,7 +110,7 @@ input.search { ...@@ -110,7 +110,7 @@ input.search {
border-radius: 20px; border-radius: 20px;
background: url(../img/search-icon.png) no-repeat 8px 7px #edf1f5; background: url(../img/search-icon.png) no-repeat 8px 7px #edf1f5;
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
color: #3c3c3c; color: $baseFontColor;
outline: 0; outline: 0;
&::-webkit-input-placeholder { &::-webkit-input-placeholder {
...@@ -129,6 +129,12 @@ code { ...@@ -129,6 +129,12 @@ code {
font-family: Monaco, monospace; font-family: Monaco, monospace;
} }
.CodeMirror {
font-size: 13px;
border: 1px solid $darkGrey;
background: #fff;
}
.text-editor { .text-editor {
width: 100%; width: 100%;
min-height: 80px; min-height: 80px;
......
cms/static/sass/_cms_mixins.scss
...@@ -130,18 +130,17 @@ ...@@ -130,18 +130,17 @@
@mixin edit-box { @mixin edit-box {
padding: 15px 20px; padding: 15px 20px;
border-radius: 3px; border-radius: 3px;
border: 1px solid #5597dd; background-color: $lightBluishGrey;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0)); color: #3c3c3c;
background-color: #5597dd;
@include box-shadow(0 1px 0 rgba(255, 255, 255, .2) inset); @include box-shadow(0 1px 0 rgba(255, 255, 255, .2) inset);
label { label {
color: #fff; color: $baseFontColor;
} }
input, input,
textarea { textarea {
border: 1px solid #3c3c3c; border: 1px solid $darkGrey;
} }
textarea { textarea {
...@@ -161,14 +160,12 @@ ...@@ -161,14 +160,12 @@
} }
.save-button { .save-button {
@include orange-button; @include blue-button;
border-color: #3c3c3c;
margin-top: 0; margin-top: 0;
} }
.cancel-button { .cancel-button {
@include white-button; @include white-button;
border-color: #30649C;
margin-top: 0; margin-top: 0;
} }
} }
......
cms/static/sass/_header.scss
...@@ -49,8 +49,8 @@ body.no-header { ...@@ -49,8 +49,8 @@ body.no-header {
.class-nav-bar { .class-nav-bar {
clear: both; clear: both;
@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
background-color: rgb(197, 207, 223); background-color: $lightBluishGrey;
@include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset, 0 1px 1px rgba(0, 0, 0, 0.1)); @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
} }
.class-nav { .class-nav {
...@@ -80,7 +80,6 @@ body.no-header { ...@@ -80,7 +80,6 @@ body.no-header {
color: rgb(163, 171, 184); color: rgb(163, 171, 184);
@include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1)); @include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1));
background-color: rgb(47, 53, 63); background-color: rgb(47, 53, 63);
@include box-shadow(0 -1px 3px rgba(0, 0, 0, 0.6) inset);
a { a {
display: inline-block; display: inline-block;
......
cms/static/sass/_static-pages.scss
...@@ -10,6 +10,11 @@ ...@@ -10,6 +10,11 @@
padding: 0; padding: 0;
} }
.component-editor {
border: none;
border-radius: 0;
}
.components > li { .components > li {
margin: 0; margin: 0;
border-radius: 0; border-radius: 0;
......
cms/static/sass/_unit.scss
...@@ -156,7 +156,6 @@ ...@@ -156,7 +156,6 @@
} }
&.editing { &.editing {
border-color: #6696d7;
.drag-handle, .drag-handle,
.component-actions { .component-actions {
...@@ -203,10 +202,6 @@ ...@@ -203,10 +202,6 @@
@include edit-box; @include edit-box;
display: none; display: none;
padding: 20px; padding: 20px;
border-radius: 2px 2px 0 0;
@include linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));
background-color: $blue;
color: #fff;
@include box-shadow(none); @include box-shadow(none);
.metadata_edit { .metadata_edit {
...@@ -223,12 +218,6 @@ ...@@ -223,12 +218,6 @@
} }
} }
.CodeMirror {
border: 1px solid #3c3c3c;
background: #fff;
color: #3c3c3c;
}
h3 { h3 {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 18px; font-size: 18px;
......
cms/static/sass/_variables.scss
...@@ -13,6 +13,7 @@ $body-line-height: golden-ratio(.875em, 1); ...@@ -13,6 +13,7 @@ $body-line-height: golden-ratio(.875em, 1);
$pink: rgb(182,37,104); $pink: rgb(182,37,104);
$error-red: rgb(253, 87, 87); $error-red: rgb(253, 87, 87);
$baseFontColor: #3c3c3c;
$blue: #5597dd; $blue: #5597dd;
$orange: #edbd3c; $orange: #edbd3c;
$lightGrey: #edf1f5; $lightGrey: #edf1f5;
...@@ -20,8 +21,8 @@ $mediumGrey: #ced2db; ...@@ -20,8 +21,8 @@ $mediumGrey: #ced2db;
$darkGrey: #8891a1; $darkGrey: #8891a1;
$extraDarkGrey: #3d4043; $extraDarkGrey: #3d4043;
$paleYellow: #fffcf1; $paleYellow: #fffcf1;
$green: rgb(37, 184, 90); $green: rgb(37, 184, 90);
$brightGreen: rgb(22, 202, 87); $brightGreen: rgb(22, 202, 87);
$disabledGreen: rgb(124, 206, 153); $disabledGreen: rgb(124, 206, 153);
$darkGreen: rgb(52, 133, 76); $darkGreen: rgb(52, 133, 76);
\ No newline at end of file $lightBluishGrey: rgb(197, 207, 223);
\ No newline at end of file
cms/templates/widgets/metadata-edit.html
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
hlskey = hashlib.md5(module.location.url()).hexdigest() hlskey = hashlib.md5(module.location.url()).hexdigest()
%> %>
<section class="metadata_edit"> <section class="metadata_edit">
<h3>Metadata</h3>
<ul> <ul>
% for keyname in editable_metadata_fields: % for keyname in editable_metadata_fields:
<li> <li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment