From 43239b4a4c3048800cbb82cc5b587d4d3f06be0a Mon Sep 17 00:00:00 2001 From: Mahdi Dibaiee Date: Tue, 15 Sep 2015 19:45:30 +0430 Subject: [PATCH] Fix single/twin folders being center-aligned instead of left-aligned --- build/main.js | 2 +- build/style.css | 15 ++++++--------- releases/hawk-1.0.0.zip | Bin 1245769 -> 1245717 bytes src/js/components/mixins/entry.js | 2 +- src/less/components/entries.less | 12 ++++++------ src/less/components/file-list.less | 4 ---- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/build/main.js b/build/main.js index 14d9e54..6739562 100644 --- a/build/main.js +++ b/build/main.js @@ -30889,7 +30889,7 @@ exports['default'] = { var width = rect.width; var height = rect.height; - var left = x + width / 2 - _componentsMenu.MENU_WIDTH / 2, + var left = window.innerWidth / 2 - _componentsMenu.MENU_WIDTH / 2, top = y + height / 2 + MENU_TOP_SPACE; var dialogHeight = document.getElementById('fileMenu').offsetHeight; diff --git a/build/style.css b/build/style.css index 5d0032d..91ecdb2 100644 --- a/build/style.css +++ b/build/style.css @@ -280,14 +280,10 @@ button.coming-soon::after { .list .directory i { margin-right: 1.4rem; } -.list .file:active, -.list .directory:active { - background: #f0f0f0; -} .grid .file, .grid .directory { - flex: 1 0 30%; - max-width: 30%; + flex: 1 0 33.33%; + max-width: 33.33%; padding: 1.4rem 0.5rem; flex-direction: column; } @@ -317,6 +313,10 @@ button.coming-soon::after { .directory p { flex: 1 1; } +.file:active, +.directory:active { + background: #f0f0f0; +} .directory i { display: block; background: url(/img/Directory.svg) no-repeat; @@ -508,9 +508,6 @@ nav i { overflow-x: hidden; overflow-y: auto; } -.file-list.grid { - justify-content: space-between; -} .dialog { display: flex; flex-flow: column; diff --git a/releases/hawk-1.0.0.zip b/releases/hawk-1.0.0.zip index f1d72cad90b2a774ebe958a7eb7159ac70a9a240..47e25f58ad9798e582b3128d45b28f2fb2545465 100644 GIT binary patch delta 666 zcmX@v;xo0yhbO?BnT3l11QyPn$fL*vB=r@5z zdRq9I4?uc*iU;EjUJ%1BjPW5mh@lwA_?8325J+e2Vg)hgXyR8P$w; zm_Q7-I!0NruGCh>uPh*um@Y;euz|CtGu{WAQ@wz(gOPXPTz&U#rrm4oJNX&x+XWUe z0x=U1GXpUT5VHa?8xXStF$WNH0x=g5a|1CC5c2{t-*$mT{4?kBmS^UrPSHFR<}7$m&FG!6-H$qkXTT;P$lquXT5~BV7Y59K;e(XOXOOW`Ce?nFu z`pQ3udg1><79hSalx~O82mcFMgT(*+2dkfIB@EIwwG2XS5(XJI^{p^iuR5c!8EObm z&teqTkOu|&l1Qd6`fLmgAj}U=DKH{-`bI`!IglL}8HHsScTRuDC@kd&(gP1NV6bt* nl!NIH7ljy#ODc0x^^%K=1H4&*hB7dS1ECWu1H;}wLO>n>%1Y^x delta 668 zcmbQ*;&ZaahbO?BnT3l11l(s&6{>ujB3U^ zOdy6^9iuE*S86NcR~C>+Oc$dK*uYuS8SjJ5sb0X?!N}`ATi^ZT3T0RGPJRaSc7a8V zK+FWh%s|Wn#H>Kf2E^<@%mKulK+FZi+(66&#JoVvw_RWn|IE3p6$;u4<=eN}3v7H1 zvNBU!Fp3SxXg_Kwxc#W1km&-jZC&SXMLyDEV0g5h{gRNVuw+hVafyOnT4qkFRbp~U zW?8BZmmXMby4!Ohz3DPfg>-}sRIRxb6mkBV@b%+!vwWprDw3`j3zyi2nCS$N)qe{1vhV(fNOc zY(Vr{DE%5rYyK0m1c|5o6S4x)3;sdW-~T6M0pd&khtR=Ly7#}3HAwu_f3W(gY{DRI zQ=K4GoiNC-sXK*1dZ&ICHbV{h>1K?=8X(;XjKVUEq0?&_h2=opxghSw>AM((r5r&~ t1rI!60CIxU7mRpuQHY_qq%tQ}FS)olz?+o~Bq0ujPOJoDV;~4+| diff --git a/src/js/components/mixins/entry.js b/src/js/components/mixins/entry.js index 248f287..8cd2c01 100644 --- a/src/js/components/mixins/entry.js +++ b/src/js/components/mixins/entry.js @@ -13,7 +13,7 @@ export default { let rect = React.findDOMNode(this.refs.container).getBoundingClientRect(); let {x, y, width, height} = rect; - let left = x + width / 2 - MENU_WIDTH / 2, + let left = window.innerWidth / 2 - MENU_WIDTH / 2, top = y + height / 2 + MENU_TOP_SPACE; let dialogHeight = document.getElementById('fileMenu').offsetHeight; diff --git a/src/less/components/entries.less b/src/less/components/entries.less index 906dc33..50566f9 100644 --- a/src/less/components/entries.less +++ b/src/less/components/entries.less @@ -17,16 +17,12 @@ i { margin-right: 1.4rem; } - - &:active { - background: @gray; - } } .grid .file, .grid .directory { - flex: 1 0 30%; + flex: 1 0 33.33%; - max-width: 30%; + max-width: 33.33%; padding: 1.4rem 0.5rem; @@ -60,6 +56,10 @@ p { flex: 1 1; } + + &:active { + background: @gray; + } } .directory i { diff --git a/src/less/components/file-list.less b/src/less/components/file-list.less index 469457f..1ba811c 100644 --- a/src/less/components/file-list.less +++ b/src/less/components/file-list.less @@ -9,8 +9,4 @@ overflow-x: hidden; overflow-y: auto; - - &.grid { - justify-content: space-between; - } }