From 2be1f852e714fa28abb0dfdd22981fbed8711cd8 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 7 Dec 2012 15:37:22 -0500 Subject: [PATCH] clean up of users page --- cms/static/coffee/src/views/tabs.coffee | 4 ++++ cms/static/sass/_base.scss | 2 +- cms/static/sass/_static-pages.scss | 5 +++++ cms/static/sass/_users.scss | 22 ++++++++++++---------- cms/static/sass/_variables.scss | 1 + cms/templates/edit-tabs.html | 2 +- cms/templates/import.html | 1 - cms/templates/manage_users.html | 9 +++++---- cms/templates/widgets/header.html | 2 +- 9 files changed, 30 insertions(+), 18 deletions(-) diff --git a/cms/static/coffee/src/views/tabs.coffee b/cms/static/coffee/src/views/tabs.coffee index 34d86a3051..1fbc6ffa7f 100644 --- a/cms/static/coffee/src/views/tabs.coffee +++ b/cms/static/coffee/src/views/tabs.coffee @@ -33,6 +33,10 @@ class CMS.Views.TabsEdit extends Backbone.View ) $('.new-component-item').before(editor.$el) + editor.$el.addClass('new') + setTimeout(=> + editor.$el.removeClass('new') + , 500) editor.cloneTemplate( @model.get('id'), diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 3c2d134919..e09c7fdd54 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -196,7 +196,7 @@ code { h4 { padding: 6px 14px; border-bottom: 1px solid $mediumGrey; - border-radius: 3px 3px 0 0; + border-radius: 2px 2px 0 0; @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0)); background-color: $lightBluishGrey; @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset); diff --git a/cms/static/sass/_static-pages.scss b/cms/static/sass/_static-pages.scss index 9f39d2ad53..e6d8ef0e58 100644 --- a/cms/static/sass/_static-pages.scss +++ b/cms/static/sass/_static-pages.scss @@ -73,11 +73,16 @@ } } + .new .xmodule_display { + background: $yellow; + } + .xmodule_display { padding: 20px 20px 22px; font-size: 24px; font-weight: 300; background: #fff; + @include transition(background-color 3s); } .static-page-item { diff --git a/cms/static/sass/_users.scss b/cms/static/sass/_users.scss index eb48bcd219..e107bdbb6d 100644 --- a/cms/static/sass/_users.scss +++ b/cms/static/sass/_users.scss @@ -1,9 +1,4 @@ .users { - .user-overview { - @extend .window; - padding: 30px 40px; - } - .new-user-form { display: none; padding: 15px 20px; @@ -48,11 +43,11 @@ .user-list { border: 1px solid $mediumGrey; - background: $lightGrey; + background: #fff; li { position: relative; - padding: 10px 20px; + padding: 20px; border-bottom: 1px solid $mediumGrey; &:last-child { @@ -64,12 +59,19 @@ } .user-name { - width: 30%; - font-weight: 700; + margin-right: 10px; + font-size: 24px; + font-weight: 300; + } + + .user-email { + font-size: 14px; + font-style: italic; + color: $mediumGrey; } .item-actions { - top: 9px; + top: 24px; } } } diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss index d556ca87a9..10c31c3a21 100644 --- a/cms/static/sass/_variables.scss +++ b/cms/static/sass/_variables.scss @@ -24,6 +24,7 @@ $mediumGrey: #b0b6c2; $darkGrey: #8891a1; $extraDarkGrey: #3d4043; $paleYellow: #fffcf1; +$yellow: rgb(255, 254, 223); $green: rgb(37, 184, 90); $brightGreen: rgb(22, 202, 87); $disabledGreen: rgb(124, 206, 153); diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index a48c683db1..16bca8568b 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -19,7 +19,7 @@
- New Tab + New Page
diff --git a/cms/templates/import.html b/cms/templates/import.html index 18d9a1604d..e4f8019714 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -8,7 +8,6 @@ <%block name="content">
-

Import

Please read the documentation before attempting an import!

diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index d8266f0622..36930f5386 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -13,10 +13,11 @@ %endif
-
-
-

The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional course staff below, if you are the course instructor. Please note that they must have already registered and verified their account.

-
+
+

The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional course staff below, if you are the course instructor. Please note that they must have already registered and verified their account.

+
+ +
%if allow_actions:
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index c6e28f9c29..ac1379ebe8 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -27,7 +27,7 @@ <% ctx_loc = context_course.location %>