From 0804ff7a75908a50f4414333d243067763137868 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 14 Aug 2012 15:33:55 -0400 Subject: [PATCH] Added styles for single question and profile view --- .../templates/question/answer_controls.html | 2 +- lms/static/images/askbot/comment-vote-up.png | Bin 191 -> 0 bytes .../{ => old}/vote-arrow-down-activate.png | Bin .../images/askbot/old/vote-arrow-down.png | Bin 0 -> 216 bytes .../{ => old}/vote-arrow-up-activate.png | Bin .../images/askbot/old/vote-arrow-up.png | Bin 0 -> 200 bytes lms/static/images/askbot/vote-arrow-down.png | Bin 216 -> 1155 bytes lms/static/images/askbot/vote-arrow-up.png | Bin 200 -> 1138 bytes .../sass/course/discussion/_profile.scss | 28 +++------ .../course/discussion/_question-view.scss | 57 +++++++++--------- .../sass/course/discussion/_questions.scss | 1 + .../sass/course/discussion/_sidebar.scss | 17 +++--- lms/static/sass/course/discussion/_tags.scss | 1 + 13 files changed, 51 insertions(+), 55 deletions(-) delete mode 100644 lms/static/images/askbot/comment-vote-up.png rename lms/static/images/askbot/{ => old}/vote-arrow-down-activate.png (100%) create mode 100644 lms/static/images/askbot/old/vote-arrow-down.png rename lms/static/images/askbot/{ => old}/vote-arrow-up-activate.png (100%) create mode 100644 lms/static/images/askbot/old/vote-arrow-up.png diff --git a/lms/askbot/skins/common/templates/question/answer_controls.html b/lms/askbot/skins/common/templates/question/answer_controls.html index 52c4836e1e..f1896e0d95 100644 --- a/lms/askbot/skins/common/templates/question/answer_controls.html +++ b/lms/askbot/skins/common/templates/question/answer_controls.html @@ -31,7 +31,7 @@ {% spaceless %} - {% if answer.deleted %}{% trans %}undelete{% endtrans %}{% else %}✖{% endif %} + {% if answer.deleted %}{% trans %}undelete{% endtrans %}{% else %}delete{% endif %} {% endspaceless %} {% endif %} diff --git a/lms/static/images/askbot/comment-vote-up.png b/lms/static/images/askbot/comment-vote-up.png deleted file mode 100644 index 05dc84e12e306a2cedc65c3835669bc4199a1fb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ZJsWUAr-gYUQ*<14&Z5cXg{NJ zUBeAewFxnd*M7-1H5at*OidDU-NDJUcWt$b>xLHbX^}_Ne=qm#n)x@C--YRkOu#x0 zUD22C85cSlmNQQ}%Q(e5f#ZFr`zv3@b8`gdeSRQQ^uwN67#H diff --git a/lms/static/images/askbot/vote-arrow-down-activate.png b/lms/static/images/askbot/old/vote-arrow-down-activate.png similarity index 100% rename from lms/static/images/askbot/vote-arrow-down-activate.png rename to lms/static/images/askbot/old/vote-arrow-down-activate.png diff --git a/lms/static/images/askbot/old/vote-arrow-down.png b/lms/static/images/askbot/old/vote-arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..e67524077a4650997d321967e4f0b62833ecad6a GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^!a&T!!3HE7F0?fPsrjBRjv*DdmYy->YBrEKTBxYN zF_$ZrJ2tkubIw8LFLLt^hQ0`}X_)+gmn+iyxtv1q@+N`#52Bee&piJSFSjTD*__k& zo?TSjzPPNgL-v9Kn@Em?fFo|KA{Et9+p$gh#o; z&5WV;!o~jr+>KJca$lUUA83ydSY!KU+nXStg@vu}?x;!}6n+(`c;Lxdqkr2zFyA*a Q2RfC()78&qol`;+09svAV*mgE literal 0 HcmV?d00001 diff --git a/lms/static/images/askbot/vote-arrow-up-activate.png b/lms/static/images/askbot/old/vote-arrow-up-activate.png similarity index 100% rename from lms/static/images/askbot/vote-arrow-up-activate.png rename to lms/static/images/askbot/old/vote-arrow-up-activate.png diff --git a/lms/static/images/askbot/old/vote-arrow-up.png b/lms/static/images/askbot/old/vote-arrow-up.png new file mode 100644 index 0000000000000000000000000000000000000000..a35946cc5100ad2fcf91e7f5aea14eb79633864f GIT binary patch literal 200 zcmV;(05|`MP)`OK?rd?H-2_k7H;8p0jHme>iJDc8m_3{GrBzBHEL4Z+pnV2uU1K^_l;mRJcH zRKH?5M#!l67E94V3-ma;u@Eh^!V~d4c7`^%h|UBw%z;zdsUGeC0000O>EOv95*dWp&}}*Orwm$lgp|hEphBLPGcJCGpf-2nS2RpfoxAno6rNJv6I9EH!T=NX44beiYIwx6p;|>4Orx@Hrs>D$7ipkt zY5HJ7i79p#RrCY%4w{(H7uETyn$qZzePGxVh=74G1fDTtx`LOcS9Jxl56lb=Rw1~W zre6d#rHq5Dd#&S%I+j#-!Eq6Sh`4hmhF-*U`&$YUa#csSv2K|lP=wRg zEKbuT(ibTh_PVU;u9b-tjPan&u+dnMQVXakuZ9}NI@-kr^fKQ66?ThrHew3MwPqca zG_KSixUz+;gCMq?qGiprsyJS;u;o@P8)PSV@U{X~-3$zSRvC&SIIhK{#%urI6<0*D5%O#~)D&FEsmO5)76Suh9OYTrxZZHgnO*~7; z(ceefm}41WHEBU_A4{UG-WpeH9}C}>%aCB0ptb*Lb<0HNC)lnJE;+1^J~GL?J7lmO z{n~T#Q9R2@nWA@Z`uWPrNas1~YE!*@wzQ-7bgApXR_?DisV4t3{7t;@TBBS)^6vMU zZ^VU7jl(y>hr4_z?&|Wts(ZqPt-rV^341eVq`{B06`MS6B zwhXSGgz+sK^HlS#tuFQF32;01^@s6fY6450001=Nkli=EADSr z1<%~X^wgl##FWaylc_cg49qH-ArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC z!8&|>tvvIJOA_;vQ$1a5m4IgGWoD*W89TW;8@rksxVV~`7#g}7I$D^!x*A&=x;Yz} zyBJs+!}Pl3Czs}?=9R$orXchh;?xUD47mkBn_W_iGRsm^+=}vZ6~Lah%EaOpS3?UY zb5jdTpm|2v-2%~@g2gRRy^c8b>H{644~kl(sD=pv(+`LVPq;u1Jn5(A0n>XCFk!p* z?<@soiYJ~fjv*DdlK%YvZ_m7y;q=Dj<15l6gqcMd6%Si9{xA|L4osRMA|TI}uE zBC34TfLXzg^9Yke4%-p6fN!2FWG=S-bd3GN(4pJ#LrUO&!zOu$r++#P*NAjnXa2~h zP{#Pk+@mOeL6XAG(txciJej>VGkr8s@MC+FrSOg+DTniey1;R#*xQ^(vK;2H9@#&U zH=6CpJqH=KBiS7utZyA^q&vhJHwp-_D@%uQABlCSnbnfQy6KCeK)u`dXS_z2HM^en zTsbql&xY delta 185 zcmV;q07n1v2*?4D7k>;01^@s6fY6450001wNkl`OK?rd?H-2_k7H; z8p0jHme>iJDc8m_3{GrBzBHEL4Z+pnV2uU1K^_l;mRJcHR5HI}IY!8+_!djiK@0Ra ny0H)~w89hdJa&dQxQNaKG|Yih+NmDy00000NkvXXu0mjfQ1(zD diff --git a/lms/static/sass/course/discussion/_profile.scss b/lms/static/sass/course/discussion/_profile.scss index 010a03ffd6..f20b51b72b 100644 --- a/lms/static/sass/course/discussion/_profile.scss +++ b/lms/static/sass/course/discussion/_profile.scss @@ -9,9 +9,9 @@ body.user-profile-page { } ul.sub-info { - // border-top: 1px solid #ddd; margin-top: lh(); list-style: none; + padding: 0; > li { display: table-cell; @@ -57,6 +57,7 @@ body.user-profile-page { ul { list-style: none; + padding: 0; &.user-stats-table { list-style: none; @@ -72,37 +73,28 @@ body.user-profile-page { margin-bottom: 30px; li { - background-position: 10px center; + background-position: 10px -10px; background-repeat: no-repeat; - @include border-radius(4px); display: inline-block; - height: 20px; - padding: 10px 10px 10px 40px; + padding: 2px 10px 2px 40px; + margin-bottom: lh(.5); + border: 1px solid lighten($border-color, 10%); &.up { - background-color:#d1e3a8; - background-image: url(../images/askbot/vote-arrow-up-activate.png); + background-image: url(../images/askbot/vote-arrow-up.png); margin-right: 6px; - - span.vote-count { - color: #3f6c3e; - } } &.down { - background-image: url(../images/askbot/vote-arrow-down-activate.png); - background-color:#eac6ad; - - span.vote-count { - color: $mit-red; - } - + background-image: url(../images/askbot/vote-arrow-down.png); } } } &.badges { @include inline-block(); + padding: 0; + margin: 0; a { background-color: #e3e3e3; diff --git a/lms/static/sass/course/discussion/_question-view.scss b/lms/static/sass/course/discussion/_question-view.scss index 1bee024607..b369ceabe0 100644 --- a/lms/static/sass/course/discussion/_question-view.scss +++ b/lms/static/sass/course/discussion/_question-view.scss @@ -1,15 +1,16 @@ // Styles for the single question view div.question-header { + @include clearfix(); div.official-stamp { background: $mit-red; color: #fff; font-size: 12px; + margin-left: -1px; margin-top: 10px; padding: 2px 5px; text-align: center; - margin-left: -1px; } div.vote-buttons { @@ -19,40 +20,40 @@ div.question-header { width: flex-grid(0.7,9); ul { - li { - background-position: center; - background-repeat: no-repeat; - cursor: pointer; - font-weight: bold; - height: 20px; - list-style: none; - padding: 10px; - text-align: center; - width: 70%; + padding: 0; + margin: 0; - &.post-vote { - @include border-radius(4px); - @include box-shadow(inset 0 1px 0px #fff); - } + li { + background-repeat: no-repeat; + color: #999; + font-size: em(20); + font-weight: bold; + list-style: none; + text-align: center; &.question-img-upvote, &.answer-img-upvote { background-image: url(../images/askbot/vote-arrow-up.png); - @include box-shadow(inset 0 1px 0px rgba(255, 255, 255, 0.5)); + background-position: center 0; + cursor: pointer; + height: 12px; + margin-bottom: lh(.5); &:hover, &.on { - background-color:#d1e3a8; - border-color: darken(#D1E3A8, 20%); - background-image: url(../images/askbot/vote-arrow-up-activate.png); + background-image: url(../images/askbot/vote-arrow-up.png); + background-position: center -22px; } } &.question-img-downvote, &.answer-img-downvote { + cursor: pointer; background-image: url(../images/askbot/vote-arrow-down.png); + background-position: center 0; + height: 12px; + margin-top: lh(.5); &:hover, &.on { - background-color:#EAC6AD; - border-color: darken(#EAC6AD, 20%); - background-image: url(../images/askbot/vote-arrow-down-activate.png); + background-image: url(../images/askbot/vote-arrow-down.png); + background-position: center -22px; } } } @@ -66,6 +67,11 @@ div.question-header { h1 { margin-top: 0; + font-weight: 100; + + a { + font-weight: 100; + } } div.meta-bar { @@ -89,10 +95,8 @@ div.question-header { width: flex-grid(4,8); a { - &.question-delete { - text-decoration: none; - cursor: pointer; - } + @extend a:link; + cursor: pointer; } span.sep { @@ -333,7 +337,6 @@ div.question-header { } div.controls { - border-top: 1px solid #efefef; text-align: right; a { diff --git a/lms/static/sass/course/discussion/_questions.scss b/lms/static/sass/course/discussion/_questions.scss index a699dc6c5e..9b7335e62b 100644 --- a/lms/static/sass/course/discussion/_questions.scss +++ b/lms/static/sass/course/discussion/_questions.scss @@ -10,6 +10,7 @@ div.question-list-header { h1 { margin: 0; font-size: 1em; + font-weight: 100; > a.light-button { float: right; diff --git a/lms/static/sass/course/discussion/_sidebar.scss b/lms/static/sass/course/discussion/_sidebar.scss index 947f8eb722..cac219b8cf 100644 --- a/lms/static/sass/course/discussion/_sidebar.scss +++ b/lms/static/sass/course/discussion/_sidebar.scss @@ -216,19 +216,20 @@ div.discussion-wrapper aside { } div.karma { - background: #eee; - border: 1px solid #D3D3D3; - @include border-radius(3px); + border: 1px solid $border-color; @include box-sizing(border-box); - @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff); padding: lh(.4) 0; text-align: center; width: flex-grid(1, 3); float: right; - strong { - display: block; - font-style: 20px; + p { + text-align: center; + + strong { + display: block; + font-style: 20px; + } } } @@ -255,8 +256,6 @@ div.discussion-wrapper aside { overflow: visible; ul { - font-size: 14px; - h2 { margin:0 (-(lh())) 5px (-(lh())); padding: lh(.5) lh(); diff --git a/lms/static/sass/course/discussion/_tags.scss b/lms/static/sass/course/discussion/_tags.scss index fd05ed0df0..5cf78a4816 100644 --- a/lms/static/sass/course/discussion/_tags.scss +++ b/lms/static/sass/course/discussion/_tags.scss @@ -3,6 +3,7 @@ ul.tags { list-style: none; display: inline; + padding: 0; li, a { position: relative;