From a7c710a0de02086abb364c0cec32e3e795d2c174 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Mon, 8 Jun 2015 14:39:19 -0400 Subject: [PATCH 1/2] Moved Creative Commons CSS into Sass Also reconfigured paver to compile Sass into CSS directories --- cms/envs/common.py | 7 +-- .../static/fonts/CreativeCommons/cc.eot | Bin .../static/fonts/CreativeCommons/cc.svg | 0 .../static/fonts/CreativeCommons/cc.ttf | Bin .../static/fonts/CreativeCommons/cc.woff | Bin cms/static/sass/_build.scss | 1 + .../static/sass/views/_creative-commons.scss | 14 +++--- lms/envs/common.py | 10 ++-- lms/static/fonts/CreativeCommons/cc.eot | Bin 0 -> 7000 bytes lms/static/fonts/CreativeCommons/cc.svg | 22 +++++++++ lms/static/fonts/CreativeCommons/cc.ttf | Bin 0 -> 6840 bytes lms/static/fonts/CreativeCommons/cc.woff | Bin 0 -> 3976 bytes lms/static/sass/_build-lms.scss | 1 + lms/static/sass/views/_creative-commons.scss | 26 +++++++++++ pavelib/assets.py | 44 +++++++++++------- 15 files changed, 94 insertions(+), 31 deletions(-) rename common/static/fonts/edx-cc/edx-cc.eot => cms/static/fonts/CreativeCommons/cc.eot (100%) rename common/static/fonts/edx-cc/edx-cc.svg => cms/static/fonts/CreativeCommons/cc.svg (100%) rename common/static/fonts/edx-cc/edx-cc.ttf => cms/static/fonts/CreativeCommons/cc.ttf (100%) rename common/static/fonts/edx-cc/edx-cc.woff => cms/static/fonts/CreativeCommons/cc.woff (100%) rename common/static/css/edx-cc.css => cms/static/sass/views/_creative-commons.scss (63%) create mode 100644 lms/static/fonts/CreativeCommons/cc.eot create mode 100644 lms/static/fonts/CreativeCommons/cc.svg create mode 100644 lms/static/fonts/CreativeCommons/cc.ttf create mode 100644 lms/static/fonts/CreativeCommons/cc.woff create mode 100644 lms/static/sass/views/_creative-commons.scss diff --git a/cms/envs/common.py b/cms/envs/common.py index 0069746a73..7c234bdeb9 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -478,15 +478,16 @@ PIPELINE_CSS = { 'output_filename': 'css/cms-style-vendor-tinymce-skin.css', }, 'style-main': { + # this is unnecessary and can be removed 'source_filenames': [ - 'sass/studio-main.css', - 'css/edx-cc.css', + 'css/studio-main.css', ], 'output_filename': 'css/studio-main.css', }, 'style-main-rtl': { + # this is unnecessary and can be removed 'source_filenames': [ - 'sass/studio-main-rtl.css', + 'css/studio-main-rtl.css', ], 'output_filename': 'css/studio-main-rtl.css', }, diff --git a/common/static/fonts/edx-cc/edx-cc.eot b/cms/static/fonts/CreativeCommons/cc.eot similarity index 100% rename from common/static/fonts/edx-cc/edx-cc.eot rename to cms/static/fonts/CreativeCommons/cc.eot diff --git a/common/static/fonts/edx-cc/edx-cc.svg b/cms/static/fonts/CreativeCommons/cc.svg similarity index 100% rename from common/static/fonts/edx-cc/edx-cc.svg rename to cms/static/fonts/CreativeCommons/cc.svg diff --git a/common/static/fonts/edx-cc/edx-cc.ttf b/cms/static/fonts/CreativeCommons/cc.ttf similarity index 100% rename from common/static/fonts/edx-cc/edx-cc.ttf rename to cms/static/fonts/CreativeCommons/cc.ttf diff --git a/common/static/fonts/edx-cc/edx-cc.woff b/cms/static/fonts/CreativeCommons/cc.woff similarity index 100% rename from common/static/fonts/edx-cc/edx-cc.woff rename to cms/static/fonts/CreativeCommons/cc.woff diff --git a/cms/static/sass/_build.scss b/cms/static/sass/_build.scss index f3a2333c61..a5cd8c5421 100644 --- a/cms/static/sass/_build.scss +++ b/cms/static/sass/_build.scss @@ -67,6 +67,7 @@ @import 'views/group-configuration'; @import 'views/video-upload'; @import 'views/certificates'; +@import 'views/creative-commons'; // +Base - Contexts // ==================== diff --git a/common/static/css/edx-cc.css b/cms/static/sass/views/_creative-commons.scss similarity index 63% rename from common/static/css/edx-cc.css rename to cms/static/sass/views/_creative-commons.scss index 473498a935..d14351f83b 100644 --- a/common/static/css/edx-cc.css +++ b/cms/static/sass/views/_creative-commons.scss @@ -1,16 +1,16 @@ @font-face { - font-family: 'edx-cc'; - src: url('../fonts/edx-cc/edx-cc.eot?52318265'); - src: url('../fonts/edx-cc/edx-cc.eot?52318265#iefix') format('embedded-opentype'), - url('../fonts/edx-cc/edx-cc.woff?52318265') format('woff'), - url('../fonts/edx-cc/edx-cc.ttf?52318265') format('truetype'), - url('../fonts/edx-cc/edx-cc.svg?52318265#edx-cc') format('svg'); + font-family: 'CreativeCommons'; + src: url('../fonts/CreativeCommons/cc.eot'); + src: url('../fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'), + url('../fonts/CreativeCommons/cc.woff') format('woff'), + url('../fonts/CreativeCommons/cc.ttf') format('truetype'), + url('../fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg'); font-weight: normal; font-style: normal; } [class^="icon-cc"]:before, [class*=" icon-cc"]:before { - font-family: "edx-cc"; + font-family: "CreativeCommons"; } .icon-cc:before { content: '\e800'; } /* '' */ diff --git a/lms/envs/common.py b/lms/envs/common.py index 7292ea9519..bc8f4fb2b9 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1339,16 +1339,16 @@ PIPELINE_CSS = { 'output_filename': 'css/lms-style-vendor-tinymce-skin.css', }, 'style-main': { + # this is unnecessary and can be removed 'source_filenames': [ - 'sass/lms-main.css', - 'css/edx-cc.css', + 'css/lms-main.css', ], 'output_filename': 'css/lms-main.css', }, 'style-main-rtl': { + # this is unnecessary and can be removed 'source_filenames': [ - 'sass/lms-main-rtl.css', - 'css/edx-cc.css', + 'css/lms-main-rtl.css', ], 'output_filename': 'css/lms-main-rtl.css', }, @@ -1362,7 +1362,7 @@ PIPELINE_CSS = { }, 'style-course': { 'source_filenames': [ - 'sass/lms-course.css', + 'css/lms-course.css', 'xmodule/modules.css', ], 'output_filename': 'css/lms-course.css', diff --git a/lms/static/fonts/CreativeCommons/cc.eot b/lms/static/fonts/CreativeCommons/cc.eot new file mode 100644 index 0000000000000000000000000000000000000000..3c652cc929a8695ebb50b59dcff96cefc074a39c GIT binary patch literal 7000 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 + + +Copyright (C) 2014 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lms/static/fonts/CreativeCommons/cc.ttf b/lms/static/fonts/CreativeCommons/cc.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3bde4e7c92566e7a8c416952cf6a186ac0580051 GIT binary patch literal 6840 zcmd^DZ){uFb-(w$$48o?C|cqlS(N2VJ&K~mM_Q&xicu7rB`L{~Jx7*hl~i1Z6h&E9 z^@o*c!}g582+~dy(jq8=q8Pd$(}JQOjOxUrdhb>48BQOLbD28po z2COjXo%2Zjv!!+D*U{p;zjN-n_n!an(u5L1%;XjkN%oa<$AU5Y%frC=1ANEx^SR>Z z&O;v)LR0V^&R;Dt;KRp!7aqpx;-&eOx8KeH{To8+ikEWBMc`Y2z5}D-(%kjwV~=i} zCq#G~$d;KxZb};bhyRA9w_!dq0}TBY5!M?Y0qvfdFJ1F{0g*ZbJi6x=^SS!JsyhR8 z6zG=u+_fV4Mco6S$AD%Fx%tAk*T45KK$qZ*UlkXZOM~}j@^HQi^M74jDinYBUGe*{ zv>)idBvkxI`Zm!KgK$Im6gY2HNBWQ)rvmIibRux~_>4>sOp*9w^4KVjKAj~KVw}7Q zV(7c-2iM`ZwZ=;Ug|n?hB508eBZUKCho?`0CXWe@&2)PYDkJ~@{YQHGFUXu$i=Ik;AB_-)o#IY4?O8Jwb;)K$Uiz z)nRu5-we3Z6Atz6n6c9@@6%REsQlr<{mR#ZMD4%**;mrnmHS^x58J(sQEMCX#7>{? z8~4PFt>%7nBlUEd`x@h(xZC6L^pCmwfgNLF40gExpz=r(sQvx}+WO=d!b92*n^f+7 zNmXx~+hQGFIh|lu%c#d{_qH*w$DN9Ic{Gk2lN9oTJbhifE5-m>$zkF_d)wO%*-Sct zpuO#(pw$s{*bh_1ri2yEkftD18G~=8*2-9g6oFU-O)3tM6j>fZ4N|FQ~5v48*9_IBOjUCSs6*{rkrM<-qB-w-oB4Q|Mh{< z;zM=H}7n3s%+G*o<9rJD&{X2vJA`^XX_uJ3}KepPmn(t(sUp zVKmUu)2Z*>4q#``5!&0M@7ZM)Z`@d$T@U^A^{Y2;nu?K6i?j0UcP+r5${A|Ya27^RBCQ+*xfw*gKkrNyf5V^>XU^pU}UHTqqQ-WGZ$xU~%Z zG&0sAj|oPptMmqIYyYg8pNZ+nh(Ur&0f9H~c3(M2+DIqqCJk|u>Q#=|8yo5*qQm^O zTV?FyO;$&51hs4mhC`it*KIH;yNKFcj%^1+i`Sgq4HPIC>*Z2bF`*8z8)IvRF)&Cnn2`(PA`HgVFNd z+!tpI(jUL@?qLCaY%x~eHCimj8HZ!7&vVDV}iaj+zWp?n;tq|r_B*QK|A%1uzru! z7F&#O$WIJ6Z7@B76bXk z`NGsSe?C82xO8PMw^Svn&+)?2^5w+^c0ABsWegP-3QM_CVG4I$zIrKGDowNLrNwzR zSlf>kmlkIW`BGq}R4VozJGS#2k|c|yNUoD5a+zErGo(Zq6hV?4g)s<)eVl{{4EooXXNWmDByq_99mDp4Jksh%3>0cxam)FkBd zx_sV0c^#h%d4u-!7p~O6Y!Ug(Ic;_dpT#LXJZ}`17Exq*29g57Qepn`wd%p}%L#r# zHSE-a6P0mtK0T0O?9?4%K6{GG=O)rTRhJ0R`bh=!eWH?DG zsdcE9WH#aFROKu??dO8ZrWn6F!X?kdx|bT01Nni`SJN)V}1)x+`0Np>L5#V!}{ zlWdi(!rtX>T?d$THk}=D=0-DVB?GhZb7`1zqEWSz{amMVebToMVb@$E1F0kwaIuoe zaba?r(>$EdbzOe0R~afn(=G~MY1VPNrSqsuOrEUM3-yJ*$33!&No(f zp*~O{2^MGBz^anNKxm#KPV^>cPEc}FOD=XOxm5Ltx_y>&H>`riTc+(?WWt%_4BO`kefWjbBJZ_@aUYMC@7&!@`` z4M|RO3EtqtB!$#Xluh`khX<#2h=kZNk}hNBg0m8<5MDgC%ca1wP3)}B;}XbyoXvnG zL!kdq7J|4dRQm+5Oh}UgE{1H1ty4<1Y-mzRnFs@8Y2KhD*Z{ACq%=a@vI&-j<9}tb zQ22kPL}E2tZj^m|$>(ebH(9~9CZC_%)H21<4t~bbp_WA)o7J*};~}-I!?8sz%Q!mK zvL44)wQRuguv$KVW1C8Nz3}IC?=59FMB3U(53@73{ZUSrUSf#h~S2+RYCvJEe--wMY)`X5bq_AVo*>0|7K=H4 zHvOT%MCSZZ@Q5v$1U5JWv`RP+PE-b=v>=MR>ja9L`l_8=NM@%LE+%tR&|`#T&Ivf1 zfx>)tO%7CouB!~@qD}=)7zDdu&`yE<_BaF-!A>Yab%XD9kVw$CpV0(%%)#OgO$m6y zYXn=^_F0f6z32l5r|Ud5A1M9cnyAL+2B==f29+T^45Rge<}x&(=20@14zPZB@u9{w zCTzCta=8Pjmtkt_)mjbI^U0M}YLNjQ{k*THL2@%RS$y|CYvN`oUsM$qK(7r#*X_>) z%06m^!t38+Lo~P9FKw|k>CL6PWMV20`!;8GZF)lG5#K805GKnil;d*;Ls$ab2j|B% zcVPlom4{$BiC!B3 zzp_DiXKniFWfjwrp9HrKtLub(3&1G=6v1hAoobxF0HATspiBa$UO^cIBPfI5EXp7l zMVT0Yb0~vg3}q0UM;Qd;C=&6D?{8MZc#Z6kSq3JRk|1H=~4)8wy->k6go7 zji10J`@tw&KwIcM*)zwey2?jQI29&0Ho0t5g!V9@~8-<7HPfBE12{~uaM%27leMom0^Ik28rgpU?A+~LKy4TRh*JT8+&wxu z+1MWA1;#>cKo9AEfZIF!+ku)h=o18GCegKkhYq$F&_j_4dTxObCsKTQ>HvzM2Id10 zAh@AE5Mu`yZ$D7m2RR%BQkWkAoZYNJA0;VibEEtld3r!B`jqeK)VGxKM?5SN)r)6JXPiJROXaC?6I-=5+a->A7rC%4G<)=&>N9+u?h?swn zGz9_x*U1lyEBkU2mK@7+^uI9TJr*%eho{h%o^Qo> z)G;!TkG|Q9$2>Ayte-l#R|4Ydd7u}vzBbUn3ZYZZ(OI(9@;qmyqS$@!V7?x%oM+z( zc688V4okiY<$Ob=>HUVuMyFS7k6<4kEeG{yNHa~Ogy)i)h+b#_7!7 zN3cA+4Vjlu)u$Si?c1U<@-`$OGL-j++$5nOPFTD<6))Eq0$pFXR!e;E1aUsjKNQ*w zK9cV%#hx(lvx!a!5UWRIKGY`v@@BH(`oQ=jgE)PgZ|^uXge)c<2{rCe1zTJ6N?g3m zVpLPVviQAcYlb=_zvYOhPb_NQ&OB+u=g}+kC!d@@Z;1^Y1?O!{hZK%U&mBs#Vw|?U zQ+J~zh3n3hE3BPG9qvEdlOpn@#+r4K&|vF);G}bEq)%%fAe^sJlg@DxV%|NKoeqhY zofhGOH)b?E&khlEWRapB02HDjC3p7vY+VHn^*)x-yogh*5MLAUtSK$_GdLH5oUh<+ zKgTx6zLlRmi&c3Mq@T8$^uob^tfz%A@nLA7mstTV%(lbmL~p-iHoLmi@VUQ@C!Ign z@UvC;ow7YEd0(euOqgEmDS%KU-Y^&v< z!1VX0a{6wm>+XR?!E6bsp-zT7eT;M(@DrCK#p&(W+6Si3u}}Fr#;0T-a%kY2tDdNF ztw%oE$C%a5DWWtBUsg_24%ElO*p=oVt0vkaPL-)^l$2y@+aBbNx19I$yDmzdlZM@Q zw7NKI&sr%=ecX^@Yv2OWYhp^%o67FS*HC>KD%lJCFvI6LDfY!%YyM|@`NO90@D^kE z?i@>MnYu{jb~hDs<-kzc@Hbntlm%ZH@;b6`v51cO((u^hMB1>LtYlTWEw7Tj<3^;+iA5QvuDzKDDdP*P%jJnlGg^(0TtCn@5SJJ)1J~Y>JEi( zR<~u+9g23#Pm-M(gBUm}>V6LkiB={pAZ<$({xY+B$!P<55_#vCpdI9ycPMB!kkeD% zPW)bR*SxP)x@gmFcK)QLKdzG)*JrHnSdGAhy1`$EBBQHh9=*L=deK8JcRqtCzp#Sq zg-&?eE1xG^i~RlWzWRALqWs>NXs>5hmxW@xS_GtDM7-eexaSY_J(FxB_&+7MyaZr= zxjv~{4z$KB9~N``v$9w#R=KkVd$P;NY$R!|<2^2H#l1hk>lGgG^Q0n*QaR&NbyacT z%*i?0T@S@6&{JPgIMSAvu8fA_bOWZlIoarOWy)7L182M0(ouUkS6vz$GdaGuscZzx zbbLQP2Yxpndc*{&q<2vx!dOn&ex}W&6tP?*W-8X>D}vZu8NNDv3;qjH#39J3kWj2X zqAyuyoaor+%~q~=Lnl3QUoz>#TRT&Huom};9fTLYeA(8r+`$D;MKAitEu1pD4I2p3 zdf-co{eJ~iRrx!Iu`hFJ4;+*!8w=HBmnW!Ka{0~ZDZ@H2)?P_BWm^>u{AYRnzrWT8!;ckA|f?H#pY+J9V2*uF$o*!TEbU^;x zp3O_VY#rk`NlOcfT%VK)GWu#nGI{SDxS&{-YLasI4x9^}yds7xxOKylL7(8yTIs?u zB_VhEp`(4uds{Keips;}-uJozH!^1@9Z}q?qQZH_4l@Fh3Ul!)sD!U#7Xt`_rlT0s zXOg?86}?>LX!j4*bR|~}Pg_l+#$|#kf<1=(2g_1hO&eOxct0r(E2sZF8aSFmH+(V9 zWci$-U29Oiw(^6N??`Cg?34MId{?pYkeJE|?ebhpBi#L%zH83Lxgtj@9FHYTO;UaU zQ9^ym`HdQLo^?<=_W2|RqM8Av0lOWS5t(!bpfzt}Kho=-aKXm9CQgsj}^f*_~#?m5|a9WU9@_ z?2Yj)fi#QUO&<|nH+1&PiTDRKSwrWjh1~2%8XZz+&N~wsL}Cj^M%s%;nbr?TeYc%p z_y;Gvuy3fP(hf2{_MdQq4CVw2X3Aop&E7v=IV2)4KF2J}c}e9yE%%^bS(tK(ZS07%v{oxNK#b(}wX*%7F z-q|TUT)b*+l8a_FzwB#xij2`~m3FUH%+qy=@Y%FDLWVP}7wvgW_5 zU=axJ5XsWtfp3$RXQ9;{l-_gpo>`b%S@0_JFR$v9%c68=A0sRMr#)lk6o(r%q*%qn z+gT|qx}gNo4>jQup;5GUM%ZlZ)@{gt)KpWNj!&yHH6Ak8?{3+9e6USkN(F7$a9{Zc!= zcj$i7$0Os)v3iZ;Xz`iP=n~(|vNDAgrg2oyT+{pMmft3aN$B4>4tO5B*El9M$gvJRE-(hF!iC-LR&RrM}t;0TOM9 z$HDWEuFlS&Cw>&b4)Th|ztY(ccu#;NC?q%|)FzB4+=Hk>UJ(6l83;g70Ez&~KNlf5 z!vQaF<|GGufWLS7Bx|X5%QD~>-!xbWiCk}HyIrh2CNm!4!$tpGi1-?@2gi*(UIE8) z^>RGAOUjQ_bj>(Og`_Hs5p~*jdok#c7ohqR*= z)tHxh;U#^?b%{kZF~?y!k5%3!=}{u=1K}U5DGy?3@n7q-N5Z^sYdDw3R{Xhk&;ykP8H=2;E1Q9Mi#qS9P4_de0yp$p0QBECaEVnTdxC_^@%=JvFx)EgHqq{a z35Nv)(Cbi literal 0 HcmV?d00001 diff --git a/lms/static/sass/_build-lms.scss b/lms/static/sass/_build-lms.scss index c5f95fe8bf..b3862e2c0c 100644 --- a/lms/static/sass/_build-lms.scss +++ b/lms/static/sass/_build-lms.scss @@ -52,6 +52,7 @@ @import 'views/decoupled-verification'; @import 'views/shoppingcart'; @import 'views/homepage'; +@import 'views/creative-commons'; @import 'course/auto-cert'; // applications diff --git a/lms/static/sass/views/_creative-commons.scss b/lms/static/sass/views/_creative-commons.scss new file mode 100644 index 0000000000..d14351f83b --- /dev/null +++ b/lms/static/sass/views/_creative-commons.scss @@ -0,0 +1,26 @@ +@font-face { + font-family: 'CreativeCommons'; + src: url('../fonts/CreativeCommons/cc.eot'); + src: url('../fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'), + url('../fonts/CreativeCommons/cc.woff') format('woff'), + url('../fonts/CreativeCommons/cc.ttf') format('truetype'), + url('../fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg'); + font-weight: normal; + font-style: normal; +} + +[class^="icon-cc"]:before, [class*=" icon-cc"]:before { + font-family: "CreativeCommons"; +} + +.icon-cc:before { content: '\e800'; } /* '' */ +.icon-cc-by:before { content: '\e801'; } /* '' */ +.icon-cc-nc:before { content: '\e802'; } /* '' */ +.icon-cc-nc-eu:before { content: '\e803'; } /* '' */ +.icon-cc-nc-jp:before { content: '\e804'; } /* '' */ +.icon-cc-sa:before { content: '\e805'; } /* '' */ +.icon-cc-nd:before { content: '\e806'; } /* '' */ +.icon-cc-pd:before { content: '\e807'; } /* '' */ +.icon-cc-zero:before { content: '\e808'; } /* '' */ +.icon-cc-share:before { content: '\e809'; } /* '' */ +.icon-cc-remix:before { content: '\e80a'; } /* '' */ diff --git a/pavelib/assets.py b/pavelib/assets.py index 5653301647..6b0541c30f 100644 --- a/pavelib/assets.py +++ b/pavelib/assets.py @@ -15,21 +15,22 @@ from .utils.cmd import cmd, django_cmd # setup baseline paths COFFEE_DIRS = ['lms', 'cms', 'common'] -SASS_LOAD_PATHS = ['./common/static/sass'] -SASS_UPDATE_DIRS = ['*/static'] +SASS_DIRS = { + "lms/static/sass": "lms/static/css", + "cms/static/sass": "cms/static/css", + "common/static/sass": "common/static/css", +} +SASS_LOAD_PATHS = ['common/static', 'common/static/sass'] SASS_CACHE_PATH = '/tmp/sass-cache' -THEME_COFFEE_PATHS = [] -THEME_SASS_PATHS = [] - edxapp_env = Env() if edxapp_env.feature_flags.get('USE_CUSTOM_THEME', False): theme_name = edxapp_env.env_tokens.get('THEME_NAME', '') parent_dir = path(edxapp_env.REPO_ROOT).abspath().parent theme_root = parent_dir / "themes" / theme_name - THEME_COFFEE_PATHS = [theme_root] - THEME_SASS_PATHS = [theme_root / "static" / "sass"] + COFFEE_DIRS.append(theme_root) + SASS_DIRS[theme_root / "static" / "sass"] = None class CoffeeScriptWatcher(PatternMatchingEventHandler): @@ -69,7 +70,7 @@ class SassWatcher(PatternMatchingEventHandler): """ register files with observer """ - for dirname in SASS_LOAD_PATHS + SASS_UPDATE_DIRS + THEME_SASS_PATHS: + for dirname in SASS_LOAD_PATHS + SASS_DIRS.keys(): paths = [] if '*' in dirname: paths.extend(glob.glob(dirname)) @@ -111,7 +112,7 @@ def coffeescript_files(): """ return find command for paths containing coffee files """ - dirs = " ".join(THEME_COFFEE_PATHS + [Env.REPO_ROOT / coffee_dir for coffee_dir in COFFEE_DIRS]) + dirs = " ".join([Env.REPO_ROOT / coffee_dir for coffee_dir in COFFEE_DIRS]) return cmd('find', dirs, '-type f', '-name \"*.coffee\"') @@ -134,13 +135,24 @@ def compile_sass(debug=False): """ Compile Sass to CSS. """ - sh(cmd( - 'sass', '' if debug else '--style compressed', - "--sourcemap" if debug else '', - "--cache-location {cache}".format(cache=SASS_CACHE_PATH), - "--load-path", " ".join(SASS_LOAD_PATHS + THEME_SASS_PATHS), - "--update", "-E", "utf-8", " ".join(SASS_UPDATE_DIRS + THEME_SASS_PATHS), - )) + parts = ["sass"] + parts.append("--update") + parts.append("--cache-location {cache}".format(cache=SASS_CACHE_PATH)) + parts.append("--default-encoding utf-8") + if debug: + parts.append("--sourcemap") + else: + parts.append("--style compressed") + for load_path in SASS_LOAD_PATHS + SASS_DIRS.keys(): + parts.append("--load-path {path}".format(path=load_path)) + + for sass_dir, css_dir in SASS_DIRS.items(): + if css_dir: + parts.append("{sass}:{css}".format(sass=sass_dir, css=css_dir)) + else: + parts.append(sass_dir) + + sh(cmd(*parts)) def compile_templated_sass(systems, settings): From 141892a9fd55b7e17437b66c135d52dd8496c800 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 9 Jun 2015 11:08:40 -0400 Subject: [PATCH 2/2] Move _creative-commons.scss into elements directory --- cms/static/sass/_build.scss | 2 +- cms/static/sass/{views => elements}/_creative-commons.scss | 0 lms/static/sass/_build-lms.scss | 2 +- lms/static/sass/{views => elements}/_creative-commons.scss | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename cms/static/sass/{views => elements}/_creative-commons.scss (100%) rename lms/static/sass/{views => elements}/_creative-commons.scss (100%) diff --git a/cms/static/sass/_build.scss b/cms/static/sass/_build.scss index a5cd8c5421..303861279e 100644 --- a/cms/static/sass/_build.scss +++ b/cms/static/sass/_build.scss @@ -44,6 +44,7 @@ @import 'elements/vendor'; // overrides to vendor-provided styling @import 'elements/modal-window'; @import 'elements/uploaded-assets'; // layout for asset tables +@import 'elements/creative-commons'; // +Base - Specific Views // ==================== @@ -67,7 +68,6 @@ @import 'views/group-configuration'; @import 'views/video-upload'; @import 'views/certificates'; -@import 'views/creative-commons'; // +Base - Contexts // ==================== diff --git a/cms/static/sass/views/_creative-commons.scss b/cms/static/sass/elements/_creative-commons.scss similarity index 100% rename from cms/static/sass/views/_creative-commons.scss rename to cms/static/sass/elements/_creative-commons.scss diff --git a/lms/static/sass/_build-lms.scss b/lms/static/sass/_build-lms.scss index b3862e2c0c..d42005f107 100644 --- a/lms/static/sass/_build-lms.scss +++ b/lms/static/sass/_build-lms.scss @@ -16,6 +16,7 @@ @import 'elements/typography'; @import 'elements/controls'; @import 'elements/system-feedback'; +@import 'elements/creative-commons'; // shared - course @import 'shared/fields'; @@ -52,7 +53,6 @@ @import 'views/decoupled-verification'; @import 'views/shoppingcart'; @import 'views/homepage'; -@import 'views/creative-commons'; @import 'course/auto-cert'; // applications diff --git a/lms/static/sass/views/_creative-commons.scss b/lms/static/sass/elements/_creative-commons.scss similarity index 100% rename from lms/static/sass/views/_creative-commons.scss rename to lms/static/sass/elements/_creative-commons.scss