From 8473188feaba808330383b3bc59e3be25fb13969 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Fri, 17 Aug 2012 17:41:45 -0400 Subject: [PATCH] Added new styles for sequence nav and reset some of the styles for inputs --- .../lib/capa/capa/templates/optioninput.html | 2 +- .../xmodule/xmodule/css/sequence/display.scss | 28 +++++++++--------- .../sequence-nav/document-icon-current.png | Bin 204 -> 106 bytes .../sequence-nav/document-icon-normal.png | Bin 205 -> 106 bytes .../sequence-nav/document-icon-visited.png | Bin 206 -> 106 bytes .../images/sequence-nav/list-finished.png | Bin 0 -> 1063 bytes .../images/sequence-nav/list-icon-current.png | Bin 344 -> 100 bytes .../images/sequence-nav/list-icon-normal.png | Bin 284 -> 100 bytes .../images/sequence-nav/list-icon-visited.png | Bin 306 -> 99 bytes .../images/sequence-nav/list-unfinished.png | Bin 0 -> 1070 bytes .../images/sequence-nav/list-unstarted.png | Bin 0 -> 1067 bytes .../static/images/sequence-nav/other-icon.png | Bin 457 -> 0 bytes .../images/sequence-nav/problem-icon-alt.png | Bin 300 -> 0 bytes .../images/sequence-nav/vertical-icon.png | Bin 845 -> 0 bytes .../sequence-nav/video-icon-current.png | Bin 403 -> 113 bytes .../images/sequence-nav/video-icon-normal.png | Bin 394 -> 113 bytes .../sequence-nav/video-icon-visited.png | Bin 425 -> 112 bytes .../static/images/sequence-nav/video-icon.png | Bin 1074 -> 0 bytes lms/static/sass/course/base/_base.scss | 27 +++++++++++++++++ 19 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 common/static/images/sequence-nav/list-finished.png create mode 100644 common/static/images/sequence-nav/list-unfinished.png create mode 100644 common/static/images/sequence-nav/list-unstarted.png delete mode 100644 common/static/images/sequence-nav/other-icon.png delete mode 100644 common/static/images/sequence-nav/problem-icon-alt.png delete mode 100644 common/static/images/sequence-nav/vertical-icon.png delete mode 100644 common/static/images/sequence-nav/video-icon.png diff --git a/common/lib/capa/capa/templates/optioninput.html b/common/lib/capa/capa/templates/optioninput.html index 6ceba78c1c..0a1562c38d 100644 --- a/common/lib/capa/capa/templates/optioninput.html +++ b/common/lib/capa/capa/templates/optioninput.html @@ -10,7 +10,7 @@ > ${option_description} % endfor - + % if state == 'unsubmitted': diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index a745129a68..8c3ab322e2 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -41,11 +41,11 @@ nav.sequence-nav { &:hover { background-repeat: no-repeat; background-position: center; - background-color: #F6F6F6; + background-color: #F3F3F3; } &.visited { - background-color: #F6F6F6; + background-color: #F3F3F3; &:hover { background-position: center center; @@ -64,18 +64,6 @@ nav.sequence-nav { } } - &.progress-none { - background-color: lighten(red, 50%); - } - - &.progress-some { - background-color: yellow; - } - - &.progress-done { - background-color: green; - } - //video &.seq_video { &.inactive { @@ -120,6 +108,18 @@ nav.sequence-nav { &.active { background-image: url('../images/sequence-nav/list-icon-current.png'); } + + &.progress-none { + background-image: url('../images/sequence-nav/list-unstarted.png'); + } + + &.progress-some, &.progress-in_progress { + background-image: url('../images/sequence-nav/list-unfinished.png'); + } + + &.progress-done { + background-image: url('../images/sequence-nav/list-finished.png'); + } } p { diff --git a/common/static/images/sequence-nav/document-icon-current.png b/common/static/images/sequence-nav/document-icon-current.png index 4eeedd8f76fb9bf548100da07636851e6e8b4d2d..153a067d3d10503e6308e011706b3ab88afa3655 100644 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^U^WLEkTt>lKP!+j^mK6yskrs_)J9$g1s-O{{CRWt zEO2Hv>0?^7^vAPO19yU$h!$aG4 z4Y5azE+6FXIc~UcOKaLr*HaDlj;(L^G|y!>jF8|^e5{?85XocNaP+vr85?z_bJg;v z6l6bH+<4F$mA>-xU+o)?S7eQK42}!&`ibRSWOHN`mw42?nbn+QUWGz$6Xz;}9gB_~ znD?uxo9%Kv&oSA98hl(^ZX~yEy=Z&!_r)e=mfBDH2XAbdCY`fW8t6O*Pgg&ebxsLQ E0FwqzyZ`_I diff --git a/common/static/images/sequence-nav/document-icon-normal.png b/common/static/images/sequence-nav/document-icon-normal.png index d508136647d19796f81cac15aaeb2223592e2916..2bc266bfe239674a57156078464362ab78ea7fc1 100644 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^U^WLEkTt>lKP!+j^mK6yskrs_)J9$g1s-O{{CSQx zYn+))`j{3i{qd|+!LobeDw!rv?zs-J2W;(Y8f!U?8KjyVV;715H8Xg+`njxgN@xNA DOsgGG literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!3HFy_x^nYq^5YfIEGZ*dU|0a=b-?BhKKEE zn;Uj>G$pHW^a*VAU@K@^^T9(d?*UVnaz^^XP=y7lN==jW{`D5fd=lI6W7qHZ4|=}G zbrl@@&|R!I{jiv7)t-xw8u|2Pdp3&R=JGK(ERrqRvmx+#u!Q0?#}+pKIR!^zSh;2I zYz%fj_@IsX&3@M32c`?jUfH2^SV&vZb!jtq+l2fNjBeExe@iXQA_{; diff --git a/common/static/images/sequence-nav/document-icon-visited.png b/common/static/images/sequence-nav/document-icon-visited.png index c0a1c7d0998d16a51924c87b469f2df197ac8824..681ea1fcac6838699e29a8814d11e09af254771c 100644 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^U^WLEkTt>lKP!+j^mK6yskrs_)J9$g1s-Nc{x`A` zcNa2BxpOXB`r}!t!cHmUR7;l0X0IG#4;b6mG?p?p{JnH@(cAYIftndSUHx3vIVCg! E0D+bvF#rGn literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!3HFy_x^nYq^5ehIEGZ*dU|Oi=b-?BhKJjm zukj@$PduW?V|7qFPVmfZ?FH5y(k$HW7nE|RED2z#{dbhLPv8uLnEdgBfA2~@pY!ov z`LzmVo{EUlg@*($ z$8EUmsMXjU=*IlN-|?HWMqATfmz|rYMn1aC?RMgGEu(R^P<5Xer!&xj44$rjF6*2U FngA(*O2 diff --git a/common/static/images/sequence-nav/list-finished.png b/common/static/images/sequence-nav/list-finished.png new file mode 100644 index 0000000000000000000000000000000000000000..e2b11e9e0a54166ba847f84962525760c455d57e GIT binary patch literal 1063 zcmbVL&ui0A91l!~4mPGDq8A^Thlw`HOPjQft)p#HS6FLptM=ewY4Wy)E_qq2v(ZFnzCa?N_0KXmwJ>bEKnth{>3^fk465=TQaeW_R%$N-@k()2h`; zy*Q&7*yi-mh6`+$q8TPN6}Y<5LIgC>yyc|XU!T6Pz%tY9O{pjp-5hFK(@P$zE|qG= zQp-r1?9^qD3KU9UBcg-AUT}ORNV7d&h039tXF<<|w9@QOQ1xON>dEk|HXkz_@TgZ{-*Z=N})RMdRm7d@rfCLylE^PNtI>qI&1&GRss zOokky7@-yszv~b^h&cYlfI&sR;aM)RumeIyy@A^#&C*DBQn1}(ahKTf`-P$<;{)C0 zAt&&*9p=@u_DKcpg|V--U+cPvuOJ_{J%jdRZejqYwL92RXh@?`u6h=2ioT#?qirLH z6x1|J|8S;dDuSG#RgA}kxJX3^6G9@Yig_q$i6|5kxdF$1*tnL>W?&|!2{{o$4Q9kx zCMn2jGAidKIiDY33yx28$3O$W7WLc5Mi0a)IS=Usdo_#~1`|+jVuJl9c0sNxgUO<9 zSWc)oA2w(wUln=QZDi&>Y=d5f6>FaeU|iJVf}}xdFY}C;)nYVlDUp!bKGyu7s_`@! zJ{*sK#$}+QGZ>1y!%q*p>w_G+Gag+I>GjDMbg`}%)J!e--uSb`FUcEE6yz=DH*4FCq(B_GUKg{xPGgi94_*`gQxbbH5>H7N2$3v$! jK4+gjIQ!w=Ic9v88UA^!H95BOK3v^`R#Mlpvv>aj3~Eeb literal 0 HcmV?d00001 diff --git a/common/static/images/sequence-nav/list-icon-current.png b/common/static/images/sequence-nav/list-icon-current.png index 602f0da61b55673cfcd77b03b33cb19ba1d14232..d9a147352627028456ee6a66aa8489dd1205d324 100644 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^_!3HE-Zss2cQrey_jv*Dd-u7?gWMJSp{OA81 zn-v^)Tf1gEFOW4-X%N}_H9c%mt8U$6*JQ@hYuOigdp1Y_wJ~_Q`njxgN@xNAPLvmFkIh!-*1Lt*pfU9i!UwlVjIWUvu%5nAyb-bS;m+@u~>Ie zdpKmJZP`GIl#KlfT_GKG(AN&0Sbv5R=ZEe<2fXNj-fsr1P~;icYn<{AjLQ(s7ZomX z^)Ds1n6!o+Hd%FDcZ4D*G;dVcGi|njW^ORk!Z3YcgY;nVZNS4wVN$Z492SelF{r5}E)m6dr5< literal 284 zcmV+%0ptFOP)?T&!zp68V{iuJN$IvLWm9HiJ>6j76?g?=qsVZ6PyN<^ z|H$yE=jr~>cQ_RUK`ji!Bb;CY3aW61gAQ-j66j!f(24;Yo^aRU`?CZ_7!ukuFyLNx+qbwqFLW5-4L> zP@91gEMcz0_tU@p#59HmmG~hAEvW18y(Iw$LqZz{y4+1J%J+Q_k%S^p(C2RQQc)BY i<2asC6BHDP$h7~nBx;61W$VVGJLy0 zoxn4rP#p+nx=k)nA+XCBsZ9vlx=k)11cdP?F0f3X#TcT84G8uyK+n)${NSEZs5S)e zWq(j3aQ92#t!!YGK$mfaGi*a}j7yvwF8<|-O9XZphX}C_K@$fE4f~59+%gIkYhYUH z2SE_jJ|Rjy@+>G|9|4I=CQJcB zAj=#~NwN&D0#Se>FVI^~z?3S2OtYeB7Q#hx#E%CQYXJeB9$?Kam=a@b$w zVJ4G_I7Bf)EfPV;B}SNVgLt1oLxJhr9er@WvhZT;*ss$ez1p76NoBauxZD4|f2KGQ+LEHkY!7SwPt|xD z3?GfhKjYF@(HV@y{o$vF{q;dE-5H-Q$M5AYt8}q$m$ZB>{5t<)+O1 p*VeAQ_M2Cd8|4f8#v48#;NA^8_`v*isL25IffZ(I<-2f zmoKXpb~!V);Ud?kXoks6N4{w-Ap#m`(ed)^_ZP2N;MjTgnp76bzJ{94>`H*uQ?x4>Rdt9r5Ti=OgqlMr9!`A(<9by6G-7I~P> zW@8RfOj3(v*!74RCA}~)V9-%$1&&V~?17lkY~VJ@vozA36kNYt-X-?JexYc|_{j8m z$O*jb#(DLuLsCV1VeD%i*1A68t0=_nz@q(FNDRQVb_Y9(4QVv$mB67*FF@6ciP0z_A}zlv7$tQFKF?F(5QxK};92 zf~;p#a#50t#R0bDg~aqMH1O+CzkRHBAXe1^WD*?IFm4SdV6KS?4x88q+Pn-V%ckXc zvEqE(pq+em6gan#T@0`bdKFfkeIkGv(Z~pr0j0gn3*wBCrfExxBC~z0{XbRXX)t^| z9{-HXKt*RT7I%lA9(LCUd30w2x*VU{FE{C8T`%c{TJ*W`dwY9&NPNGwb>ym0C{8|l zHj-hUujabq18`#K40CMi)R!-h4-bDlck=DV+K-Lq(}(Yle!UG7iM!nEpQ|^P-^^+k k|9m)G`S#?VGr=>5hMBf`ytVmjYdl`xl2OsuXKvp43nrXS9RL6T literal 0 HcmV?d00001 diff --git a/common/static/images/sequence-nav/other-icon.png b/common/static/images/sequence-nav/other-icon.png deleted file mode 100644 index 01c0bab93c1b1a00908a40510c3338e7824ae714..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 457 zcmV;)0XF`LP)^6(ZS&<1)Zaz#+u!vtVQhI3f;8+f-nebsHqpI zF~vw9q`bbv3CDwv6rGy~AAZAcIKIOTClZN-t_OFJ&BWvJXgZx1Qp!Jx#bP2D42p0# z+%S)C$R?_RKwvnZ&;RKT+qOj}lM&f$R<{G`BBh6SV+%Gact;6Ed>V|Oz>SJ8qll7H zgKa22f+A{ameede<9m^YR5mdQFFaT^6hDn8NW5bf9?Zat9HfEx6-XtADR|+5A73~U zM0H^oQe#1Ad8U}fi7AzZCsS>Jiq3huIEF+VPM&F7ZN@A$f#K0!hc!nXBu+4YTs&op2%DE< zTAG?!;-tGqwZBTb?ry65oYr;sP?MSh@6|Qu3_c`y>}Iu0c-ruTK|tH-r+?!P&ThF_ zg>wrxy0`6#PGDTkaaE^%$p=}1^M{fe%zJH(b?z{6MffS$@%X-D=56bZc3?bh=3#Tl zV9uSUxXPalAFnw++Nk(eOsp-?LD)cQ!(v8jAdz5_;LcnIBo1aA=wo|Rz!AZ(w5xDe uNzv^IW!zNDtf3eCh!1Jg~rD3U-(FbqNn!8S!9OoAdF88t6t8qH|w*adT;1Y#@6GLn>W zB_!!WXiUh$OBsYFgS9Y{h8C%exHvrrzQ9GC%H4g41W-OMArpE58oa2eKT2K`9H zVYSC?yv2my?>80}7Q{5o9a~#llgi4M|ofDWu8w4)QW8B6BURaUKF^g4vKoX9qz3gCx$X?Bn-uvPqm z0l_=0V%f$Dkpo1I(j2*(SSyMjf(nGOY-0uUR^&Q_Vd5uJkP5alBDZLcoIvC$f|*J+ z1m9pfA##w&(V8PS5zACYA*cu2(Yh5m1J~d~6=HD^Y-dD1qdD?kA{P?Or<{bK96l#R zb`yEG=E#}E@+o-`oC4cXtrdAkh%A~T3z4m;+d^a^vS^NMMcpkHAjvnavs5M!Gkmiict@b4KI-kiM&g5+Yz|QuQ%M;atJF!M<;INWMJSp{OA81 zyA>8!)^=D~u(S#}W--(-ADy$6TWfds65*4vAq%angyz@%d0*(vpm$)O0?X}iPoNnL Mp00i_>zopr0MP&=oB#j- literal 403 zcmV;E0c`$>P)rX9g%7h(*uw~dDE(J+EK>==CKOH4D!oMWpUQzi{5O#X)|b&qKYkS;28!y@S z44R<$KpxkqoegGsjYOep6AwB>A002ovPDHLkV1nJrsj2_~ diff --git a/common/static/images/sequence-nav/video-icon-normal.png b/common/static/images/sequence-nav/video-icon-normal.png index df907e83a00e44751b974e1a3300db8c6393ba0b..4b0baeeca04f3fa51f876317ec5cc2544368fe6a 100644 GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^@!3HFQ8hUO4DGN^*$B>F!M<;INWMJSp{O5nG z+-i#}YdfqgSXzY~vlwcakIvc3t+l&*iSWtTkcC!OLi6kXyf1WSm=-zVhTpl9=YeK0 Nc)I$ztaD0e0s!AgB`5#@ literal 394 zcmV;50d@X~P)%pQC9_CH0lV0i(mXt3P|2tfsSq{ z(9lFy=pu_77+90+kab5PIl+g1oZ$mtw-~_y(#Sg$xzNOpWc{ewcjQGc5-7mcMjs4pN_HG|>(h$3 oLJAGBhkcs^G*LkkIaFFj|J(^CVYfKH4gdfE07*qoM6N<$g7dwjs{jB1 diff --git a/common/static/images/sequence-nav/video-icon-visited.png b/common/static/images/sequence-nav/video-icon-visited.png index 49ab8085670c7b98025464ce40e252c15d63701e..62a5b9d6c45bf28f21a05477b60cd3d9f99c4ba9 100644 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^@!3HFQ8hUO4DRWO3$B>F!M<*%*m2oiFe)tzJ zdN{}VN`i&RF-{}q2htkP*2D(fj8&QI@oo{<)r%8O1cRrm KpUXO@geCxe-XgRB literal 425 zcmV;a0apHrP)0 zy-Pw-7=ZB$6*V+PB?=8u(9qw|-Xvk6L{1v0~q&f^!fw6hvRr&=9ni+6Pot znp6~NMj3$+flv|l1n-4Ahz-Btyyx(6&pnE!X~U67m!uYLjl<|+JI6;SCxNsu7}1MeBv5e{Z;;XwIVL?N+@l-S{5C!;JwE4cS~prCa8oS z^iYsN8qH`z3EQYcgF!udB{YUcj1tNluU5thj`4#htRiNxj$H}mkU*YL<}dUM!H1cC TSYmwX00000NkvXXu0mjf_{y;Q diff --git a/common/static/images/sequence-nav/video-icon.png b/common/static/images/sequence-nav/video-icon.png deleted file mode 100644 index 715a38eb969291976cef50e6c8d23fdd947d3ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 zcmV-21kL-2P)BVCk$c$Ll}l5fnm60)`_3Hy1EX8LZLnVkiNb?RZ~-QxS^q82o5nU zp9kQGF(}_VaT(6~`ucAg8yg=Ahr@=%2?PSFzrX+Bz<;knc^?vv1cu>~Stq_#EiEne z@S_s1U`XA zr&?QEPr`$ADEx|fs5tI{#^+GT#h=a1&Cdpd!96_?52H#;OFyZqs`?E|te^`jjvQ#b z1%-S9FIcTsi&2q%KA-CB>^$7t+v`UP6ddqE#gPh)Iw(Aexk#v5{0^C8D z385CC#4q>k%HSX zvjGDmM}p}XcBnWWi?fqQP1?y@&{3{I#gQIoCyz(Moxn}ZO5DHTNpibb6XRIGl7W%m zCDsa+{ycqhAWsx3Q}V{ z2#qgg_C?I@t_wfL;KI5%kB%7MV;jqG!i!~t*Tp8T;tIBL6W^gD$~jzwh7W_dL1ec{ s>tX|=aN#aOu%jc!57@yH1~CQqzgEp}j^-X^y8r+H07*qoM6N<$f`$X@~ diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index 9f0be9c298..952ff91365 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -27,6 +27,33 @@ form { } } +textarea, +input[type="text"], +input[type="email"], +input[type="password"] { + background: rgb(250,250,250); + border: 1px solid rgb(200,200,200); + @include border-radius(0); + @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6), inset 0 0 3px 0 rgba(0,0,0, 0.1)); + @include box-sizing(border-box); + font: normal 1em $sans-serif; + height: 35px; + padding: 5px 12px; + vertical-align: top; + -webkit-font-smoothing: antialiased; + + &:last-child { + margin-right: 0px; + } + + &:focus { + border-color: lighten($blue, 20%); + @include box-shadow(0 0 6px 0 rgba($blue, 0.4), inset 0 0 4px 0 rgba(0,0,0, 0.15)); + outline: none; + } +} + + img { max-width: 100%; }