From 4e6d7babcc6f20a1f6b47ce845148d4ec723aae2 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 21 Aug 2012 12:51:33 -0400 Subject: [PATCH] fixed wiki bugs; started sequence nav bugs --- .../xmodule/xmodule/css/sequence/display.scss | 56 +++++++++--------- .../static/images/sequence-nav/next-icon.png | Bin 250 -> 1079 bytes .../images/sequence-nav/previous-icon.png | Bin 243 -> 1062 bytes lms/static/sass/README.txt | 3 + lms/static/sass/course/base/_base.scss | 1 + lms/static/sass/course/base/_extends.scss | 9 ++- .../sass/course/courseware/_courseware.scss | 3 +- .../sass/course/discussion/_discussion.scss | 5 +- .../sass/course/discussion/_sidebar.scss | 12 ++-- lms/static/sass/course/discussion/_tags.scss | 4 +- lms/templates/wiki/article.html | 3 +- lms/templates/wiki/settings.html | 10 ++-- 12 files changed, 58 insertions(+), 48 deletions(-) create mode 100644 lms/static/sass/README.txt diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index 8c3ab322e2..0cfc1cbd98 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -2,10 +2,13 @@ nav.sequence-nav { // TODO (cpennington): This doesn't work anymore. XModules aren't able to // import from external sources. @extend .topbar; - border-bottom: 1px solid $border-color; - @include border-top-right-radius(4px); - margin: 0 0 lh() (-(lh())); + border: 1px solid #ccc; + height: 44px; + @include linear-gradient(top, #f6f6f6, #e6e6e6); + @include border-radius(25px); + margin: 0 -20px 30px; position: relative; + @include box-shadow(0 1px 0 #fff inset); ol { @include box-sizing(border-box); @@ -25,42 +28,34 @@ nav.sequence-nav { min-width: 20px; a { - background-position: center; + width: 35px; + height: 35px; + margin: 4px auto; + background-position: center 10px; background-repeat: no-repeat; border: 1px solid transparent; - border-bottom: none; - @include border-radius(3px 3px 0 0); + @include border-radius(35px); cursor: pointer; display: block; - height: 10px; - padding: 15px 0 14px; + padding: 0; position: relative; @include transition(); - width: 100%; &:hover { + background-color: #fff; background-repeat: no-repeat; - background-position: center; - background-color: #F3F3F3; - } - - &.visited { - background-color: #F3F3F3; - - &:hover { - background-position: center center; - } + background-position: center 10px; } &.active { - border-color: $border-color; - @include box-shadow(0 2px 0 #fff); + border-color: $blue; background-color: #fff; z-index: 9; &:hover { - background-position: center; background-color: #fff; + background-repeat: no-repeat; + background-position: center 10px; } } @@ -176,24 +171,27 @@ nav.sequence-nav { position: absolute; right: 0; top: 0; - width: flex-grid(1, 9); - border: 1px solid $border-color; + width: 81px; + margin-right: 5px; + border: none; border-bottom: 0; @include border-radius(3px 3px 0 0); li { float: left; margin-bottom: 0; - width: 50%; + height: 35px; + width: 40px; &.prev, &.next { + @include linear-gradient(top, #ccc, #888); a { background-position: center; background-repeat: no-repeat; display: block; - height: 10px; - padding: 15px 0 14px; + height: 35px; + width: 40px; text-indent: -9999px; @include transition(all, .2s, $ease-in-out-quad); @@ -210,12 +208,16 @@ nav.sequence-nav { } &.prev { + border-radius: 35px 0 0 35px; + a { background-image: url('../images/sequence-nav/previous-icon.png'); } } &.next { + border-radius: 0 35px 35px 0; + a { border-left: 1px solid lighten($border-color, 10%); background-image: url('../images/sequence-nav/next-icon.png'); diff --git a/common/static/images/sequence-nav/next-icon.png b/common/static/images/sequence-nav/next-icon.png index ece431dcb891eaa0d4507074e720bce3017e251b..b54f8566de1f90db9872940a9e345040be5f204f 100644 GIT binary patch literal 1079 zcmaJ=T}TvB6dqH=OhY8-kLof;RJ1!Y`!hPDo2xs!xzy;gF6dM2?95e%ZRSoh*LGCM z>_IjNF%a<~=tYPKdI*Z3umXc3q+WvPB~YlI3LgT&m+oxt)er zOz)et;oxL{MxD&7f<||r1zoO42n>i7;2M`qM|2}}iB}}H=VoY73c>jZ{ky1PIR#?K zh9K+@`c#(V0MGlmP?+brGa$fn0fr@u_i-UH%!`3`u=CL*o2`wAX(_Rji<~0#7{->! zFoisfR9A@oCy;vuFrJZ$_x^8R9m;Oj!fV&DmgTcBQ&Y>cMFD9 zp*5YIYa$oMxQfMae%5QL94O2G4>gQRw1d;|Prd&nb}|zdWYW+<NSEIb+BIu|Xc3loeGsJ;$jMLYBp(>0rfFVN#0Fgu}1vnka>P+e18? zka`mm$Hh4z)E*XsLMW6-1cGrsR>n$59XFtf%UG>~<=CoNPYi}dGE30buRtwfBLkG0 z7WL}2NLBfEuv*nx*mzYeLyBR%(f&2+vWw`)Gb_R+hl=!}N%U?LVZY0ppUI=Rmy~)k z?x)m*70xNR^n@7Oj zUAY0UGW&Mz&dig#;-eWi^001C>-Mo0hFU)auFkEUURqb9w`*6wZVE@2I~t2a6!$V! a)4)>S&L0N%rIL&;_{jg3Ko|^M11j6K%E1_h0br6|>%%oo z!?G+V@NmwOQc4n5pmYx3IF0~MlVC@dd&rOb0=3xwIm^iSVgLXD07*qoM6N<$g2G{D AWdHyG diff --git a/common/static/images/sequence-nav/previous-icon.png b/common/static/images/sequence-nav/previous-icon.png index 3b995df1f0f37e99420b1026ca4c048d328c3dd0..33277d6af446ff0efd14fdba9b22216d99fc02c8 100644 GIT binary patch literal 1062 zcmaJ=%}*0S6yE|tf)uJ41!Ks#c#wqdN57y;D`K~mCN9C!Xpe4pr*uR2gWbU{T%Zz@ ziisBqnrMt%@L*!Nm=HY>6%+jfjK+90dN674NJ1Hn*;?FT-F_0bGoAuk)?f+5Z~0IDB}vzc;^OYww2Mfi{p76=~iAhKx`reP70!=XpW<=f)E5QsaZ(WB$(u*B<7$LMdn8Mfk4pDGJGr$ zVA(hu4h#gt{%|0WNcjBmP^^aKb!kS08meLCJuF)n>xe-$aAqEw%4H}gOkD+)ra7f< zElj*FUll9Yt%XU{#nQMK+8OO%qprEIejIaGxcIOueW+o*n^@TMpWO}kQQS`QBWe46 zc6ntb2M%VK1FNI$F?BU4LU}>YJ{BX6K1E+Z5Gu}@910o_;kY4?oWn<3 z?*HgFODX+@c&L<`BS-0Y)wb;j0Fz|A*IK{vnYym~l!goBf+T{4e7welCk=}N9uAaH z5-8zH$D)8A8%n4O_|gEtgAesTG%?1Tb51P$B;?%peKN)f1ZFo3!(^=$2+R@_@7{Z% tz=7mZH@o{002ovPDHLkV1o3zVfp|7 diff --git a/lms/static/sass/README.txt b/lms/static/sass/README.txt new file mode 100644 index 0000000000..5523d207ac --- /dev/null +++ b/lms/static/sass/README.txt @@ -0,0 +1,3 @@ +Sass Watch: + +sass --watch lms/static/sass:lms/static/sass -r ./lms/static/sass/bourbon/lib/bourbon.rb diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index e490fc01ce..038ce50247 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -1,5 +1,6 @@ body { min-width: 980px; + min-height: 100%; background: url(../images/bg-texture.png) #f7f7f7; } diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index 7023005fcf..bcb93a3645 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -47,10 +47,10 @@ h1.top-header { } .sidebar { - // border-right: 1px solid #C8C8C8; @include box-sizing(border-box); display: table-cell; font-family: $sans-serif; + font-size: 14px; position: relative; vertical-align: top; width: flex-grid(3); @@ -58,7 +58,7 @@ h1.top-header { h1, h2 { font-size: em(20); - font-weight: 100; + font-weight: bold; letter-spacing: 0; text-transform: none; font-family: $sans-serif; @@ -66,6 +66,11 @@ h1.top-header { font-style: normal; } + h1 { + font-size: 18px; + padding: 32px 26px 20px 26px; + } + a { border: none; font-style: normal; diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index abf8d695be..929adb57a5 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -12,8 +12,7 @@ div.course-wrapper { section.course-content { @extend .content; - padding-right: 0; - padding-left: lh(); + padding: 40px; h1 { margin: 0 0 lh(); diff --git a/lms/static/sass/course/discussion/_discussion.scss b/lms/static/sass/course/discussion/_discussion.scss index 3aaf73c4ac..9383241980 100644 --- a/lms/static/sass/course/discussion/_discussion.scss +++ b/lms/static/sass/course/discussion/_discussion.scss @@ -3,15 +3,16 @@ body.askbot { section.container { div.discussion-wrapper { @extend .table-wrapper; + display: table; div.discussion-content { @include box-sizing(border-box); display: table-cell; min-width: 650px; - padding-right: lh(); - vertical-align: top; + padding: 40px; width: flex-grid(9) + flex-gutter(); + a.tabula-rasa, .tabula-rasa{ @extend .light-button; @include border-radius(5px); diff --git a/lms/static/sass/course/discussion/_sidebar.scss b/lms/static/sass/course/discussion/_sidebar.scss index b248fb18d7..adcd38a383 100644 --- a/lms/static/sass/course/discussion/_sidebar.scss +++ b/lms/static/sass/course/discussion/_sidebar.scss @@ -2,9 +2,10 @@ div.discussion-wrapper aside { @extend .sidebar; - border-left: 1px solid $border-color; + border-left: 1px solid #ccc; border-right: 0; width: flex-grid(3); + border-radius: 0 3px 3px 0; &:after { left: -1px; @@ -16,9 +17,7 @@ div.discussion-wrapper aside { } h1 { - @extend .bottom-border; - padding: lh(.5) lh(); - margin-bottom: em(16, 20); + margin-bottom: 0; } h2 { @@ -54,7 +53,7 @@ div.discussion-wrapper aside { div.box { display: block; - padding: lh(.5) lh(); + padding: 18px 26px; border-top: 1px solid lighten($border-color, 10%); &:first-child { @@ -67,7 +66,7 @@ div.discussion-wrapper aside { li { border-bottom: 0; - background: #eee; + background: #ddd; padding: 6px 10px 6px 5px; a { @@ -298,6 +297,7 @@ div.discussion-wrapper aside { div.view-profile { border-top: 0; + padding-top: 0; a { @extend .gray-button; diff --git a/lms/static/sass/course/discussion/_tags.scss b/lms/static/sass/course/discussion/_tags.scss index 5cf78a4816..92210d8053 100644 --- a/lms/static/sass/course/discussion/_tags.scss +++ b/lms/static/sass/course/discussion/_tags.scss @@ -10,7 +10,7 @@ ul.tags { } li { - background: #eee; + background: #ddd; color: #555; display: inline-block; font-size: 12px; @@ -19,7 +19,7 @@ ul.tags { padding: 6px 10px 6px 5px; &:before { - border-color:transparent #eee transparent transparent; + border-color:transparent #ddd transparent transparent; border-style:solid; border-width:12px 10px 12px 0; content:""; diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html index d428e5bf1b..7c8c8fb66a 100644 --- a/lms/templates/wiki/article.html +++ b/lms/templates/wiki/article.html @@ -22,8 +22,7 @@ {% endblock %} -
- +
    {% include "wiki/includes/article_menu.html" %}
diff --git a/lms/templates/wiki/settings.html b/lms/templates/wiki/settings.html index a932a26498..93e92cbc61 100644 --- a/lms/templates/wiki/settings.html +++ b/lms/templates/wiki/settings.html @@ -35,16 +35,16 @@ -
-
- {% trans "Last modified:" %}
- {{ article.current_revision.modified }} -
+
    {% with "settings" as selected %} {% include "wiki/includes/article_menu.html" %} {% endwith %}
+
+ {% trans "Last modified:" %}
+ {{ article.current_revision.modified }} +