From 33a66c87cf2fec6ac8a61a6c0bebfc666099ba2d Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Tue, 24 Jan 2017 14:12:57 -0800 Subject: [PATCH] replaced image based icons with widget-symbol approqch --- app/app/components/folder/folders-list.js | 4 ++-- app/app/styles/color.scss | 4 ++++ app/app/styles/widget/widget-symbol.scss | 17 +++++++++++++++++ app/app/styles/widget/widget.scss | 1 + .../components/document/page-wizard.hbs | 4 +++- .../components/folder/start-document.hbs | 4 +++- app/public/assets/img/section-saved.png | Bin 329 -> 0 bytes app/public/assets/img/section-saved@2x.png | Bin 774 -> 0 bytes app/public/assets/img/template-blank.png | Bin 1168 -> 0 bytes app/public/assets/img/template-blank@2x.png | Bin 1402 -> 0 bytes app/public/assets/img/template-saved.png | Bin 1238 -> 0 bytes app/public/assets/img/template-saved@2x.png | Bin 1433 -> 0 bytes 12 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 app/app/styles/widget/widget-symbol.scss delete mode 100644 app/public/assets/img/section-saved.png delete mode 100644 app/public/assets/img/section-saved@2x.png delete mode 100644 app/public/assets/img/template-blank.png delete mode 100644 app/public/assets/img/template-blank@2x.png delete mode 100644 app/public/assets/img/template-saved.png delete mode 100644 app/public/assets/img/template-saved@2x.png diff --git a/app/app/components/folder/folders-list.js b/app/app/components/folder/folders-list.js index 69ad16d9..c63296f0 100644 --- a/app/app/components/folder/folders-list.js +++ b/app/app/components/folder/folders-list.js @@ -47,13 +47,13 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, { id: "0", title: "Empty", description: "An empty canvas for your words", - img: "template-blank", + img: "insert_drive_file", layout: "doc", locked: true }; saved.forEach(function(t) { - Ember.set(t, 'img', 'template-saved'); + Ember.set(t, 'img', 'content_copy'); }); saved.unshiftObject(emptyTemplate); diff --git a/app/app/styles/color.scss b/app/app/styles/color.scss index bef64b5c..4741c03e 100644 --- a/app/app/styles/color.scss +++ b/app/app/styles/color.scss @@ -37,6 +37,10 @@ $color-chip: #dff0f9; $color-chip-border: #daeaf3; $color-chip-text: #1b88e3; +$color-symbol-box: #dce5e8; +$color-symbol-icon: #a4b8be; + + .color-white { color: $color-white !important; } diff --git a/app/app/styles/widget/widget-symbol.scss b/app/app/styles/widget/widget-symbol.scss new file mode 100644 index 00000000..9c062a94 --- /dev/null +++ b/app/app/styles/widget/widget-symbol.scss @@ -0,0 +1,17 @@ +.symbol { + display: inline-block; + border-radius: 2px; + height: 40px; + width: 40px; + padding: 0; + line-height: 0; + margin: 0; + text-align: center; + background-color: $color-symbol-box; + + > .material-icons { + font-size: 22px; + margin-top: 20px; + color: $color-symbol-icon; + } +} diff --git a/app/app/styles/widget/widget.scss b/app/app/styles/widget/widget.scss index cbc2095a..b41956ba 100644 --- a/app/app/styles/widget/widget.scss +++ b/app/app/styles/widget/widget.scss @@ -75,3 +75,4 @@ @import "widget-radio"; @import "widget-tab"; @import "widget-selection"; +@import "widget-symbol"; diff --git a/app/app/templates/components/document/page-wizard.hbs b/app/app/templates/components/document/page-wizard.hbs index b8ace7e1..caf91168 100644 --- a/app/app/templates/components/document/page-wizard.hbs +++ b/app/app/templates/components/document/page-wizard.hbs @@ -27,7 +27,9 @@ {{#each blocks as |block|}}
  • - +
    + view_agenda +
    {{#link-to 'document.block' folder.id folder.slug document.id document.slug block.id}} mode_edit diff --git a/app/app/templates/components/folder/start-document.hbs b/app/app/templates/components/folder/start-document.hbs index ca5395ba..cf0f600b 100644 --- a/app/app/templates/components/folder/start-document.hbs +++ b/app/app/templates/components/folder/start-document.hbs @@ -9,7 +9,9 @@ {{#each savedTemplates key="id" as |template|}}
  • - +
    + {{template.img}} +
    {{#if editor}} {{#unless template.locked}} mode_edit diff --git a/app/public/assets/img/section-saved.png b/app/public/assets/img/section-saved.png deleted file mode 100644 index c061a80c1f99b578c3c02185ab30da5321c515b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$P)Px$14%?dR9Fe^nav8qFbv0&;c=i3Fc5G0Dn5ullW*ohL3HBBX|kQI9pYs)kgVN^ zkldD}*}uPb%jocUd#>Hv?EqW>stilWaD#{I>4-j}bJ2 zu>@krtKWkY?hN;*GgNiWO(*lFc@C?^oQ!t^Y=W<*>5lDnEv>^A*h@`)bGL3J4w65OU<365_Tl@OKbu|Po~6Y1SPaW zxom=|I*GK7sFQ?dIJA#VaA+Y^eG^EL;rfjrmlTy}1Sv9H|347)r|D|VAEIN1TL6tB bzrP_q+bcK1EC|Lf00000NkvXXu0mjfJ{OBZ diff --git a/app/public/assets/img/section-saved@2x.png b/app/public/assets/img/section-saved@2x.png deleted file mode 100644 index a8bf09b1ebd24d23d7ed55352981bf756041bff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 774 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)jKx9jP7LeL$-HD>U^?LG;uuoF z`1bC@EMZ3h_78WRKPK_9a+|sK{9xPHnE%xIhswUT{0Gb;M?B7IUg5vx?bkBTdZ}Q{ zrI}~WuGxF2e*cucGjHb9n_qX(`;z4G_|2a`mG}SGNhj6V@*L)rJ$yr7AUUQzu_FHZ z_xm>1R=;G{f3)LKw7D7IwD>nm632bvN2|N6_$z*Q{76o5D-(^~R-?7ZoJ(alSN-R_ zCxXl=;hm8l39Jk!KAmu6IOUeZ#tDIb<1B;1X=Qds4e5=N3@MdQ6c|#K&6pc> z`ej%aEULHVMvVbeQJO#}r_eWc+U9MZtsevEpH`*FQ|! zEgSeY-e~^S#GMf>$IsrW|F~sQHT$|-FCR>d*#7qLs@(1e7Z<&2i2c9%M%r;bpN^$% z)(Iw?N68M$Ts6P6jJ zy=>VRVWYckZbj9#W$SVNp@QvF3i?PI6*y8pY``kQ^#?yKJUHQ%ka|K0rN<<7VF z-`Ve}+sJoB)#lTizjtyD9oK)oLGy>^hP3Q2YM+euZnVvk^1XR*=ey|!cLQc|$!X^N zwyVk7FUzyYw}gFfBX$rSA z8MY=x+A$alycKDP+NdMnAlXsI<*+tl8vg+v7i-o9VLGST6WA8bWeU)q_LSLx`Jx}= z3enS_7-uwQEN8gVmHLz6jKh}8uU^$3&R#vCUe%#Y^lx%)MURL_S%t(wkKOzEl^3{M qT?pp9)L6b_PO7hwlD3iZZu_c-ja!XlpUed&Yz9wPKbLh*2~7Yyu~}UJ diff --git a/app/public/assets/img/template-blank.png b/app/public/assets/img/template-blank.png deleted file mode 100644 index 12f52314084392607d1b0d05d312be122d8d771a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1168 zcmaJ>TWHi;6b-d{wW2t-{ZPv_rdO$@lUF;_CU&gTWX2AfGM$b%plH+NOeeN^n4EDk zgI26>Z@)yiD2k6ih5DgFD}zr|@B#WGs9%C`;i90ZA0jHA)K2xoxgp6pXJ@Uo_t|@& z9FBLdomaKE3d68@u`V%z#s=@1Jqx`@zfI_9SOg;}*lVU?PPPFSR?U8Z$8>oBB!H~u zx8Dct7&fC(OQv8-TF)z{PRbsJbae}{F|57AwPa-wK)fFeXhw*5Tf9Nwni?WD1|(Xt z1d!3X3O491bSIU)I}g~wwmS>Vsy$ET7`%V zgceUxxm=FSHIt@2fVdn-(JaNXeuVHlc>~I>-*DUs$QY#A z+NO?AZk^Z4#}Y29H^o)U$I@ArOQB#WufV?)yktUMUf!8ymzWaYJ?5P|ZOCC@!b)~DX zv436Ou(|f=f5GbdRVO~zCN3DO>Hs*Z-|K{^fu>m&Pj9p2n5_ RKlXe7h*+dsyx7?{@*R4Dgr)!h diff --git a/app/public/assets/img/template-blank@2x.png b/app/public/assets/img/template-blank@2x.png deleted file mode 100644 index a49068f7a96cae2119c3aeaa5ec873e1be1c4408..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1402 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n6)xPB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*hs;Rw<*Tq`*pFzr4I$ zuiRKKzbGB3*V0noz)0W7NEfI=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{QMkPCaRL@jF!#6QG zGY=%J3D)Q9Yvq|&T#}fVoa*Ufs{}MjFEca6%EZ~k*wNY0$->0k)X>n?%+k%kz|F|j z(9p=y+0E6`9H!SLKe;qFHLnDwHwB^B8K+)QlE^Ip+U$~Alv$RV;#QQOs{r=8RVHq? zSmHDfsy79Z3>$$KpAh^6-ZNL4G)AP!v^BY^gvDn@nPFnGwp6?xb ze8wNmRSV~y*u=Dn_1jfOwc=C(mi&bgjyz)A4Gc^i3Joj{42&!j7=SDWA%?v^H@dq` zX6atcvF4tyKC`2{%rCkbAj5F@v6DrGz^>#^)N>JRcy-3j8+GX*s0>k~w zWfxU9pUBuE)Ul4y>h8SNx`ETv7j0a;p-SylL&lfg8~8eo`K$Rj`8NH^r}T+41sk%Q7F}DPU77E*0^}p0KNwjA9GHMC zCJzQ6i-8mD)sOrIx9WGs9qFzv;JwgyyoSBURXMFZaqFfl>sMU;qc}NwLD#Lzg&XGo zEw!B=9e7LWL8YOmtDnm{r-UW|^7QK; diff --git a/app/public/assets/img/template-saved.png b/app/public/assets/img/template-saved.png deleted file mode 100644 index e6d9740a56d0b289ba09560a166d4d2c3e5b054e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1238 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 Yp?7+r)20bLdq9Pyr>mdKI;Vst04=uvIRF3v