From fa2f8567721de2564f69e9878c6b913d11c98fbc Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Thu, 11 Apr 2019 10:52:17 -0500 Subject: [PATCH] Font based add buttons, closes #283 --- app/assets/stylesheets/app/_ionicons.scss | 16 ++--------- app/assets/stylesheets/app/_main.scss | 4 +++ app/assets/templates/notes.html.haml | 3 +- app/assets/templates/tags.html.haml | 3 +- dist/assets/ionicons.eot | Bin 2978 -> 1998 bytes dist/assets/ionicons.svg | 32 ++++++---------------- dist/assets/ionicons.ttf | Bin 2800 -> 1820 bytes dist/assets/ionicons.woff | Bin 1944 -> 1280 bytes package-lock.json | 2 +- package.json | 2 +- 10 files changed, 21 insertions(+), 41 deletions(-) diff --git a/app/assets/stylesheets/app/_ionicons.scss b/app/assets/stylesheets/app/_ionicons.scss index 6390e6f48..48b99d156 100644 --- a/app/assets/stylesheets/app/_ionicons.scss +++ b/app/assets/stylesheets/app/_ionicons.scss @@ -13,32 +13,20 @@ @font-face { font-family: "Ionicons"; src: url("../assets/ionicons.eot?v=2.0.0"); src: url("../assets/ionicons.eot?v=2.0.1#iefix") format("embedded-opentype"), url("../assets/ionicons.ttf?v=2.0.1") format("truetype"), url("../assets/ionicons.woff?v=2.0.1") format("woff"), url("../assets/ionicons.svg?v=2.0.1#Ionicons") format("svg"); font-weight: normal; font-style: normal; } .ion, .ionicons, -.ion-ios-box:before, -.ion-bookmark:before, .ion-locked:before, +.ion-plus:before, .ion-arrow-return-left:before, .ion-arrow-return-right:before, -.ion-key:before, -.ion-lock-combination:before, -.ion-eye-disabled:before { display: inline-block; font-family: "Ionicons"; speak: none; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; text-rendering: auto; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.ion-ios-box:before { content: "\f3ec"; } - .ion-locked:before { content: "\f200"; } -.ion-bookmark:before { content: "\f26b"; } +.ion-plus:before { content: "\f218"; } .ion-arrow-return-left:before { content: "\f265"; } .ion-arrow-return-right:before { content: "\f266"; } -.ion-key:before { content: "\f296"; } - -.ion-lock-combination:before { content: "\f4d4"; } - -.ion-eye-disabled:before { content: "\f306"; } - /*# sourceMappingURL=ionicons.css.map */ diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index a63f25de2..7dc1a4a0f 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -194,6 +194,10 @@ $footer-height: 32px; padding: 0 14px; } + .add-button { + font-size: 12px; + } + .section-title-bar-header { display: flex; justify-content: space-between; diff --git a/app/assets/templates/notes.html.haml b/app/assets/templates/notes.html.haml index f5f6e2e0f..4575da770 100644 --- a/app/assets/templates/notes.html.haml +++ b/app/assets/templates/notes.html.haml @@ -5,7 +5,8 @@ .section-title-bar-header .title {{ctrl.panelTitle}} .sk-button.contrast.wide{"ng-click" => "ctrl.createNewNote()", "title" => "Create a new note in the selected tag"} - .sk-label + + .sk-label + %i.icon.ion-plus.add-button .filter-section{"role" => "search"} %input.filter-bar#search-bar.mousetrap{"select-on-click" => "true", "ng-model" => "ctrl.noteFilter.text", "placeholder" => "Search", "ng-change" => "ctrl.filterTextChanged()", "lowercase" => "true", "ng-blur" => "ctrl.onFilterEnter()", "ng-keyup" => "$event.keyCode == 13 && ctrl.onFilterEnter();", diff --git a/app/assets/templates/tags.html.haml b/app/assets/templates/tags.html.haml index 7c0a15ff4..d8b6eafde 100644 --- a/app/assets/templates/tags.html.haml +++ b/app/assets/templates/tags.html.haml @@ -9,7 +9,8 @@ .sk-h3.title %span.sk-bold Views .sk-button.sk-secondary-contrast.wide{"ng-click" => "ctrl.clickedAddNewTag()", "title" => "Create a new tag"} - .sk-label + + .sk-label + %i.icon.ion-plus.add-button .scrollable .infinite-scroll diff --git a/dist/assets/ionicons.eot b/dist/assets/ionicons.eot index b2e176a7b4fbe8726f42c8236b3514c5e8f69143..db772e5aa13190ed73992b1ac1248c87d2d62bb0 100644 GIT binary patch delta 977 zcmYjQPe@a79RK{@dsC;lrfC0I_HY(Py0+Y@4Y#(bF6Kr9`KO_ zBv?m+%e~Upt!#E~t*ykCO3RbqrvN(8?e^VE;VT=D4(NTK@>D#d<*MNyLzF+0?!@Pd zDq6%9h+XI?HehYqC%b!3EJ8y zccn7L(t=V(3l$%zI6kY#HPIoSGC?!71qqtZj8}P9D4b3r+UWyI)&9w7}-(z97{B0Uo?N>eh!L2MbnBJ6Pg-S#q$9 zE_`vYf(Fs#U>Ce1>fk!+A6Qc;ZuW28q>Tl{0_6pA~dGLh@M-_r<19o+8w{3hJ&HO9(7z-htowZUs-KD zQ)y|Oh=kCKeo~mL4Pg)%)w9J>J)cad;XqIwQpfacI<996grQJxf3KB?(N7BY%YwOw zQyl33>!rwJ{Zjntgd}942v_}FHa!{+25lZ1uz57%@Tld@%e1oAa_w$>93gg|tj+%c Dsr#q7 literal 2978 zcmds3U2Gd!6+UPF?TPKN>z|}?l8H^@bk)Yr*dDu0(i+;N>UPV9-E3H(bQ9A2K@xkD z6w(*uhYD4QhawQt{zz0vJitn5TO_m+5^^Qp;GsfY38X&s0s4R_TBW;UA65z99Z%Y( zm6mtz%)RILo^$UxckY~Dm_#21iI^l3O(IqH5OA)uz+Rec(`5M&l6JfO;M&|C?+LW% zEY)d^mTAs|8xV!*6`H3-x=brHOY7j+G!4!=Z9q?G+f=|aOhXF@@#^#&Z zu@U&6f_%%{8}>JM?ZNFgBBP&>+0M#et6!@_PHni`Vmu%XKWQ+Jx3$}%A&(E-vm~bM zHPhpm^fqZ8OBiO4S3}T6Q+SfElM41rya4))4?m$Uy886V5Xz4a1Mta(@k`X)rjPGF zUPBFRk*B?8gZjOQ6WXsKYCh@I0uNoRoNH}9IN}tFp7!mmfD#tdq>wm~79PmAX?tP& zJKH~dq&@oA$9IuS!I^)W6P80i54{t5GbDBNnC`w+!Hj5(i0mzvMO@lJ_hjC%Cw#*B zf5g1+f?n{RZ_)SZUHTn&@;YCa)({bqySMl?#9XJLn@su9Te?CIotv6^Z}gTd0i~O= zV5@?COV{|b(OU@TL#G%mMsvkzHhS%Q3k&?(&U;ZV!WyEyd!L(pgAT$cr7{C!TyjUG za>*?YJINj{iXpCLIU$(2@<4VtqbIavAQTG72c}P)nD)?}|3u%3rMm|QyVG_ka5oU@ z8^3U2yw5|qudmPP<(?ky^-^rZ-wefw4kU^WjA#2Za5}=}Y$DhE)G&7L7{;e9=+uml z45MH)Ycu=ju@2S!Q@Pn}?M-ExsWmYVvuomvv`DW(t z+`(#fu$s2IBwdcnIva)}F^dT@)WyrPs;ihSb^287fFfJ*ubg-Y1FS=W<&S~rfjSaX4EJPFJc=e<(yPvkQ3 z5q3)1Tz?|lpS9S2-?D0!)#949bKfeoS~qOFIVtW`+{#VdVG-Px{n+!5=`FGAz1(4& zPBM{AxK64pG7|F>1Fpz!Np;KFauHh>@!3CQac0I?(^Gox*&$I(WD&WPo_ux~<6;lH zm0TsYf6&A_;E`*!#*Iep+_%r&AG$Pz!_j;7;>D{MFKtatZB4PM=!V**bZLgEm}W3y zMnYjlQzKz3W-6Kz4n=~IP{34zy56aF$(pKkDxJC>Py$d6Mq&Y3SIn3d52&8983~$D z4rpD&oSRUen|{Wg4DrbF~cA6KCBnUAYvan8pzGWbQD zBUS>ie+0daGyYoRJ}$xUjE~FoBL4nu9R)i7^l_DJR()K9{VJV8xzwO5D4mv3P%Y6W z*))h!>oB0>l~7gqvuPE2bgJICvc9~yv}q5{9k!jqaP^423jT9-)!F*m@?3olwc0a< z+AH&mmse&{KuvgM+NKBB;d$QkC(1ROj-x+ovdtZ)A{|9p=V07h9Zl5NHYe)qi}SWK zRIrcRd(MFl7mp4*N5w)vcai_IcATDH-&n4%*@eRJP@zz;Ki3+v -Created by FontForge 20170925 at Thu Dec 13 12:46:07 2018 - By mo -Copyright (c) 2018, mo +Created by FontForge 20190318 at Thu Apr 11 10:47:26 2019 + By Mo Bitar +Copyright (c) 2019, Mo Bitar @@ -16,35 +16,21 @@ Copyright (c) 2018, mo font-weight="400" font-stretch="normal" units-per-em="512" - panose-1="2 0 5 3 0 0 0 0 0 0" + panose-1="2 0 5 9 0 0 0 0 0 0" ascent="448" descent="-64" - bbox="0 -64 448 448" + bbox="0 -32 384 416" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+F200-F4D4" + unicode-range="U+F200-F266" /> - - - - - + diff --git a/dist/assets/ionicons.ttf b/dist/assets/ionicons.ttf index 8f31abd2f47a0a7f083564bc81e709a1a7d98347..d0ebfd4f68af2881d1bbb01b8bb40d398063768e 100755 GIT binary patch delta 920 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 diff --git a/dist/assets/ionicons.woff b/dist/assets/ionicons.woff index 86767230eb71105a613f5289d35519536339c4a4..af5fd5d97000504233796ea33e5d248e37377678 100755 GIT binary patch literal 1280 zcmZuxc~BEq9DbXPNjMFll5hzK6y$J0v_J`m(1aUC@ZeB32LUtzGzj5P2^5FRD@6pW zpcEplGm24)P>(1Oi^!0oopz8aBxvoJA|iqmYx+X{v+vFKcE9iU?fboR3*(tgfB;xl z0AQkjl5OFT00N|X4cR*D z^D=;2kZ%vQ7^o4KVTOcfvPIBG9EY5uhfW93OhFMJ`f&K&S_oXLJH00>gUy5Q81#5S zY&MVNHDy6jABWr)!U;`4GO~pEVyI~$w}4nfECXhOTrTtx5+JAQf!HC%Lbe#@Mam$D zIegMq+&Oth~60r=8e5Eyj(c9x-Po#;=F;FNMez9EBa$eiMNDm#q9H`sSmeB zxC9kna2DLSF+^FoHqPkFtoQFao}81)bi5Y*<@i=#Wz-bmEa;9z0*b&sch zZf}PPhgP<^4Xn z_b;xzE7o z3;T?;g#K*C>V@ln@Pzl?dkL#5M;>K)R;pE3`)mVT8)wYhl310$nR=Nv95dfiYF}io znHakoEW0B+EK7}V9{CQpn>^I>dR(*;$vd9wdbWiX!*HL&1H1Do;zxvmllMhs&Ao5O zL(>^0({f#CyJ61aJGIPe`%BI5qS_Mo5#deskSJvM${(iT4Ds~nVTr%Tyx+dj^NKZ_ zh$xRHcTrV&->tgY7KeTNz4FMOhkt!cYT~30*;_}oY6c@3w)16AXXcO2O4Sd4L9KuA zZSstCpBm5apVnS`P^-C2k34t1psUrf(7=&T{TQ~GSv0K-bWoOV$UZqHj}va2l7^?q z_9w^IY4U6~Ctq<%6BQ0L?Ax*BnbLoMS7gP3-L`d}U%v7iO&QwM9qh6`zWTp=!T}Y! zZkm&1)jBi)C)fIT!@5z9$>pbCWc1SMw2-VYBZ`o3*ggy#ZyP>^M-d?KpF+^zF&yWC Xa_iKEFDm}Lw51fY0#UC??$Gcryd34- literal 1944 zcmZvdd011&8pbCfCdeY22na#~iiNTy5Eda=6bPG0S*%dD69^#?6P6-dxvYXJM*16^E}^4_a~D9 z0>BMZ1ytpu(yF}we~nBI_Je)d@Z3&V2E|dHr~HGgZ2&;<;MfNibYL8Ek6}`h06;3j zaVR{O@&q@W5|fsSg&7rQsL#?sxW`d`fPI)$IF@@AWip@;cPx_z`|>-wc|rZZDBV7B;$St!2%8pjf2U>}kWGhMk9 zhPTj}lngj8LVgbHX9a;F7KIrL09qa9daxhSdzsXil=uVuZWwt^FIXALCN9nyQ!x+~ zg23~+GjSNnI(zGP=Vrs%QI!t7cXg51_})&2sB!~Ccg}! zoumMgnW+8nj`HuW47dOdk8o00h|kOwSjmBWJw*lL35EBB!o}NF147~Kw#&cTc-eH| z@puB?##WdQ3I^3V^W6U7)l%`0_JD#+4Zlb*gpz=gt+81E1fhV7gUXH1drjWQiU6`z zS65eGy-EyFwgr3zcNK6lW6Q_?<$@qu9;AmRqt!(Sscv8Pj$(kd1SeeA{Z;Bl_s8aP z-&Ma{tFb=%NrquJ7_(OiYY!HFxgRDPx??iLMBAxu!QUhZi}b4VP+DEcVu~7AG1UKB zeh~Ps;oki76Af|z4|F1Q5h(}`l9e$P5$K#aO;(@5Rd)MIGv)%ar%4Ac4hW6o$HOD7A3 zU(lR)-eZMR&f(6AN2H*Fb5^)TGbLv>s2TxG(J@wabrYK{ku0xz`C-Unlw z#*{KewdKw~{fG7~WjvuuyELHoa!Z>iG1~Ob%64-?bxGzH$@>gS-7LycpNJ=xWQK2(>^jB_Ddy^&ztTF1n)h|s$;X@V z$4Fiknn!%I!9!1dzw0GN=@p(B@z~75So?1b21dMT-E{RYBo3?E{q;Kg=V|ZY`}nK_ z&lXSM7hhXuT@osDBu3fq;y-wN2i4j zoB!@j|H^jjrpUS+U%4y!8zTCWW?8(4;fwgRqje`u`>UUz2iy#Ek8M6W%TK|n?YDo* zNxSfs#3q{_l2)nFIJP#lw)E-oh6CgJM3Q6Hb^pVWbv<2{c^ZLc zmf+VMa9gXFwbgI&+Lh$nl16sM(S@DA-mPhAu4<8Tuz&JOxt0kBBdP8p8MUPQ8+jf0 z*BJt<-*vltT%Tz}>6Jj4sgl>^l-*Ar>}a!d+Z$AGTEuMa5$T$Rn>UH#Q;N6iS^K)> z?|Gg3$+=b!_%J#-<>&I-=zY-Vh`vc6^z-4N-bh7a~NKe8&i-n`Ko zQ=~CNdSA7%BsjaLmxOt=nY9gP{+3jqduoeC4R56WV5#NziUT5o_)tBCW8=?n+NS)Y zqr(vaGnVJSd&KmYd$k+skrPDGGg1m=+5DDWd{IH~-W5It{hdeV6jQOfqLXDGyxq#0 zb`g5;enNWFt_t_OdbOw1jkavx?icE%$*3N(EWA@|azAA9r5;CvLK#MPw;mtC!qTWvG&Pz^qf)4`)EH{q95hF@ zzCV;|YlF`lrZs*$rQ+j!fbOgK$0YFSb}Ee5($NCDpKHO@79ik%9a3K3A&3eJT3