diff --git a/cms/static/sass/_module-header.scss b/cms/static/sass/_module-header.scss deleted file mode 100644 index 03acbecd9b..0000000000 --- a/cms/static/sass/_module-header.scss +++ /dev/null @@ -1,125 +0,0 @@ -section.video-new, -section.video-edit, -section.problem-new, -section.problem-edit, -section.html-edit { - background: #fff; - border: 1px solid #333; - border-right: 0; - - > header { - background: #eee; - @include clearfix; - padding: 6px; - border-bottom: 1px solid #333; - -webkit-font-smoothing: antialiased; - - h2 { - float: left; - font-size: 14px; - } - - a { - color: #fff; - - &.save-update { - float: right; - } - - &.cancel { - float: left; - } - } - - } - - > section { - padding: 20px; - - > header { - h1 { - font-size: 24px; - margin: 12px 0; - } - - section { - &.status-settings { - ul { - list-style: none; - @include border-radius(2px); - border: 1px solid #999; - @include inline-block(); - - li { - @include inline-block(); - border-right: 1px solid #999; - padding: 6px; - - &:last-child { - border-right: 0; - } - - &.current { - background: #eee; - } - } - } - - a.settings { - @include inline-block(); - margin: 0 20px; - border: 1px solid #999; - padding: 6px; - } - - select { - float: right; - } - } - - &.meta { - background: #eee; - padding: 10px; - margin: 20px 0; - @include clearfix(); - - div { - float: left; - margin-right: 20px; - - h2 { - font-size: 14px; - @include inline-block(); - } - - p { - @include inline-block(); - } - } - } - } - } - - section.notes { - margin-top: 20px; - padding: 6px; - background: #eee; - border: 1px solid #ccc; - - textarea { - @include box-sizing(border-box); - display: block; - width: 100%; - } - - h2 { - font-size: 14px; - margin-bottom: 6px; - } - - input[type="submit"]{ - margin-top: 10px; - } - } - } -} diff --git a/cms/static/sass/_problem.scss b/cms/static/sass/_problem.scss index 39df062cde..fa2657c0d1 100644 --- a/cms/static/sass/_problem.scss +++ b/cms/static/sass/_problem.scss @@ -4,68 +4,200 @@ section#unit-wrapper { @include clearfix(); padding: 6px 20px; - h1 { - font-size: 18px; - text-transform: uppercase; - letter-spacing: 1px; + section { float: left; + + h1 { + font-size: 16px; + text-transform: uppercase; + letter-spacing: 1px; + @include inline-block(); + } + + p { + @include inline-block(); + margin-left: 10px; + color: #999; + font-size: 12px; + font-style: italic; + } } - p { + div { float: right; + color: #666; } } + > section { padding: 20px; - a.save-update { - @extend .button; - @include inline-block(); + + section.meta { + section { + &.status-settings { + float: left; + margin-bottom: 10px; + + ul { + list-style: none; + @include border-radius(2px); + border: 1px solid #999; + @include inline-block(); + + li { + @include inline-block(); + border-right: 1px solid #999; + padding: 6px; + + &:last-child { + border-right: 0; + } + + &.current { + background: #eee; + } + } + } + + a.settings { + @include inline-block(); + margin: 0 20px; + border: 1px solid #999; + padding: 6px; + } + + select { + float: right; + } + } + + &.author { + float: right; + + dl { + dt { + font-weight: bold; + } + + dd, dt { + @include inline-block(); + } + } + } + + &.tags { + background: #eee; + padding: 10px; + margin: 0 0 20px; + @include clearfix(); + clear: both; + + div { + float: left; + margin-right: 20px; + + h2 { + font-size: 14px; + @include inline-block(); + } + + p { + @include inline-block(); + } + } + } + } + } + + //general styles for main content + textarea { + @include box-sizing(border-box); + display: block; + width: 100%; + } + + div.preview { + background: #eee; + @include box-sizing(border-box); + min-height: 40px; + padding: 10px; + width: 100%; + margin-top: 10px; + + h1 { + font-size: 24px; + margin-bottom: 1em; + } + + h2 { + font-size: 20px; + margin-bottom: 1em; + } + + h3 { + font-size: 18; + margin-bottom: 1em; + } + + ul { + padding-left: 20px; + margin-bottom: 1em; + } + + p { + margin-bottom: 1em; + } + } + + //notes + section.notes { margin-top: 20px; + padding: 20px 0 0; + border-top: 1px solid #ccc; + + h2 { + font-size: 14px; + margin-bottom: 6px; + } + + form { + margin-bottom: 20px; + + textarea { + @include box-sizing(border-box); + display: block; + width: 100%; + } + + input[type="submit"]{ + margin-top: 10px; + } + } + + ul { + list-style: none; + + li { + margin-bottom: 20px; + + p { + margin-bottom: 10px; + + &.author { + font-style: italic; + color: #999; + } + } + } + } + } + + div.actions { + a.save-update { + @extend .button; + @include inline-block(); + margin-top: 20px; + } } } } - -section.problem-new, -section.problem-edit, -section.html-edit { - textarea { - @include box-sizing(border-box); - display: block; - width: 100%; - } - - - div.preview { - background: #eee; - @include box-sizing(border-box); - min-height: 40px; - padding: 10px; - width: 100%; - margin-top: 10px; - - h1 { - font-size: 24px; - margin-bottom: 1em; - } - - h2 { - font-size: 20px; - margin-bottom: 1em; - } - - h3 { - font-size: 18; - margin-bottom: 1em; - } - - ul { - padding-left: 20px; - margin-bottom: 1em; - } - - p { - margin-bottom: 1em; - } - } -} - diff --git a/cms/static/sass/_week.scss b/cms/static/sass/_week.scss index b638a36f5c..0aa42f99de 100644 --- a/cms/static/sass/_week.scss +++ b/cms/static/sass/_week.scss @@ -6,47 +6,6 @@ section.sequence-edit { border-bottom: 2px solid #333; @include clearfix(); - div { - @include clearfix(); - padding: 6px 20px; - - h1 { - font-size: 18px; - text-transform: uppercase; - letter-spacing: 1px; - float: left; - } - - p { - float: right; - } - - &.week { - background: #eee; - font-size: 12px; - border-bottom: 1px solid #ccc; - - h2 { - font-size: 12px; - @include inline-block(); - margin-right: 20px; - } - - ul { - list-style: none; - @include inline-block(); - - li { - @include inline-block(); - margin-right: 10px; - - p { - float: none; - } - } - } - } - } section.goals { background: #eee; @@ -68,121 +27,116 @@ section.sequence-edit { } } - > section.content { - @include box-sizing(border-box); - padding: 20px; + section.filters { + @include clearfix; + margin-bottom: 10px; + background: #efefef; + border: 1px solid #ddd; - section.filters { - @include clearfix; - margin-bottom: 10px; - background: #efefef; - border: 1px solid #ddd; + ul { + @include clearfix(); + list-style: none; + padding: 6px; - ul { - @include clearfix(); - list-style: none; - padding: 6px; + li { + @include inline-block(); - li { - @include inline-block(); - - &.advanced { - float: right; - } + &.advanced { + float: right; } } } + } - > div { - display: table; - border: 1px solid; - width: 100%; + > div { + display: table; + border: 1px solid; + width: 100%; - section { - header { - background: #eee; - padding: 6px; - border-bottom: 1px solid #ccc; - @include clearfix; + section { + header { + background: #eee; + padding: 6px; + border-bottom: 1px solid #ccc; + @include clearfix; - h2 { - text-transform: uppercase; - letter-spacing: 1px; - font-size: 12px; - float: left; + h2 { + text-transform: uppercase; + letter-spacing: 1px; + font-size: 12px; + float: left; + } + } + + &.modules { + @include box-sizing(border-box); + display: table-cell; + width: flex-grid(6, 9); + border-right: 1px solid #333; + + &.empty { + text-align: center; + vertical-align: middle; + + a { + @extend .button; + @include inline-block(); + margin-top: 10px; } } - &.modules { - @include box-sizing(border-box); - display: table-cell; - width: flex-grid(6, 9); - border-right: 1px solid #333; + ol { + list-style: none; + border-bottom: 1px solid #333; - &.empty { - text-align: center; - vertical-align: middle; - - a { - @extend .button; - @include inline-block(); - margin-top: 10px; - } - } - - ol { - list-style: none; + li { border-bottom: 1px solid #333; - li { - border-bottom: 1px solid #333; + &:last-child{ + border-bottom: 0; + } - &:last-child{ - border-bottom: 0; - } + a { + color: #000; + } - a { - color: #000; - } + ol { + list-style: none; - ol { - list-style: none; - - li { - padding: 6px; - - &:hover { - a.draggable { - opacity: 1; - } - } + li { + padding: 6px; + &:hover { a.draggable { - float: right; - opacity: .5; + opacity: 1; + } + } + + a.draggable { + float: right; + opacity: .5; + } + + &.group { + padding: 0; + + header { + padding: 6px; + background: none; + + h3 { + font-size: 14px; + } } - &.group { - padding: 0; - header { - padding: 6px; - background: none; - - h3 { - font-size: 14px; - } - } - - - ol { + ol { border-left: 4px solid #999; border-bottom: 0; - li { - &:last-child { - border-bottom: 0; - } + li { + &:last-child { + border-bottom: 0; } } } @@ -191,63 +145,63 @@ section.sequence-edit { } } } + } - &.scratch-pad { - @include box-sizing(border-box); - display: table-cell; - width: flex-grid(3, 9) + flex-gutter(9); - vertical-align: top; + &.scratch-pad { + @include box-sizing(border-box); + display: table-cell; + width: flex-grid(3, 9) + flex-gutter(9); + vertical-align: top; - ol { - list-style: none; + ol { + list-style: none; + border-bottom: 1px solid #999; + + li { border-bottom: 1px solid #999; + background: #f9f9f9; - li { - border-bottom: 1px solid #999; - background: #f9f9f9; + &:last-child { + border-bottom: 0; + } - &:last-child { - border-bottom: 0; - } + ul { + list-style: none; - ul { - list-style: none; + li { + padding: 6px; - li { - padding: 6px; - - &:last-child { - border-bottom: 0; - } - - &:hover { - a.draggable { - opacity: 1; - } - } - - &.empty { - padding: 12px; - - a { - @extend .button; - display: block; - text-align: center; - } - } + &:last-child { + border-bottom: 0; + } + &:hover { a.draggable { - float: right; - opacity: .3; - } - - a { - color: #000; + opacity: 1; } } - } + &.empty { + padding: 12px; + + a { + @extend .button; + display: block; + text-align: center; + } + } + + a.draggable { + float: right; + opacity: .3; + } + + a { + color: #000; + } + } } + } } } diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index 133e1bda1b..092e40d9c5 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -3,4 +3,4 @@ @import 'base'; @import 'calendar'; -@import 'week', 'video', 'problem', 'module-header'; +@import 'week', 'video', 'problem'; diff --git a/cms/templates/unit.html b/cms/templates/unit.html index c9a3d82b5a..92f54fe5d7 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,19 +1,16 @@
-

${name}

-

Unit type: ${type}

- - - - -
-
- ${contents} -
-
+
+

${name}

+

${type}

+
+ + +
+ ${contents}
diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html index cbd8a7f3df..e34e8e6480 100644 --- a/cms/templates/widgets/html-edit.html +++ b/cms/templates/widgets/html-edit.html @@ -1,4 +1,62 @@
+
+ +
+ + Settings +
+ +
+
+
Last modified:
+
mm/dd/yy
+
By
+
Anant Agarwal
+
+
+ +
+
+

Tags:

+

Click to edit

+
+ +
+

Goal

+

Click to edit

+
+
+
+
${module.definition['data']['text']}
+ + + +
+

Add notes

+
+ + +
+ +
    +
  • +

    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.

    +

    Anant Agarwal

    +
  • +
  • +

    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.

    +

    Anant Agarwal

    +
  • +
+
diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index 991326c987..aa98c468fe 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -1,73 +1,61 @@
-
- Cancel - Save & Update -
- -
-
-

${module.name}

-
-
-

Last modified:

-

mm/dd/yy

-
- -
-

By

-

Anant Agarwal

-
-
- -
- - Settings - - -
-
-
-

Tags:

-

Click to edit

-
- -
-

Goal

-

Click to edit

-
-
-
- -
- -
- 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. -
+
+
+ + Settings
-
-

Add notes

+
+
+
Last modified:
+
mm/dd/yy
+
By
+
Anant Agarwal
+
+
+ +
+
+

Tags:

+

Click to edit

+
+ +
+

Goal

+

Click to edit

+
+
+
+ +
+ +
+ 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. +
+
+ +
+

Add notes

+
+
-
    -
  • -

    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.

    -

    Anant Agarwal

    -
  • -
  • -

    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.

    -

    Anant Agarwal

    -
  • -
- - Save & Update +
    +
  • +

    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.

    +

    Anant Agarwal

    +
  • +
  • +

    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.

    +

    Anant Agarwal

    +
  • +
+ diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html index 219145aefb..62742edd3e 100644 --- a/cms/templates/widgets/sequence-edit.html +++ b/cms/templates/widgets/sequence-edit.html @@ -1,119 +1,106 @@
-
-
-

${module.name}

-

Module Type:${module.type}

-
-
+
+
    +
  • + + +
  • -
    -
    -
      +
    • + + +
    • +
    • + +
    • + +
    • + Advanced filters +
    • + +
    • + +
    • +
    +
    + +
    +
    +
    1. - - +
        + % for child in module.get_children(): +
      1. + ${child.name} + handle +
      2. + %endfor +
    2. -
    3. - - -
    4. -
    5. - -
    6. - -
    7. - Advanced filters -
    8. - -
    9. - -
    10. -
+
-
-
-
    -
  1. -
      - % for child in module.get_children(): -
    1. - ${child.name} - handle -
    2. - %endfor -
    -
  2. - - - - -
-
- -
-
    -
  1. -
    -

    Section Scratch

    -
    - +
  2. +
  3. +
    +

    Course Scratch

    +
    - -
  4. - - - - -
-
-
-
+ + + +
+