From 59a73a3fb5a68173e55dedbc53eef40d84425113 Mon Sep 17 00:00:00 2001 From: Xaver Maierhofer Date: Sat, 4 Feb 2017 20:01:49 +0100 Subject: [PATCH] [TASK] Add & update icons to table-header --- assets/icons/fonts/icon.ttf | Bin 3500 -> 3780 bytes assets/icons/fonts/icon.woff | Bin 2516 -> 2712 bytes assets/icons/fonts/icon.woff2 | Bin 1796 -> 1908 bytes assets/icons/icon.scss | 29 ++++++++++++++++------------- lib/filters/filtergui.js | 2 +- lib/infobox/link.js | 2 +- lib/infobox/location.js | 2 +- lib/infobox/main.js | 2 +- lib/infobox/node.js | 22 +++++++++++++++++----- lib/linklist.js | 2 ++ lib/map.js | 2 +- lib/nodelist.js | 3 +++ lib/sorttable.js | 9 ++++++++- scss/modules/_table.scss | 4 ++++ 14 files changed, 55 insertions(+), 24 deletions(-) diff --git a/assets/icons/fonts/icon.ttf b/assets/icons/fonts/icon.ttf index bf938cc1ca9d7e1c1cff49c6fb6ba71676618cde..cd41d4d0dd2fb8b978372baf8d72c5fa9f6a7cd3 100644 GIT binary patch delta 1577 zcmah}Z){Ul6hG(n?`z*{>HoFcSl4#1ldcY4+t-OAjljkSjrHG{26b<1p~Y=&+A5&T zHeoSbLgF<>JZ;c>+s~?8d!g2lu>lvG)Z4EkVPfTvpDQPTlGx z@Edh0m&;aV&EJfUHakfX%8geJ7|&}i6Rs2P8!L>;Zppb5Ky!_-I4&P3!YiYRK8c#9 zDYX&nD};M!y%sotMeU+-(Y(knb}h!19$MPHlv%1Q{k-&726f{AoVUcXFq>!(4?cb0b`alg*ziHD-e{ z%joAWGFFTPU^`5~kI3N$?8hlQi&vQt^Ek7cImygxI8C=Et=XqJsrd?E&ZzBV=6=w( zp)zAkD>LjrRV}d}#yZXtUjvxI3XqJsf@|Fovjx+s)bQFjo2u0o7BID}<^(B&J$MDL zLl;0-zz~+=;iNkzN^v2ecR4)|CV@&O&!qw947jXek01FOi1*%O{=`{HT*QE6nOFMQZ;>mzvJ+@;k zL4=>7(0$%e=qPnB$pbHqpx;{SSXKvlS!_FNsnGoZOVvf@IwfO|LD9>^|T6CdX zImUG>zj6tKQGLfMd1Zj_s9Hx06BF6dO1>}=9g$0An>>*z74n&AIVYF0QF*L#Pcu4} zFOC%CQpU2jrkE`h$FdK=Qn@g}tywGi@hm5oN`?K=Qns9ba}A7T_f(>zeA8l#mhyXZ g1eF}$9`;a9)TfzIb51h-u5J17Cw0F6M9xqD2RL?kHvj+t delta 1275 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 delta 2427 zcmXAq3pCVu6vzK&FvzPNBhSea38g5n8H_iRW@xmrWg2gprqOCK$_{zt5i;Wu2C*S| z=B+7Yb}$}Mc@@etvWqrvF371qEH98gmV8hs=rBPd3mkVI*0%jCIDg9b;V%W~w#uj9OpjQT^0$2coc!I7T z$R2{;9ux`lnDmDi#RI$p8wLG+01)W@4N~0f@8jVO03sxi>4Gv4OX`C9gAio@)+&KI z23?^;p#GHGp&%>=!EsPJFf!DE;t>iq6d44)@PCqV0&aRxd_Xo1`Y+%kC9O7*j)Bym z+u%fhfJ_>c3IGKJLRpk_@(raSM8wJ{ik&&?Cf055QXlM6s%hOWR4Bp|_-In2Wi4a>eRM1tp`yk`gf& z(F+8JRx%RQ??ina7$#74jOBI`v=Ya7oRF0<19})YwIW8;ho?Ze?lM8;d#S1P2Q^`OSFzd zA;EWKO%jT;U|H$K{A|k$t&|hLD)vNn~`dWAy^bu-xHNJ zb04;a($|wShJHjw-#dn_gb%({bx`rtbjhWZn_ZOYVH7Vu6TU6<6GbZIkXh2TaLKV| zmUPm)L@v@TY-1_E9Z#a~*h|r6qgl$i{ca6?#Jz9to3BLh8gos@{ZC~kS_@e`t**k^ zbgD^5F7RB0=WPYG_3~@&D8aX;LZ}ssayp-Vn$}i>prg0oLVpg-5jGz6;XX1qbb8x! z+GkJvH7%*^Ie}Q3G`s(&`%yH1ca`7L3J-4IPhlUd&FAEo-vojgc|-J~qVt(y8N|?n zlKF2_MR}L<#{cBuc54)#VtATau50S=qT;Q?!h$!JzJ9=PuXOdOJ{Sm@z$52n(#4$K z%1BJ|#_A4b7qZRMh}7?WW5DQXEU7D2kfAfRjQd5>^?lkRY=sq7kIUE*t8vUS)FhPj z4Mrvu6Tb9~Dfle@szFyLKihcHla_?;0`sxaBPJ(eE1(y6v)3b+|1A>s8Ahs^f4S|( zwCK2}`33TZ|B2<=u*HU!Dn3a8z++95W0a7Jd4pTtwAW;6Wfk>fsE6_NSZ_th2ln%zwrynN^M;1!Z(j|+eLFGn z_WAIu*L*TN;3Vt)be(iq$4nAx=!?C(+R31xB-C|}z51ViVdgyZ)qlCl&}H`dLXsEy zyvqn^8l7i&sRAd2%ikn62TpaTAF`7a4hu)+`WcO&(<^+(zd4>maSu|_oZQXa3oVM0 z$C(}qbH_h7b5dKLsxkU#y0jhDkQvydqme4`!P_B!W=ey;#v|jm#{WijxwCi2-zTS> z`sE1VK6+}J9lXsUzg)HI&&tZuUoFjY)k#mFclciP3q4TQ>lEUx`(*D3(c%u%J@30t~bBKTi(#aQUB0_(m>oe2SUS`9zvaLhdnTR)qV@#EEcfV(v zMJepJ8$1G9k-G9WR`(fK89YPTq z!;+J@#+!U81)X$ohlR4dNF@lDi%_L!6*#~&aNM3DdIyh)@pUN8%Xf~Z|WOCk{7lWmNtUS zp1HTJBd#4$rw|2s$n9wRmO7`lVmFl1k$={ld)H+D>rP2#e#_nEee~DW>Hd+HuDhcA zi<<}LT|l)7qI|JZb@1=nzxSrtogrD9>MK~HHjzM7C(7sHCG!IEtdVNV_;FP8ajOX{ zL6YE$WPdJ41^~E;=C%J#2TlM?OH2_S&1_Rz^aAzIM6{(Z-Orh-gG51QpdB#GDHzmM z0XY4$7@uh;szJ9W`2+2u;$oObK#Z992TV;w0lYVey?p1kOJ6-u&s(!J9h9Bb-mZtOqk`hXirS)p- zrV?mos`$F~AB>s%eMo$N2E2Zue1WvWUn<@3(gWW;hFqKwh8 z3`p5ar(MIX#_6s(aSv`#Qa}!;W=V_M-JTt@eWfa;r{`rIuA!`?5>|TIm?bM46Xg0M hzp`qqqp6*E^gDDb+^XRJZ{Uj&ejx4-4xbDN{R2^&Rt*3E diff --git a/assets/icons/fonts/icon.woff2 b/assets/icons/fonts/icon.woff2 index 6d92253e7578fafaddf0164cbe174567eb2b03d3..6237616aab64af385fde716d472dcfe925b9e42a 100644 GIT binary patch delta 1895 zcmV-t2blPT4)hKfcTYw#00961000Mc01W^D000ie000LZkr*U@Vi5=mj(m$S3o-x! zHUcCAI0PUCgC_@qTpQpE$d1uVr%X8E1W7t!;KalC`~80HgLx92?vWvhMbiw8&|ipH ze-S8&P{f-~w}0>D=lA#DrhhJylDoT*<-w9r+lUe}L@G{INRf(yw;t2oD%pL{36!cN z6_GC!k)e&1Mqz1$?Fb7dbI*w&muvjbPySkfJlIjKu!_UkQcxr@9|%T4RwjU0X*||n_E5@ z?*?-w`?JS~Js&EuazJ#&R9P{7E&LjV6ib<#ra6oyLxQY-I#XmsMrFBKd0v<=$lZBO zp3J{0>I$*gS?n(M6-SFRfA&g+k-^OQ&1*hVXNj2b zjDIdZ3P8wAaPC_q#2iKO_Pe@WyL^}psuia;vWvv8a)uFSX`PL8|%G%vUm4w*McVRp`!ZTsP2P6S^z-J8ey0KX3 z;=2i=vda(=<2?tDdHwJCHrck!G{H-<4B2*`u{T zeDk1S*~C6?PZ=*6%^gQHDwy|+*JOHsg|U)`?HB3I+vZR>=q{+vlBd!A=rkEP7l3&E z9Lbi>krlB^W4;&XT1BLcS-f~mN@h`}PBK!V{NSycJx5yX_Mienb??)%X{|Lx_kjG1iN;^ifv>w*&LoiJhd@T^KrC0F?8?-wgsN6YX0-uKmiqg#eo z+SLrMbj?=%{%246SZ1u4`MYWtDI3<(;UCzM%Zpj*V`(bWWC%%6qHzv&P(4(QE=ud2R9{tpq+Zq5OjR76XEGN|`fySK%<9yad1NXTq#c?JeZvWc zc}sKIf!gL6FX@}m4&(;*U(g$pJ+tb$ZMXRv)>jxzoXG%==aVfhGQ5mlbh%7-=Lxob z^_agFPeA`N-P7Jqa~ysCe30hgYP-uHR8m1#AgB-K<)ODIwO&oVg*x4|7) z#{OiIQB+(fy&6CXvZEEf2kTSJg`0hK-2B#nfB=J&Gwv@|4gXEiBmr_EoaNQ=A+>OQ zG>qo;m{AFR4(GY3P7s~+h9y`JuL7%}CDg81t^>@f^(M;K5Mv;4jY=rWXSYDDk= zra(=zFrZz?!I%<~UP_^VO0JDi4Z8(32%lEe!jUq{5>=;Sjo?8-DHEio7y>dH-5|$! zuzm`SAFbq3&96>CiKw?*R)NF)YX6V%76w@5;ZtjcrEtibB)bAESZ$S>^e0#G@nDrH zVZs`UT~r{eDj1c8jZI1o0*}K>zEI`!uw^ACb||}US}CkBmKj-prg6e{;?1fm)dJg< z#VXyF7`VJO+tL!#0^>>e5AJ%IAPEVQA{mmS6x0hTP%6TRKqR7&5~)xcqLCWCfHX*p z7}DkU)K#rsMd!p)6;AN3DP0p-C94m315!_;2QRGxo7Wp_*BG6o#qePw#3-4{7~?nB zVkwmq%&`jcJBDILz1uizyXf?1kVZ;xgBYw(qic@j-`hi-ME?-V=Fmku2c%F hK1>tXy^>@Ed&ss5wo6!iPqU3KitqO)*^w>)006v7f9C)I delta 1782 zcmVEQIu;^O7=y8O=P&>p-4P>Zibsp8#>QP#7e~V(vN!lc!}4; zE4-SnmqB*e90GVF+=bd0sz7}OsQd~l8ln4pbAHY^_#``t{|Xif3`AMtA; z#h@SAe=0t;zA#iM1u$8uoRF#?6Fy2t>Uns_0W1)_JlM^j**~2>`)rf})_X(KkN#nJ zfI~FuT+j_aC=+vUdHs(9%Ei+Er7uc#=V#}XGuavE^me-1#=hR(W{;--&}V2B5R`Jv zL%~>~1pwB6zXt)9V(YUO3*lf_Pb^DoT^&9+6;)v--sj;oD|Keub%#{i>`JlHzP)P} zv@hDsjKzE|Unbe%B`&j6!!`m0Ndes@&@fEJz=V0R;(k>QO2xJyv2Y+!CE(<@BF{7; z5dmtcX^J`_#KfR@1XTbpW-)mZ6s0~5X_TV=-gu0E58$#H`CJZ?!uyzz+H%Gx2!IT@xR za3W1?XNL)^F%~P%{c5x=k)drgbplY3@_Kw=RWatpW}9HvAclD?21T6+^}3RXYLF>v zB7YcvP~V$p)pOAc+HW)hBv7k)1ZchP1I1=Dq*yZz-Hht$%z<9e-}eTD{-EGYg8F0g zApkMQ0n`afhnAsFqN_itPemtGNKn5JJqKZiSQOV1i)IEBq(HwnHBj{-L(*NZJkms6 zGtVtXgLIC|YA z$XX0Z4D;eGN0YgZ5Dk&A(J@aS?Io0sj};9$~)5P_SwsKuk`5h^XbHF{6Fj}_M=qQ@a99kdj)8G{rTPg=Y;9MS=dj6WCY7~ z6g58^{7V;wgp?}b_U-J@zz75BO0mm-%m`Q4l$6+1Fp-KF2_1Qukuz}jqkH?V)e5pl z=76@I5*61_ML9vWbs$4Gov^yS`ReW?fnU^_HsmCGHsu9M8V@vPk%IylMvk>^pSUhH zRcpZ9!TSR$g19Q$`qizhPgb6E_E%SKQ+`IIe3Pr&E_Ylh>_}t%IxAgg7iV36OwK!y z_;1}i=IslgB=?U;l_`b8^VX0MCugsrPn&ao?)jy|GUAk1B|@tKBJFzQ)leIX%Cntc z-M^e$kkPMJN^dR0*HoCrU1YDC+b$b1U51&=x>}WSmIJI;=;w}qc6tdV2%S0_O;k@L zs{Z|Ve1$xC?2lgeWw*QACorIY*(0$iN$Jn$6a;Ao;i5m~wW(t7-U)>XC@d_jfZWsK zg9{fN@-Mv&e{uMQM;#*xAT&z<_VxH=Np} z^|KoNj`Reg;mA%CPK?o z1OuSS3s)_X!2qDpDldWkmlDDUR>271^f3ZF;w6wkeY3eF5_vK(RR}QvU@7SV84Gzr z7IO+Y!mG>XG2b9cG%44rLWwpd8lh&jsr)l@n*)hTlxb0|KqI`BaX1jFPOWD9CpIcm zf^Z^oKzJdI^3-NW0w+Cx(ZMfrhnve0{6b?{32_n~h!^P^2dW$eC*c5OiWp{cYP7gX z#jr>xWGJaPSu|Zo(V>Bk%(lZA{}{=9|chuMNu3jQ5t1Y9u??f8@5A6 z53dFa1;xekMQ4??29j%!9b^i0H*#gJ{_I-5?d;MDuH@r;mU^L3-XlAsh)z@Nkbm$jO+lplt7-BC*@;h*Zj$Vmr%CS<$Jb;3w@xzI YzHzF;k#a?0OKE8&z6^c#I;*4_0EvS@ApigX diff --git a/assets/icons/icon.scss b/assets/icons/icon.scss index af30a52..a3ec26b 100644 --- a/assets/icons/icon.scss +++ b/assets/icons/icon.scss @@ -12,8 +12,9 @@ $cache-breaker: unique-id(); url('fonts/icon.ttf?rel=#{$cache-breaker}') format('truetype'); } -[class^='ion-'], [class*=' ion-'] { - &:before { +[class^='ion-'], +[class*=' ion-'] { + &::before { display: inline-block; font-family: $font-family-icons; font-style: normal; @@ -27,22 +28,24 @@ $cache-breaker: unique-id(); } } -@include icon('android-add', '\f2c7'); @include icon('chevron-left', '\f124'); @include icon('chevron-right', '\f125'); @include icon('pin', '\f3a3'); @include icon('wifi', '\f25c'); @include icon('eye', '\f133'); -@include icon('ios-arrow-thin-left', '\f3d5'); -@include icon('ios-arrow-thin-right', '\f3d6'); -@include icon('arrow-up-b', '\f10d'); -@include icon('arrow-down-b', '\f104'); -@include icon('android-locate', '\f2e9'); -@include icon('android-close', '\f2d7'); -@include icon('android-lock', '\f392'); -@include icon('ios-copy', '\f41c'); +@include icon('up-b', '\f10d'); +@include icon('down-b', '\f104'); +@include icon('locate', '\f2e9'); +@include icon('close', '\f2d7'); @include icon('location', '\f456'); -@include icon('android-remove', '\f2f4'); -@include icon('ios-person', '\f47e'); @include icon('layer', '\f229'); @include icon('filter', '\f38B'); +@include icon('connection-bars', '\f274'); +@include icon('share-alt', '\f3ac'); +@include icon('clipboard', '\f376'); +@include icon('people', '\f39e'); +@include icon('person', '\f3a0'); +@include icon('time', '\f3b3'); +@include icon('arrow-resize', '\f264'); +@include icon('arrow-left-c', '\f108'); +@include icon('arrow-right-c', '\f10b'); diff --git a/lib/filters/filtergui.js b/lib/filters/filtergui.js index ebb5ce3..5dc033e 100644 --- a/lib/filters/filtergui.js +++ b/lib/filters/filtergui.js @@ -21,7 +21,7 @@ define(function () { d.render(li); var button = document.createElement('button'); - button.classList.add('ion-android-close'); + button.classList.add('ion-close'); button.onclick = function onclick() { distributor.removeFilter(d); }; diff --git a/lib/infobox/link.js b/lib/infobox/link.js index 9d10c1b..08ac18a 100644 --- a/lib/infobox/link.js +++ b/lib/infobox/link.js @@ -27,7 +27,7 @@ define(['helper'], function (helper) { h2.appendChild(a1); var arrow = document.createElement('spam'); - arrow.classList.add('ion-ios-arrow-thin-right'); + arrow.classList.add('ion-arrow-right-c'); h2.appendChild(arrow); var a2 = document.createElement('a'); diff --git a/lib/infobox/location.js b/lib/infobox/location.js index 802893b..fbaf544 100644 --- a/lib/infobox/location.js +++ b/lib/infobox/location.js @@ -39,7 +39,7 @@ define(['helper'], function (helper) { heading.textContent = title; box.appendChild(heading); var btn = document.createElement('button'); - btn.classList.add('ion-ios-copy'); + btn.classList.add('ion-clipboard'); btn.title = _.t('location.copy'); btn.onclick = function onclick() { copy2clip(inputElem.id); diff --git a/lib/infobox/main.js b/lib/infobox/main.js index d358fc9..0a0ba39 100644 --- a/lib/infobox/main.js +++ b/lib/infobox/main.js @@ -27,7 +27,7 @@ define(['infobox/link', 'infobox/node', 'infobox/location'], function (link, nod var closeButton = document.createElement('button'); closeButton.classList.add('close'); - closeButton.classList.add('ion-android-close'); + closeButton.classList.add('ion-close'); closeButton.onclick = router.reset; el.appendChild(closeButton); } diff --git a/lib/infobox/node.js b/lib/infobox/node.js index c10dff1..b70bfd2 100644 --- a/lib/infobox/node.js +++ b/lib/infobox/node.js @@ -83,7 +83,7 @@ define(['sorttable', 'virtual-dom', 'chroma-js', 'moment', 'helper'], var span = document.createElement('span'); span.classList.add('clients'); - span.innerHTML = ''.repeat(d.statistics.clients); + span.innerHTML = ''.repeat(d.statistics.clients); el.appendChild(span); }; } @@ -189,12 +189,13 @@ define(['sorttable', 'virtual-dom', 'chroma-js', 'moment', 'helper'], return function (config, el, router, d) { var linkScale = chroma.scale(chroma.bezier(['#04C714', '#FF5500', '#F02311'])).domain([1, 5]); + function renderNeighbourRow(n) { var icons = []; var name = []; var unknown = !(n.node); - icons.push(V.h('span', { className: n.incoming ? 'ion-ios-arrow-thin-left' : 'ion-ios-arrow-thin-right' })); + icons.push(V.h('span', { className: n.incoming ? 'ion-arrow-left-c' : 'ion-arrow-right-c' })); if (!unknown && helper.hasLocation(n.node)) { icons.push(V.h('span', { className: 'ion-location' })); } @@ -207,10 +208,11 @@ define(['sorttable', 'virtual-dom', 'chroma-js', 'moment', 'helper'], var td1 = V.h('td', icons); var td2 = V.h('td', name); - var td3 = V.h('td', { style: { color: linkScale(n.link.tq).hex() } }, helper.showTq(n.link)); - var td4 = V.h('td', helper.showDistance(n.link)); + var td3 = V.h('td', (n.node.statistics.clients ? n.node.statistics.clients.toString() : '0')); + var td4 = V.h('td', { style: { color: linkScale(n.link.tq).hex() } }, helper.showTq(n.link)); + var td5 = V.h('td', helper.showDistance(n.link)); - return V.h('tr', [td1, td2, td3, td4]); + return V.h('tr', [td1, td2, td3, td4, td5]); } var h2 = document.createElement('h2'); @@ -268,14 +270,24 @@ define(['sorttable', 'virtual-dom', 'chroma-js', 'moment', 'helper'], return a.node.nodeinfo.hostname.localeCompare(b.node.nodeinfo.hostname); }, reverse: false + }, { + name: 'node.clients', + class: 'ion-people', + sort: function (a, b) { + return ('clients' in a.node.statistics ? a.node.statistics.clients : -1) - + ('clients' in b.node.statistics ? b.node.statistics.clients : -1); + }, + reverse: true }, { name: 'node.tq', + class: 'ion-connection-bars', sort: function (a, b) { return a.link.tq - b.link.tq; }, reverse: true }, { name: 'node.distance', + class: 'ion-arrow-resize', sort: function (a, b) { return (a.link.distance === undefined ? -1 : a.link.distance) - (b.link.distance === undefined ? -1 : b.link.distance); diff --git a/lib/linklist.js b/lib/linklist.js index c1c2e9d..88dfc32 100644 --- a/lib/linklist.js +++ b/lib/linklist.js @@ -13,12 +13,14 @@ define(['sorttable', 'virtual-dom', 'helper'], function (SortTable, V, helper) { reverse: false }, { name: 'node.tq', + class: 'ion-connection-bars', sort: function (a, b) { return a.tq - b.tq; }, reverse: true }, { name: 'node.distance', + class: 'ion-arrow-resize', sort: function (a, b) { return (a.distance === undefined ? -1 : a.distance) - (b.distance === undefined ? -1 : b.distance); diff --git a/lib/map.js b/lib/map.js index e0e6091..23dcd22 100644 --- a/lib/map.js +++ b/lib/map.js @@ -23,7 +23,7 @@ define(['map/clientlayer', 'map/labelslayer', }, onAdd: function () { - var button = L.DomUtil.create('button', 'ion-android-locate shadow'); + var button = L.DomUtil.create('button', 'ion-locate shadow'); button.setAttribute('data-tooltip', _.t('button.tracking')); L.DomEvent.disableClickPropagation(button); L.DomEvent.addListener(button, 'click', this.onClick, this); diff --git a/lib/nodelist.js b/lib/nodelist.js index 2a141cd..2afc083 100644 --- a/lib/nodelist.js +++ b/lib/nodelist.js @@ -35,18 +35,21 @@ define(['sorttable', 'virtual-dom', 'helper'], function (SortTable, V, helper) { reverse: false }, { name: 'node.uptime', + class: 'ion-time', sort: function (a, b) { return a.uptime - b.uptime; }, reverse: true }, { name: 'node.links', + class: 'ion-share-alt', sort: function (a, b) { return a.meshlinks - b.meshlinks; }, reverse: true }, { name: 'node.clients', + class: 'ion-people', sort: function (a, b) { return ('clients' in a.statistics ? a.statistics.clients : -1) - ('clients' in b.statistics ? b.statistics.clients : -1); diff --git a/lib/sorttable.js b/lib/sorttable.js index 9665594..61ab8a0 100644 --- a/lib/sorttable.js +++ b/lib/sorttable.js @@ -25,16 +25,23 @@ define(['virtual-dom'], function (V) { if (data.length !== 0) { var th = headings.map(function (d, i) { + var name = _.t(d.name); var properties = { onclick: sortTableHandler(i), className: 'sort-header' }; + if (d.class) { + properties.className += ' ' + d.class; + properties.title = name; + name = ''; + } + if (sortIndex === i) { properties.className += sortReverse ? ' sort-up' : ' sort-down'; } - return V.h('th', properties, _.t(d.name)); + return V.h('th', properties, name); }); var links = data.slice(0).sort(headings[sortIndex].sort); diff --git a/scss/modules/_table.scss b/scss/modules/_table.scss index c40fc95..c024d7d 100644 --- a/scss/modules/_table.scss +++ b/scss/modules/_table.scss @@ -35,6 +35,10 @@ th { th { font-weight: bold; + &[class*=' ion-'] { + font-size: 1.3em; + } + &.sort-header { cursor: pointer;