From 15de4120acc713ce3e319b4b75f58828e1069b16 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 11 Apr 2013 23:20:49 -0400 Subject: [PATCH 01/86] blankslate edited, header bar now with home button --- lms/static/sass/_discussion.scss | 89 +++++++++++++++---- .../discussion/_filter_dropdown.html | 8 +- .../discussion/_thread_list_template.html | 4 + lms/templates/discussion/index.html | 12 ++- 4 files changed, 93 insertions(+), 20 deletions(-) diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 2f044ca5a3d6..8b7e30179d36 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -199,7 +199,7 @@ body.discussion { z-index: 9999; width: 100%; @include box-sizing(border-box); - background: #737373; + background: #797979; border: 1px solid #333; box-shadow: 0 2px 50px rgba(0, 0, 0, .4); } @@ -710,7 +710,7 @@ body.discussion { border-radius: 3px 0 0 0; - .browse, + .home, .browse, .search { position: relative; float: left; @@ -723,9 +723,29 @@ body.discussion { &:hover { background-color: #e9e9e9; } + } - &.is-open { - width: 80%; + .home { + border-radius: 3px 0 0 0; + box-shadow: -1px 0 0 #aaa inset; + cursor: pointer; + + .home-icon { + display: block; + position: absolute; + top: 30%; + left: 30%; + z-index: 100; + width: 25px; + height: 25px; + //margin-left: -17px; + background: url(../images/home-discussion-icon.png) no-repeat; + opacity: 1; + @include transition(none); + } + + .home-btn { + //nothing here yet } } @@ -734,6 +754,7 @@ body.discussion { box-shadow: -1px 0 0 #aaa inset; &.is-open { + width:60%; .browse-topic-drop-btn span { opacity: 1; } @@ -774,6 +795,11 @@ body.discussion { &.is-open { cursor: auto; + width: 60%; + + .home { + width:0%; + } .post-search { padding: 0 10px; @@ -801,7 +827,7 @@ body.discussion { z-index: 50; width: 100%; height: 100%; - border-radius: 3px 0 0 0; + border-radius: 0 0 0 0; border: 1px solid transparent; text-align: center; overflow: hidden; @@ -820,6 +846,9 @@ body.discussion { opacity: 0; @include transition(opacity .2s); } + .drop-arrow { + font-size:16px; + } } .browse-topic-drop-icon { @@ -843,7 +872,7 @@ body.discussion { left: -1px; z-index: 9999; width: 100%; - background: #737373; + background: #797979; border: 1px solid #4b4b4b; border-left: none; border-radius: 0 0 3px 3px; @@ -852,8 +881,16 @@ body.discussion { .browse-topic-drop-menu { max-height: 400px; overflow-y: scroll; + + .drop-menu-meta-category span, + .drop-menu-parent-category span { + margin: 10px 0; + font-size: 14px; + font-weight: 700; + } } + ul { position: inline; } @@ -866,7 +903,7 @@ body.discussion { display: block; padding: 0 20px; border-top: 1px solid #5f5f5f; - font-size: 14px; + font-size: 12px; font-weight: 700; line-height: 22px; color: #fff; @@ -885,7 +922,7 @@ body.discussion { .board-name { float: left; width: 80%; - margin: 13px 0; + margin: 5px 0; color: #fff; } @@ -903,14 +940,14 @@ body.discussion { li li { a { padding-left: 44px; - background: url(../images/nested-icon.png) no-repeat 22px 14px; + background: url(../images/nested-icon.png) no-repeat 22px 5px; } } li li li { a { padding-left: 68px; - background: url(../images/nested-icon.png) no-repeat 46px 14px; + background: url(../images/nested-icon.png) no-repeat 46px 5px; } } } @@ -981,7 +1018,7 @@ body.discussion { min-height: 27px; border-bottom: 1px solid #a3a3a3; @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); - background-color: #aeaeae; + background-color: #aaaaaa; box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset; span, @@ -1270,10 +1307,32 @@ body.discussion { } } - .blank-slate h1 { - margin-top: 195px; - text-align: center; - color: #ccc; + .blank-slate { + //nothing here + .section { + border-bottom: 1px solid #ccc; + margin-top: 15px; + } + .home-header { + //nothing here + } + + .home-title { + font-size: 18px; + color: #000; + margin-bottom: 5px; + } + .home-description { + font-size: 12px; + line-height: 1; + margin-bottom: 10px; + } + .home-stats { + //nothing + } + .home-emailsettings { + //nothing here + } } .blank-slate, diff --git a/lms/templates/discussion/_filter_dropdown.html b/lms/templates/discussion/_filter_dropdown.html index fef4abb11f21..1f59d4235ddf 100644 --- a/lms/templates/discussion/_filter_dropdown.html +++ b/lms/templates/discussion/_filter_dropdown.html @@ -11,12 +11,12 @@ <%def name="render_entry(entries, entry)"> -
  • ${entry}
  • +
  • ${entry}
  • <%def name="render_category(categories, category)">
  • - ${category} + ${category} @@ -29,12 +29,12 @@