From 22a61cdfb77f4f3f0412432229cac62bbda07dfa Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Thu, 6 Dec 2012 17:00:16 -0500 Subject: [PATCH] pulled out component types from behind add component button --- cms/static/sass/_unit.scss | 30 ++++++++++++++++++++---------- cms/templates/unit.html | 8 ++------ 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 3b166e2048..83c6906cd0 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -56,14 +56,10 @@ margin: 20px 40px; &.new-component-item { - padding: 0; + padding: 20px; border: none; - border-radius: 0; - - &.adding { - background-color: $blue; - border-color: #437fbf; - } + border-radius: 3px; + background: $lightGrey; .new-component-button { display: block; @@ -87,14 +83,20 @@ .new-component-type, .new-component-template { @include clearfix; + li { + display: inline-block; + } + a { position: relative; - float: left; + display: inline-block; width: 100px; height: 100px; margin-right: 10px; margin-bottom: 10px; border-radius: 8px; + border: 1px solid $darkGreen; + background: $green; font-size: 13px; line-height: 14px; color: #fff; @@ -103,7 +105,7 @@ @include transition(background-color .15s); &:hover { - background-color: rgba(255, 255, 255, .2); + background: $brightGreen; } .name { @@ -123,7 +125,15 @@ } } - .new-component, + .new-component { + text-align: center; + + h5 { + color: $green; + } + + } + .new-component-templates { display: none; position: absolute; diff --git a/cms/templates/unit.html b/cms/templates/unit.html index f2601c7c7e..523d956f06 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -32,12 +32,9 @@ % for id in components:
  • % endfor -
  • - - New Component - +
  • -
    Select Component Type
    +
    Add New Component
      % for type in sorted(component_templates.keys()):
    • @@ -48,7 +45,6 @@
    • % endfor
    - Cancel
    % for type, templates in sorted(component_templates.items()):