From 657fcd998443750108870456fcb3fcb8c632677b Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 21 Jun 2012 17:36:21 -0400 Subject: [PATCH] Added new styles for html editing and removed a bunch of unused templates --- cms/static/sass/_base.scss | 4 + cms/static/sass/_problem.scss | 53 ++++- cms/templates/widgets/captions.html | 242 -------------------- cms/templates/widgets/header.html | 3 - cms/templates/widgets/html-edit.html | 17 +- cms/templates/widgets/raw-videos.html | 3 - cms/templates/widgets/save-captions.html | 4 - cms/templates/widgets/speed-tooltip.html | 7 - cms/templates/widgets/video-box-unused.html | 38 --- cms/templates/widgets/video-box.html | 35 --- 10 files changed, 67 insertions(+), 339 deletions(-) delete mode 100644 cms/templates/widgets/captions.html delete mode 100644 cms/templates/widgets/raw-videos.html delete mode 100644 cms/templates/widgets/save-captions.html delete mode 100644 cms/templates/widgets/speed-tooltip.html delete mode 100644 cms/templates/widgets/video-box-unused.html delete mode 100644 cms/templates/widgets/video-box.html diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 3a2ef86363..d961f461fd 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -111,3 +111,7 @@ input[type="submit"], .button { display: block; float: right; } + +textarea { + overflow: auto; +} diff --git a/cms/static/sass/_problem.scss b/cms/static/sass/_problem.scss index 66acacf65c..cb418ef497 100644 --- a/cms/static/sass/_problem.scss +++ b/cms/static/sass/_problem.scss @@ -1,20 +1,67 @@ -section.problem-new, section.problem-edit { +section.problem-new, +section.problem-edit, +section.html-edit { + > header { + border-bottom: 2px solid #333; + @include clearfix(); + padding: 6px 20px; + + h1 { + font-size: 18px; + text-transform: uppercase; + letter-spacing: 1px; + float: left; + } + + p { + float: right; + } + } + > section { + padding: 20px; + textarea { @include box-sizing(border-box); display: block; width: 100%; } + div.preview { background: #eee; @include box-sizing(border-box); - height: 40px; + 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; + } } - a.save { + a.save-update { @extend .button; @include inline-block(); margin-top: 20px; diff --git a/cms/templates/widgets/captions.html b/cms/templates/widgets/captions.html deleted file mode 100644 index 088beb7a33..0000000000 --- a/cms/templates/widgets/captions.html +++ /dev/null @@ -1,242 +0,0 @@ - - - diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 49965e4026..4577ac64d8 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -5,9 +5,6 @@
  • New Section
  • -
  • - New Module -
  • New Unit
  • diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html index db85364510..1cc201d40b 100644 --- a/cms/templates/widgets/html-edit.html +++ b/cms/templates/widgets/html-edit.html @@ -2,17 +2,26 @@
    - Cancel - Save & Update +

    ${module.name}

    +

    Unit type: HTML

    + + + +
    -

    ${module.name}

    +
    +
    ${module.definition['data']['text']}
    - Save & Update + +
    diff --git a/cms/templates/widgets/raw-videos.html b/cms/templates/widgets/raw-videos.html deleted file mode 100644 index f466fd59bc..0000000000 --- a/cms/templates/widgets/raw-videos.html +++ /dev/null @@ -1,3 +0,0 @@ -
  • -
    Video-file-name
    -
  • diff --git a/cms/templates/widgets/save-captions.html b/cms/templates/widgets/save-captions.html deleted file mode 100644 index 87342f0cd0..0000000000 --- a/cms/templates/widgets/save-captions.html +++ /dev/null @@ -1,4 +0,0 @@ -
    - Cancel - -
    diff --git a/cms/templates/widgets/speed-tooltip.html b/cms/templates/widgets/speed-tooltip.html deleted file mode 100644 index 2a82e237e7..0000000000 --- a/cms/templates/widgets/speed-tooltip.html +++ /dev/null @@ -1,7 +0,0 @@ -
    - -
    diff --git a/cms/templates/widgets/video-box-unused.html b/cms/templates/widgets/video-box-unused.html deleted file mode 100644 index 3d643ff3c9..0000000000 --- a/cms/templates/widgets/video-box-unused.html +++ /dev/null @@ -1,38 +0,0 @@ -
  • - -
    - -
    - video-name 236mb Uploaded 6 hours ago by Anant Agrawal -

    -

      - Speed -
    • - 0.75x - <%include file="speed-tooltip.html"/> -
    • -
    • Normal - <%include file="speed-tooltip.html"/> -
    • -
    • 1.25x - <%include file="speed-tooltip.html"/> -
    • -
    • 1.5x - <%include file="speed-tooltip.html"/> -
    • -
    • +
    • -
    -

    -

    - Download All — - Delete All — - Edit Captions — - Use clip ⬆ -

    -
    -
    - <%include file="captions.html"/> - <%include file="save-captions.html"/> -
    -
  • - diff --git a/cms/templates/widgets/video-box.html b/cms/templates/widgets/video-box.html deleted file mode 100644 index 1f17e33511..0000000000 --- a/cms/templates/widgets/video-box.html +++ /dev/null @@ -1,35 +0,0 @@ -
  • -
    - -
    - video-name 236mb -

    Uploaded 6 hours ago by Anant Agrawal

    -

    -

      - Speed -
    • - 0.75x - <%include file="speed-tooltip.html"/> -
    • -
    • Normal - <%include file="speed-tooltip.html"/> -
    • -
    • 1.25x - <%include file="speed-tooltip.html"/> -
    • -
    • 1.5x - <%include file="speed-tooltip.html"/> -
    • -
    • +
    • -
    -

    -

    - Download all — -Remove ⬇ - -

    -
    -
    - <%include file="captions.html"/> -
    -