diff --git a/cms/static/coffee/main.coffee b/cms/static/coffee/main.coffee index 06b8701366..6535034faf 100644 --- a/cms/static/coffee/main.coffee +++ b/cms/static/coffee/main.coffee @@ -63,6 +63,9 @@ $ -> $('section.edit-pane').show() return false + $('a.module-edit').click -> + $('body.content .cal').css('height', contentHeight) + $(document).ready(setHeight) $(window).bind('resize', setHeight) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index d961f461fd..6d1111980c 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -2,65 +2,14 @@ $fg-column: 70px; $fg-gutter: 26px; $fg-max-columns: 12; $body-font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; +$body-font-size: 14px; +$body-line-height: 20px; +// Base html styles html { height: 100%; } -body { - @include clearfix(); - height: 100%; - font: 14px $body-font-family; - - > section { - display: table; - width: 100%; - } - - > header { - background: #000; - color: #fff; - display: block; - float: none; - padding: 6px 20px; - width: 100%; - @include box-sizing(border-box); - - nav { - @include clearfix; - - h2 { - font-size: 14px; - text-transform: uppercase; - float: left; - } - - ul { - float: left; - - &.user-nav { - float: right; - } - - li { - @include inline-block(); - margin-left: 15px; - } - } - } - } - - &.content { - section.main-content { - border-left: 2px solid #000; - @include box-sizing(border-box); - width: flex-grid(9); - float: left; - @include box-shadow( -2px 0 3px #ddd ); - } - } -} - a { text-decoration: none; color: #888; @@ -77,6 +26,13 @@ input[type="submit"], .button { padding: 6px; } +textarea { + @include box-sizing(border-box); + display: block; + width: 100%; +} + +// Extends .new-module { position: relative; @@ -111,7 +67,3 @@ input[type="submit"], .button { display: block; float: right; } - -textarea { - overflow: auto; -} diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss index fa10c65950..71f12f2425 100644 --- a/cms/static/sass/_calendar.scss +++ b/cms/static/sass/_calendar.scss @@ -49,7 +49,6 @@ section.cal { ol { list-style: none; @include clearfix; - @include box-sizing(border-box); border-left: 1px solid #333; border-top: 1px solid #333; width: 100%; diff --git a/cms/static/sass/_layout.scss b/cms/static/sass/_layout.scss new file mode 100644 index 0000000000..98f49940fd --- /dev/null +++ b/cms/static/sass/_layout.scss @@ -0,0 +1,53 @@ +body { + @include clearfix(); + height: 100%; + font: 14px $body-font-family; + + > section { + display: table; + width: 100%; + } + + > header { + background: #000; + color: #fff; + display: block; + float: none; + padding: 6px 20px; + width: 100%; + @include box-sizing(border-box); + + nav { + @include clearfix; + + h2 { + font-size: 14px; + text-transform: uppercase; + float: left; + } + + ul { + float: left; + + &.user-nav { + float: right; + } + + li { + @include inline-block(); + margin-left: 15px; + } + } + } + } + + &.content { + section.main-content { + border-left: 2px solid #000; + @include box-sizing(border-box); + width: flex-grid(9); + float: left; + @include box-shadow( -2px 0 3px #ddd ); + } + } +} diff --git a/cms/static/sass/_week.scss b/cms/static/sass/_section.scss similarity index 88% rename from cms/static/sass/_week.scss rename to cms/static/sass/_section.scss index 0aa42f99de..2048607565 100644 --- a/cms/static/sass/_week.scss +++ b/cms/static/sass/_section.scss @@ -1,32 +1,4 @@ -section.week-edit, -section.week-new, -section.sequence-edit { - - > header { - border-bottom: 2px solid #333; - @include clearfix(); - - - section.goals { - background: #eee; - padding: 6px 20px; - border-top: 1px solid #ccc; - - ul { - list-style: none; - color: #999; - - li { - margin-bottom: 6px; - - &:last-child { - margin-bottom: 0; - } - } - } - } - } - +section#unit-wrapper { section.filters { @include clearfix; margin-bottom: 10px; @@ -48,7 +20,7 @@ section.sequence-edit { } } - > div { + div.content { display: table; border: 1px solid; width: 100%; diff --git a/cms/static/sass/_problem.scss b/cms/static/sass/_unit.scss similarity index 93% rename from cms/static/sass/_problem.scss rename to cms/static/sass/_unit.scss index fa2657c0d1..f1e47d36be 100644 --- a/cms/static/sass/_problem.scss +++ b/cms/static/sass/_unit.scss @@ -26,6 +26,14 @@ section#unit-wrapper { div { float: right; color: #666; + + a { + &.cancel { + margin-right: 20px; + font-style: italic; + font-size: 12px; + } + } } } @@ -110,12 +118,6 @@ section#unit-wrapper { } //general styles for main content - textarea { - @include box-sizing(border-box); - display: block; - width: 100%; - } - div.preview { background: #eee; @include box-sizing(border-box); @@ -163,12 +165,6 @@ section#unit-wrapper { form { margin-bottom: 20px; - textarea { - @include box-sizing(border-box); - display: block; - width: 100%; - } - input[type="submit"]{ margin-top: 10px; } diff --git a/cms/static/sass/_video.scss b/cms/static/sass/_video.scss deleted file mode 100644 index b68176e2db..0000000000 --- a/cms/static/sass/_video.scss +++ /dev/null @@ -1,33 +0,0 @@ -section.video-new, section.video-edit { - > section { - - section.upload { - padding: 6px; - margin-bottom: 10px; - border: 1px solid #ddd; - - a.upload-button { - @extend .button; - @include inline-block(); - } - } - - section.in-use { - h2 { - font-size: 14px; - } - - div { - background: #eee; - text-align: center; - padding: 6px; - } - } - - a.save-update { - @extend .button; - @include inline-block(); - margin-top: 20px; - } - } -} diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 092e40d9c5..3a6c6e0cea 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -1,6 +1,6 @@ @import 'bourbon/bourbon'; @import 'reset'; -@import 'base'; +@import 'base', 'layout'; @import 'calendar'; -@import 'week', 'video', 'problem'; +@import 'section', 'unit'; diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 92f54fe5d7..8cc75cd3bf 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -4,9 +4,10 @@

${name}

${type}

+
- Save & Update Cancel + Save & Update
diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html index e34e8e6480..7b17a2ed14 100644 --- a/cms/templates/widgets/html-edit.html +++ b/cms/templates/widgets/html-edit.html @@ -41,22 +41,5 @@ Cancel -
-

Add notes

-
- - -
- - -
+ <%include file="notes.html"/> diff --git a/cms/templates/widgets/notes.html b/cms/templates/widgets/notes.html new file mode 100644 index 0000000000..71c7afab85 --- /dev/null +++ b/cms/templates/widgets/notes.html @@ -0,0 +1,21 @@ +
+

Notes

+ + + +
+

Add a note

+ + +
+
+ diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index aa98c468fe..a2da078927 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -37,25 +37,12 @@
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
+ +
+ Cancel + Save & Update +
-
-

Add notes

-
- - -
- - -
+ <%include file="notes.html"/> - diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html index 62742edd3e..abeec9209d 100644 --- a/cms/templates/widgets/sequence-edit.html +++ b/cms/templates/widgets/sequence-edit.html @@ -30,7 +30,7 @@ -
+