From 26d7fdd60d6555f9fbf643e45dc840820ae3b1d7 Mon Sep 17 00:00:00 2001 From: Kristina Schneider Date: Thu, 14 Jul 2016 11:11:09 +0200 Subject: [PATCH 1/7] adjust styles to match dat-desktop replace pngs with svgs update dat-design clean up scss and remove unused styles --- index.html | 30 +-- package.json | 2 +- public/images/dat-data.png | Bin 49963 -> 0 bytes public/{images => img}/dat-data-blank.png | Bin public/img/dat-data-logo.svg | 30 +++ public/img/link.svg | 3 + src/scss/main.scss | 283 +++++++++------------- 7 files changed, 171 insertions(+), 177 deletions(-) delete mode 100644 public/images/dat-data.png rename public/{images => img}/dat-data-blank.png (100%) create mode 100644 public/img/dat-data-logo.svg create mode 100644 public/img/link.svg diff --git a/index.html b/index.html index bfda3fa0..9508894c 100644 --- a/index.html +++ b/index.html @@ -1,22 +1,23 @@ - + -
-
-

- - - -

- -

- - -

+
+ +
+
+ +
+ +
+
+ +
@@ -25,8 +26,9 @@

+
+
-
diff --git a/package.json b/package.json index f08b6fab..47922f87 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "browserify": "^13.0.0", "choppa": "^1.0.2", "concat-stream": "^1.5.1", - "dat-design": "^1.2.5", + "dat-design": "^1.2.6", "drag-drop": "^2.11.0", "es2020": "^1.1.7", "filereader-stream": "^1.0.0", diff --git a/public/images/dat-data.png b/public/images/dat-data.png deleted file mode 100644 index 02022bc3782f390d1c9f12e2d61e50c211961e37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49963 zcmaI8bwHI*6E=Jkihu%&N_UA!Bb|bvA|W9S(jeUpM^O+dX+cU5kyg69y9A`WyPJ3K zgTE)~sGU1LK9LtO(Gn-)Vs@YFq1B~^P>ndkiaRu(L} z@E8_n3v2K+1PO{bTkGnZ8QN3o85)~f3Q=#ARZ&x#8VFIVJd|ORu@*NpF@54{YpCcd ztEBI0rq5?UEh0=Q=*$lUSQy&tQaW3hTiWqE3sEEG@`HcFAG1PP3-Nh`B_<=oSaykI9aT0jak|G`1n}aI9NG2n865UI~PlPU1w%X zJDPtaNEq7b+nQS2n_5{?!V-1$tQ_oxsDY-JOR%v1msm@?zh(jkV|CWGW@Tq#gO~Kr zKpC0;|DhHZ{~B#)uVDCZegB_=?UY=s4OtZo?W`PZ^})s&(ZEw#^NZUW>e^e`Dp^^X z|6@gY6DxZwI}*R(9OAqW|9MuzO5ef4(9-^&XAS=SEa(4x z76yccHJDk#(ALz^&_L4G%7PNPaDLPOtqa@#l=t^pga54y`~Q5F6)3|BZ|{F>_dg#2 z48i~W7kI%R|AN1vCBVEb0Jl63dKd&%ML(4gQ*s_&9m8-AzfxH=<;B4mCcH#d5h8o< z4fIxt@#7VVn-bSPD4@T1iTg3}!L{7nQp%6FmmYtl{^(DQMg389@y%@?u1C^Tv{abi zWVY%4XjK_npm4N=F9;8Qm{e;%9Vd!oP}B~Ki6KUTAg}c`eQbKqFuOzV(yD_z+bG7Y zc!vN-zxxJ65On?-a|#oxrZ^F_kSa1<&cbgqOTS$pLUyWiVWMH2+N^IUP$3)~0YQ|4 zC{VG5lx>hJGjHB@;OaK&!UbmMMWGDUcMgutufJ((ebx*fLeMoiAXMqKZu*h0pP5no zgJ(BRyeChU5$Wyb&k}+^d>QO3)4*avg+!fEq0KKZW7RlkXEL?KEopeY?j%xiYpZ$r zksqjk(0@YYe>q5gBct6)FY257sh+7rNrRTe0yD~R+r#Z1e+MLN3miCh1R;iyr^E@`GSZVB=vB>ZKfL zt>P!^cExN#-^UEg`(Jo@t^B%5s{|))y4IscWVAb9pg?#aq7ov)-{x^+<40Dcu~e*% z1k@a5K*}-dO3$wml`ej*#=x-&hrkLT$o2Jp$dTgy9N9*aI6P=C-@euB*KbbFk+Ooe z`41>a!|v9<+)MRP`DQ_(p`3h^ET~fhl}qwY44W{urRAsl@^v@Sk&`a|K#Rh?%KTjO zp-@%skha|09TgP*(Tz7U`qWaEGbX4=S@us{U-;6x2R=(U%G&hhIGttxe=Jm(W z&vj+?b<|wqjfHR07jVACOJn4PTk=~Y@Gz)v1>yfotm&oXT@{%^2 zXnX5OOFV!V9`vR`>{JxLAT|8ZbD!Q`H&IgC9 z%0D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 + diff --git a/public/img/link.svg b/public/img/link.svg new file mode 100644 index 00000000..29febe43 --- /dev/null +++ b/public/img/link.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/scss/main.scss b/src/scss/main.scss index f6ea6806..25c2970a 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -8,76 +8,95 @@ * https://github.com/maoberlehner/node-sass-magic-importer */ @import "~dat-design"; +@import "~dat-design/scss/variables/colors.scss"; +@import "~dat-design/scss/variables/transitions.scss"; @import "~dat-design/scss/responsive/breakpoints.scss"; body { min-width: 500px; // mixin is being imported from "~dat-design/scss/responsive/breakpoints.scss": @include breakpoint (xs) { - background: red; +// background: red; } @include breakpoint (sm) { - background: yellow; +// background: yellow; } } a, button, input, .link { transition-property: background-color, color; - transition-duration: .015s; - transition-timing-function: ease-out; + transition-duration: $transition-duration; + transition-timing-function: $transition-timing-function; cursor: pointer; } a, .link { - color: #35b44f; + color: $color-green; } a:hover, a:focus, .link:hover, .link:focus { - color: #A9CE7F; + color: $color-green--hover; outline: none; } -.link { - color: #959ba4; - border: none; - background: none; - padding: .2rem 1rem .2rem 0; -} - -.link:before { - content: '« ' -} +//can be removed? @kriesse +// .link { +// color: #959ba4; +// border: none; +// background: none; +// padding: .2rem 1rem .2rem 0; +// } +// +// .link:before { +// content: '« ' +// } /* demo page layout */ -.site-header { - background-color: #fdfdfd; - border-bottom: 1px solid #f0f0f0; - height: 65px; +.dat-header { + height: 4rem; + padding-right: 1.5rem; +// padding-left: 6.5rem; + background-color: $color-green--hover; + color: $color-white; } -.site-header h1 { - margin: 0; +.dat-logo { + width: 6.5rem; + padding-top: .75rem; + padding-left: 2.625rem; float: left; } -.site-header #share-link { - display: block; +.dat-header__actions { + float: right; +} + +.dat-import { float: left; - width: 40%; - margin-left: 1rem; - padding: 6px 14px; - font-size: 18px; + margin-top: .5rem; } -.site-header #share-link:hover { - background-color: #f7f7f7; +.btn--header { + background-color: transparent; + margin-top: .75rem; } -.site-header button { - float: right; +// dat-button +.dat-button { + float: left; + padding-top: 1.15rem; + padding-bottom: 1.15rem; + margin-right: 3rem; + button { + &:hover, &:focus, &:active { + color: $color-neutral--04; + outline: none; + cursor: pointer; + } + } } .site-main { @@ -90,17 +109,6 @@ a:hover, a:focus, max-width: 1170px; } -.upload-file { - width: 100%; - min-height: 3em; - margin: 1rem auto; - padding: 1rem; - border: 3px dashed #959ba4; - border-radius: 1em; - color: #959ba4; - text-align: center; -} - #hyperdrive-size { float: left; } @@ -114,9 +122,6 @@ a:hover, a:focus, } #peers { - line-height: 37px; - padding: 0; - margin: 0 0 0 20px; display: inline-block; } @@ -127,13 +132,12 @@ a:hover, a:focus, margin: 0 10px 0 0px; padding: 0; width: 320px; -} - -#speed span span { - font-weight: normal; - font-size: 13px; - line-height: 37px; - margin-left: 10px; + span span { + font-weight: normal; + font-size: 13px; + line-height: 37px; + margin-left: 10px; + } } .breadcrumbs { @@ -141,32 +145,6 @@ a:hover, a:focus, min-height: 2em; } -.button { - display: inline-block; - padding: 8px 14px; - border: none; - font-size: 16px; - font-weight: 600; - color: #FFFFFF; - background-color: #35b44f; - border-radius: 5px; - cursor: pointer; -} - -#help.button { - background-color: #FFFFFF; - border: 1px solid #35b44f; - color: #35b44f; - border-radius: 10px; - margin-left: 10px; -} - -.button:hover, -.button:focus { - background-color: #A9CE7F; - outline: none; -} - .status-bar { padding: .5rem; padding-top: 1rem; @@ -175,19 +153,19 @@ a:hover, a:focus, } #display { - margin-bottom: 50px; -} - -#display img, -#display video { - padding: 10px; - max-width: 95%; - max-height: 95%; -} + margin-bottom: 4rem; + img, + video { + padding: 10px; + max-width: 95%; + max-height: 95%; + } -#display iframe { - width: 100%; - height: 70%; + iframe { + width: 100%; + height: 70%; + border: 1px solid $color-neutral--20; + } } #get_link { @@ -200,79 +178,61 @@ a:hover, a:focus, } #yo-fs { - color: #2A3749; -} - -ul { - margin: 0; + color: $color-neutral; padding: 0; -} - -#yo-fs h1 a { - margin: 5px; -} - -#yo-fs a { - color: #2A3749; - opacity: .7; - text-decoration: none; -} - -#yo-fs a:hover { - opacity: 1; -} - -#yo-fs { - padding: 0; -} - -#yo-fs li { - list-style-type: none; -} - -#yo-fs a { - display: block; - padding: 10px; - font-size: 14px; - border-bottom: 1px solid #f0f0f0; - background-size: 15px; - background-repeat: no-repeat; - background-position: 10px 11px; - padding-left: 35px; -} - -#yo-fs a:hover { - background-color: #f5fbf6; -} - -#yo-fs .file a { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABQZJREFUeJzt3M9rnEUcx/HPzPNskk3TTTZNVFQKIkIOEnr3pBQv2osiuKWpJ1Ei4kF7EPwnPIiIt5jmLPQkpV1wS089ay6ihJCy+dHEza/dZ/PMeEilYos2mZmdZ/f7eR1DmOfL5s3u7LOzAYiIiIhIHBVy8fqdOxeM0a9bixkoNQFlk5DXi2F9Z+uny5cufR97jtMKEsCtxt33APsVoGdDrF8kyyt/2Gpl7KN+jcBrAI1Go5ohXQDwts91i2x55XcAqm8j0L4WqtfvTXVs+jME/fEfsWq7tffd0o0bH8ae5KS8BFCv19OjtPujUnjVx3r9qT8j8BKASUe+0MBrPtbqb/0XgXMAN2/eG4cxX/oYZjD0VwTOAaiR7H1oXfExzODonwjcAzDqLR+DDJ7+iMB9D6DNBQ9zDKjiR+AcgDF4zscgg6vYETgHoLUu+RhksBU3Am83guj/FDMCBtBTxYuAAfRcsSJgAFEUJwIGEE0xImAAUcWPgAFEFzcCBlAI8SJgAIURJwIGUCi9j4ABONLK90PY2wgYgKNSmgZYtXcRMABH5aHhQCv3JgIG4Ojs6JmAq4ePgAE4OlMuY7g0FPAKYSNgAB48Wz0X+ArhImAAHoyOjGBqvBr4KmEiYACeTI1P4NzZ8cBX8R8BA/BoujqJ56emkeiQX4L2GwED8KwyOoaXX3gRz0xUMRRsc+gvghB3McTTSmOyMoHJygSO8hzZURd5bgBYn5dRsPgagNM3khlAYGmSIE2CvSSUXRfgS4BwDEA4BiBc9D1A62Av9ghRVUbHol4/egBrmxuxR4iqcj5uAHwJEI4BCMcAhGMAwkXfBM6cfyn2CKLxGUA4BiAcAxCOAQjHAIRjAMIxAOEYgHAMQLjodwJ5HoDnAWKPEBXPA1BUDEA4BiAcAxAu+iaQ5wHi4jOAcAxAOAYgHAMQjgEIxwCEYwDCMQDhGIBw0e8E8jwAzwPEHiEqngegqBiAcAxAOAYgXPRNIM8DxMVnAOEYgHAMQDgGIBwDEI4BCMcAhGMAwjEA4aLfCeR5AJ4HiD1CVDwPQFExAOEYgHAMQLjom0CeB4iLzwDCMQDhGIBwDEA4BiAcAxCOAQjHAIRjAMIxAOEYgHAMQDgGIBwDEI4BCOccgLXWxxx0Gh4ee+cAcpM7D0Gn083dH3vnANqdzHkIOp125v7YOwew1z50HoJOZ7+977yGcwCtgz0Ya5wHoZMxxqC1X4AAjDFma2fHeRA6mc3WNo5y902Aj7eB21u7f+Kg0/awFD2N/XYbD3Z3oYEHrmv5CGAZAFY3ml42JfTf2lmGtc3m8VtArX91Xc89AIvbwPFr0sr6fbQO3V+X6MlaB3tYaa4hN3/vuewt1zWdA9DK/gDAAMcRrG2sY3WzicOs47o0PdTOOljdaGJtcwPm0c0fo4BF17WV6wIA8M3i4hKUrv3750NpCaPlMobTEhKd+LmYABYWuTHIul3sdw6RdbuP/Y6xWPj0yuUPXK/l5athibWf59ZchNbT//x5dtRFtvv48OTImGZizTUfS3n5MOjjubn7Csm7BuBbgdCMOUSavDN/9eq6j+W8fRo4P1drJEa9CWNk/8uPkIxpIk0uflKr3fW1pNePg+fnag07PDRrYZfwcGNIXhhjsaCsmfX5xwc8bQKf5Nvr11/JrbqiLN4wwIzWmATPHzwVY0wO6G2t8Yu1uJ0navGzWu23ENf6C/l/AOrWkOSOAAAAAElFTkSuQmCC); -} -#yo-fs .directory a { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABTpJREFUeJzt2s9rHHUYx/HP88zO7OZX2cQareLBU7IVLyJ4EaJFS6ogIlKK+A948FDEi1DTFQUV1CJ49iBCFSse1DYR61EQqfbQNlFPFvzRkh9tkibZ3fk+HrRp2sb00GS+230+r1tmhvAJeXd3OhuAiIiIiIiIiIiIOp/c6IKhsYm7TO1eDeEOQLMiRt0sQQgGnUtKdubUgdGzsfe0s3UDGHrriz691P0iEPZB5P6iR22mYOFXEf2wZfkHv9WfuBh7T7u5LoChsWPPidh7Ah2MMWirGMI5GF6YrO/5PPaWdqJrv6iNjb+pIh932i8fAAQ6KKJHhg+OH4i9pZ2svgLUxiZegdgbMccUxcz2T9ZHD8Xe0Q4EAIbGjj6iwHGI3vCmsBMEhJYYHpqs7zkRe0tsAjOp1Sd+BPBA7DG0aQIszAKYNJHvYMlHk/XHf1nvQqmNHX0Mot8UPJCKZMEg8kkwfWmqvvuPtacUkKdj7aKCiAog+1TCyeH6xMjaU2qQh2PtoqLJdrH82NoIVMTujjmJiqYVsfDZ8OtHdwCAwuy22JOoaLJdmvIOAEjt4LjFnkNRBKgM642vow6lCPY8A3DMYLsYgGMCDJdij4itVOmNPWHTGQywgNBqwvLWBlfKgO8ARFCudtwHn1cJeROtSwtoXroIWH7taXX9FqDJLfEHTjdFkxRZXz+6B+9Z99XOdwBZOfaEwogoytVBZH0DVx13HUBa6Yk9oXBpTxVZb//q124D0LQMzbpiz4gi7e1H8t/P7jQAQbnP9xPwbNu/bwUuA8h6+6FZJfaMqLRURpJ1+Qsg66ki7a3GntEWkkoP3DwHEE1Q3rYdicMbv/+TZJXOD0BLGUpdfSh190HE3QvehjRJNw5A0wxJ2gUppRBVQG6NPxoWA6AJklIKaBJ7TvsSWT+ApNKDrLcKLfl5UOLV1QFIgkr1diTl7khzqGirAYgqKgM7oKXOfz5OV6zeFZX77+Qv3yEFgLS3iiT1/WDEKxVRpD18MOKVJpUe/v/YMeWTMd80SXnj55mKdvzTYNoA3/ydYwDOMQDnGIBzDMA5BuAcA3COATjHAJxjAM4xAOcYgHMMwDkG4BwDcI4BOMcAnGMAzjEA5xiAcwzAOQbgHANwjgE4xwCcYwDOMQDnGIBzDMA5BuAcA3COATjHAJxjAM4xAOcYgHMMwDkG4BwDcI4BOMcAnGMAzjEA5xiAcwzAOQbgHANwjgE4xwCcYwDOMQDnGIBzDMA5BuAcA3COATjHAJxjAM4xAOcUZrE3UCxm0JA3Y8+gSELegIbGSuwdFElorEBbKwuxd1AkzeVFaL6yhNBqxN5CBQvNFYTGEjRYaDYuTsfeQ4UyrMxPIwANBfSvvLGE5sJs7FVUkMbCLEJjGTD8qSL20+WDzcULsbfRFmsszqG5MAcAUNgJhclXqyfnp7Eydw4WQrSBtDUs5Fie+xvN+Zm1h7/UFvLDsLD6T7+1vICl87+jMT/Dm8MOEFoNNOansXT+LPLlxSvHgRlB+VMBgNrB8ZcBvL3eNxBNoKUUIglMihlNmyDkyFtNIOTrnjaz/ZP10UMlADiz88K7tVPbnoTIyHUXhhx5Y/1vQremYPbtFL5/H7j8YdDevbkAzwSEn6MuoyKcqKD8LOr1AKz5NPB0fXQmNxuB4Ui8bbS17LBYNnKy/ujc5SPrvqvvHJt4yiQ/AOiDxY2jrWLAD2JSP1Pf/fW15za8rbvvtYlaHmyXAMMABoIh2bKVtGkEaIlgFrDTQe341Kt7pmJvIiIiIqI28g8P/1ywWiSczgAAAABJRU5ErkJggg==) -} - -#yo-fs .directory .size { - display: none; -} - -#yo-fs a span { - display: inline-block; -} + h1 a { + margin: 5px; + } + ul { + margin: 0; + padding: 0; + } + li { + list-style-type: none; + a { + display: block; + padding: 10px; + font-size: 14px; + border-bottom: 1px solid $color-neutral--20; + background-size: 15px; + background-repeat: no-repeat; + background-position: 10px 11px; + padding-left: 35px; + color: $color-neutral; + text-decoration: none; + &:hover { + background-color: $color-neutral--04; + } + } + } + .file a { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABQZJREFUeJzt3M9rnEUcx/HPzPNskk3TTTZNVFQKIkIOEnr3pBQv2osiuKWpJ1Ei4kF7EPwnPIiIt5jmLPQkpV1wS089ay6ihJCy+dHEza/dZ/PMeEilYos2mZmdZ/f7eR1DmOfL5s3u7LOzAYiIiIhIHBVy8fqdOxeM0a9bixkoNQFlk5DXi2F9Z+uny5cufR97jtMKEsCtxt33APsVoGdDrF8kyyt/2Gpl7KN+jcBrAI1Go5ohXQDwts91i2x55XcAqm8j0L4WqtfvTXVs+jME/fEfsWq7tffd0o0bH8ae5KS8BFCv19OjtPujUnjVx3r9qT8j8BKASUe+0MBrPtbqb/0XgXMAN2/eG4cxX/oYZjD0VwTOAaiR7H1oXfExzODonwjcAzDqLR+DDJ7+iMB9D6DNBQ9zDKjiR+AcgDF4zscgg6vYETgHoLUu+RhksBU3Am83guj/FDMCBtBTxYuAAfRcsSJgAFEUJwIGEE0xImAAUcWPgAFEFzcCBlAI8SJgAIURJwIGUCi9j4ABONLK90PY2wgYgKNSmgZYtXcRMABH5aHhQCv3JgIG4Ojs6JmAq4ePgAE4OlMuY7g0FPAKYSNgAB48Wz0X+ArhImAAHoyOjGBqvBr4KmEiYACeTI1P4NzZ8cBX8R8BA/BoujqJ56emkeiQX4L2GwED8KwyOoaXX3gRz0xUMRRsc+gvghB3McTTSmOyMoHJygSO8hzZURd5bgBYn5dRsPgagNM3khlAYGmSIE2CvSSUXRfgS4BwDEA4BiBc9D1A62Av9ghRVUbHol4/egBrmxuxR4iqcj5uAHwJEI4BCMcAhGMAwkXfBM6cfyn2CKLxGUA4BiAcAxCOAQjHAIRjAMIxAOEYgHAMQLjodwJ5HoDnAWKPEBXPA1BUDEA4BiAcAxAu+iaQ5wHi4jOAcAxAOAYgHAMQjgEIxwCEYwDCMQDhGIBw0e8E8jwAzwPEHiEqngegqBiAcAxAOAYgXPRNIM8DxMVnAOEYgHAMQDgGIBwDEI4BCMcAhGMAwjEA4aLfCeR5AJ4HiD1CVDwPQFExAOEYgHAMQLjom0CeB4iLzwDCMQDhGIBwDEA4BiAcAxCOAQjHAIRjAMIxAOEYgHAMQDgGIBwDEI4BCOccgLXWxxx0Gh4ee+cAcpM7D0Gn083dH3vnANqdzHkIOp125v7YOwew1z50HoJOZ7+977yGcwCtgz0Ya5wHoZMxxqC1X4AAjDFma2fHeRA6mc3WNo5y902Aj7eB21u7f+Kg0/awFD2N/XYbD3Z3oYEHrmv5CGAZAFY3ml42JfTf2lmGtc3m8VtArX91Xc89AIvbwPFr0sr6fbQO3V+X6MlaB3tYaa4hN3/vuewt1zWdA9DK/gDAAMcRrG2sY3WzicOs47o0PdTOOljdaGJtcwPm0c0fo4BF17WV6wIA8M3i4hKUrv3750NpCaPlMobTEhKd+LmYABYWuTHIul3sdw6RdbuP/Y6xWPj0yuUPXK/l5athibWf59ZchNbT//x5dtRFtvv48OTImGZizTUfS3n5MOjjubn7Csm7BuBbgdCMOUSavDN/9eq6j+W8fRo4P1drJEa9CWNk/8uPkIxpIk0uflKr3fW1pNePg+fnag07PDRrYZfwcGNIXhhjsaCsmfX5xwc8bQKf5Nvr11/JrbqiLN4wwIzWmATPHzwVY0wO6G2t8Yu1uJ0navGzWu23ENf6C/l/AOrWkOSOAAAAAElFTkSuQmCC); + } + .directory a { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABTpJREFUeJzt2s9rHHUYx/HP88zO7OZX2cQareLBU7IVLyJ4EaJFS6ogIlKK+A948FDEi1DTFQUV1CJ49iBCFSse1DYR61EQqfbQNlFPFvzRkh9tkibZ3fk+HrRp2sb00GS+230+r1tmhvAJeXd3OhuAiIiIiIiIiIiIOp/c6IKhsYm7TO1eDeEOQLMiRt0sQQgGnUtKdubUgdGzsfe0s3UDGHrriz691P0iEPZB5P6iR22mYOFXEf2wZfkHv9WfuBh7T7u5LoChsWPPidh7Ah2MMWirGMI5GF6YrO/5PPaWdqJrv6iNjb+pIh932i8fAAQ6KKJHhg+OH4i9pZ2svgLUxiZegdgbMccUxcz2T9ZHD8Xe0Q4EAIbGjj6iwHGI3vCmsBMEhJYYHpqs7zkRe0tsAjOp1Sd+BPBA7DG0aQIszAKYNJHvYMlHk/XHf1nvQqmNHX0Mot8UPJCKZMEg8kkwfWmqvvuPtacUkKdj7aKCiAog+1TCyeH6xMjaU2qQh2PtoqLJdrH82NoIVMTujjmJiqYVsfDZ8OtHdwCAwuy22JOoaLJdmvIOAEjt4LjFnkNRBKgM642vow6lCPY8A3DMYLsYgGMCDJdij4itVOmNPWHTGQywgNBqwvLWBlfKgO8ARFCudtwHn1cJeROtSwtoXroIWH7taXX9FqDJLfEHTjdFkxRZXz+6B+9Z99XOdwBZOfaEwogoytVBZH0DVx13HUBa6Yk9oXBpTxVZb//q124D0LQMzbpiz4gi7e1H8t/P7jQAQbnP9xPwbNu/bwUuA8h6+6FZJfaMqLRURpJ1+Qsg66ki7a3GntEWkkoP3DwHEE1Q3rYdicMbv/+TZJXOD0BLGUpdfSh190HE3QvehjRJNw5A0wxJ2gUppRBVQG6NPxoWA6AJklIKaBJ7TvsSWT+ApNKDrLcKLfl5UOLV1QFIgkr1diTl7khzqGirAYgqKgM7oKXOfz5OV6zeFZX77+Qv3yEFgLS3iiT1/WDEKxVRpD18MOKVJpUe/v/YMeWTMd80SXnj55mKdvzTYNoA3/ydYwDOMQDnGIBzDMA5BuAcA3COATjHAJxjAM4xAOcYgHMMwDkG4BwDcI4BOMcAnGMAzjEA5xiAcwzAOQbgHANwjgE4xwCcYwDOMQDnGIBzDMA5BuAcA3COATjHAJxjAM4xAOcYgHMMwDkG4BwDcI4BOMcAnGMAzjEA5xiAcwzAOQbgHANwjgE4xwCcYwDOMQDnGIBzDMA5BuAcA3COATjHAJxjAM4xAOcUZrE3UCxm0JA3Y8+gSELegIbGSuwdFElorEBbKwuxd1AkzeVFaL6yhNBqxN5CBQvNFYTGEjRYaDYuTsfeQ4UyrMxPIwANBfSvvLGE5sJs7FVUkMbCLEJjGTD8qSL20+WDzcULsbfRFmsszqG5MAcAUNgJhclXqyfnp7Eydw4WQrSBtDUs5Fie+xvN+Zm1h7/UFvLDsLD6T7+1vICl87+jMT/Dm8MOEFoNNOansXT+LPLlxSvHgRlB+VMBgNrB8ZcBvL3eNxBNoKUUIglMihlNmyDkyFtNIOTrnjaz/ZP10UMlADiz88K7tVPbnoTIyHUXhhx5Y/1vQremYPbtFL5/H7j8YdDevbkAzwSEn6MuoyKcqKD8LOr1AKz5NPB0fXQmNxuB4Ui8bbS17LBYNnKy/ujc5SPrvqvvHJt4yiQ/AOiDxY2jrWLAD2JSP1Pf/fW15za8rbvvtYlaHmyXAMMABoIh2bKVtGkEaIlgFrDTQe341Kt7pmJvIiIiIqI28g8P/1ywWiSczgAAAABJRU5ErkJggg==) + } + .directory .size { + display: none; + } + span { + display: inline-block; + } -#yo-fs .size, #yo-fs .modified { - width: 30%; - float: right; - text-align: right; -} + .size, + .modified { + width: 30%; + float: right; + text-align: right; + } -#yo-fs .modified { - width: 40%; -} + .modified { + width: 40%; + } -#yo-fs pre { - padding: 10px; - margin: 0; + pre { + padding: 10px; + margin: 0; + } } /* render data */ @@ -287,7 +247,6 @@ table th, table td { text-align: left; padding: 5px 10px; - color: #777; - background-color: #f4f5f6; + color: $color-neutral; min-height: 1.42857143; } From 87d01f3e58def8d537cf4ab8b0c2bd524bd1dfde Mon Sep 17 00:00:00 2001 From: Kristina Schneider Date: Fri, 15 Jul 2016 13:37:06 +0200 Subject: [PATCH 2/7] use a small flag for visual breakpoint testing (so the background color stays neutral, which helps with adjusting text colors for legibility etc.) --- src/scss/main.scss | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/scss/main.scss b/src/scss/main.scss index 5704729b..2bdb1517 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -23,6 +23,35 @@ body { } } +// breakpoint testing helper +body { + position: relative; + &:before { + position: absolute; + width: auto; + top: 0; + right: 50%; + font-size: 8px; + padding: 2px; + background-color: black; + color: white; + z-index: 100; + transition: all .1s ease-in-out; + content: ''; + opacity: .8; + @include breakpoint (xs) { + content: 'We’re on breakpoint xs'; + background-color: red; + } + @include breakpoint (sm) { + content: 'We’re on breakpoint sm'; + background-color: yellow; + color: black; + } + } +} + + a, button, input, .link { transition-property: background-color, color; transition-duration: $transition-duration; From 8aa04bba01a786011dab530a82f429a8ce5e4677 Mon Sep 17 00:00:00 2001 From: karissa Date: Fri, 15 Jul 2016 12:12:42 -0700 Subject: [PATCH 3/7] add header style in a component using dat-header/import --- index.html | 17 ++--------- src/js/app.js | 11 ++++--- src/js/components/header/index.js | 39 +++++++++++++++++++++++++ src/js/components/index.js | 2 +- src/js/components/reset-button/index.js | 9 ------ 5 files changed, 49 insertions(+), 29 deletions(-) create mode 100644 src/js/components/header/index.js delete mode 100644 src/js/components/reset-button/index.js diff --git a/index.html b/index.html index 9508894c..2c659f39 100644 --- a/index.html +++ b/index.html @@ -5,25 +5,12 @@ -
- -
-
- -
- -
-
- - -
-
+

Initializing

+
diff --git a/src/js/app.js b/src/js/app.js index cefb2580..2bbb88fd 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -17,12 +17,15 @@ var $shareLink = document.getElementById('share-link') var componentCtors = require('./components') var components = [ - componentCtors.Help('help'), + componentCtors.Header('header', { + create: initArchive, + download: initArchive + }), componentCtors.HyperdriveSize('hyperdrive-size'), componentCtors.HyperdriveStats('hyperdrive-stats'), componentCtors.Peers('peers'), - componentCtors.ResetButton('new', initArchive), - componentCtors.SpeedDisplay('speed') + componentCtors.SpeedDisplay('speed'), + componentCtors.Help('help') ] var store = require('./store') @@ -110,7 +113,7 @@ function initArchive (key) { } function updateShareLink () { - $shareLink.value = window.location + $shareLink.innerHTML = window.location } var clearDrop diff --git a/src/js/components/header/index.js b/src/js/components/header/index.js new file mode 100644 index 00000000..2bad20e2 --- /dev/null +++ b/src/js/components/header/index.js @@ -0,0 +1,39 @@ +var yo = require('yo-yo') +var importButton = require('dat-header/import') +var button = require('dat-button') + +module.exports = Header + +function Header (el, props) { + if (!(this instanceof Header)) return new Header(el, props) + this.$el = document.getElementById(el) + this._props = props + this._component = this._render() + if (this.$el) this.$el.appendChild(this._component) +} + +Header.prototype.update = function (state) { + yo.update(this._component, this._render()) +} + +Header.prototype._render = function () { + return yo` +
+ +
+
+ ${button({ + text: 'Create new Dat', + click: this._props.create + })} +
+ ${importButton({ + download: this._props.download + })} + +
+
+ ` +} diff --git a/src/js/components/index.js b/src/js/components/index.js index a8858a0a..9df6ca31 100644 --- a/src/js/components/index.js +++ b/src/js/components/index.js @@ -1,8 +1,8 @@ module.exports = { + Header: require('./header'), Help: require('./help'), HyperdriveSize: require('./hyperdrive-size'), HyperdriveStats: require('./hyperdrive-stats'), Peers: require('./peers'), - ResetButton: require('./reset-button'), SpeedDisplay: require('./speed-display') } diff --git a/src/js/components/reset-button/index.js b/src/js/components/reset-button/index.js deleted file mode 100644 index 88c9b69b..00000000 --- a/src/js/components/reset-button/index.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = ResetButton - -function ResetButton (el, clickHandler) { - if (!(this instanceof ResetButton)) return new ResetButton(el, clickHandler) - this.$el = document.getElementById(el) - this.$el.onclick = function () { - clickHandler(null) - } -} From c4818d81efef66d0d62f1a04d541eecd0c9e775e Mon Sep 17 00:00:00 2001 From: karissa Date: Fri, 15 Jul 2016 12:26:53 -0700 Subject: [PATCH 4/7] import and download work --- src/js/app.js | 8 ++++++-- src/js/components/header/index.js | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index 2bbb88fd..0d469e32 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -18,8 +18,12 @@ var $shareLink = document.getElementById('share-link') var componentCtors = require('./components') var components = [ componentCtors.Header('header', { - create: initArchive, - download: initArchive + create: function (event) { + initArchive() + }, + download: function (link) { + initArchive(link) + } }), componentCtors.HyperdriveSize('hyperdrive-size'), componentCtors.HyperdriveStats('hyperdrive-stats'), diff --git a/src/js/components/header/index.js b/src/js/components/header/index.js index 2bad20e2..37232800 100644 --- a/src/js/components/header/index.js +++ b/src/js/components/header/index.js @@ -13,7 +13,9 @@ function Header (el, props) { } Header.prototype.update = function (state) { - yo.update(this._component, this._render()) + if (state && state.archiveReducer) { + yo.update(this._component, this._render()) + } } Header.prototype._render = function () { From 5b6b4655ca9d1b9d282c3839a595df2f50d5e959 Mon Sep 17 00:00:00 2001 From: karissa Date: Fri, 15 Jul 2016 14:14:30 -0700 Subject: [PATCH 5/7] make sure encoding is proper on each getArchive --- src/js/app.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/app.js b/src/js/app.js index 0d469e32..f40942f1 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -48,7 +48,7 @@ main() function main () { var keypath = window.location.hash.substr(1).match('([^/]+)(/?.*)') - var key = keypath ? encoding.decode(keypath[1]) : null + var key = keypath ? keypath[1] : null var file = keypath ? keypath[2] : null if (file) { @@ -65,6 +65,7 @@ function main () { } function getArchive (key, cb) { + if ((typeof key) === 'string') key = encoding.decode(key) var archive = drive.createArchive(key, {live: true, sparse: true}) var sw = swarm(archive) sw.on('connection', function (peer) { @@ -81,6 +82,7 @@ function getArchive (key, cb) { } cb(archive) }) + archive.on('download', function () { store.dispatch({type: 'UPDATE_ARCHIVE', archive: archive}) }) From 2967313ef67b48861ba4066efde63004e0270009 Mon Sep 17 00:00:00 2001 From: karissa Date: Fri, 15 Jul 2016 14:18:39 -0700 Subject: [PATCH 6/7] make help work, fix share link position --- index.html | 2 +- src/js/app.js | 4 ++-- src/js/components/header/index.js | 3 ++- src/js/components/help/index.js | 14 ++++++-------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index 2c659f39..ec3992ad 100644 --- a/index.html +++ b/index.html @@ -10,8 +10,8 @@

Initializing

-
+
diff --git a/src/js/app.js b/src/js/app.js index f40942f1..4e6c8f6b 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -28,8 +28,7 @@ var components = [ componentCtors.HyperdriveSize('hyperdrive-size'), componentCtors.HyperdriveStats('hyperdrive-stats'), componentCtors.Peers('peers'), - componentCtors.SpeedDisplay('speed'), - componentCtors.Help('help') + componentCtors.SpeedDisplay('speed') ] var store = require('./store') @@ -75,6 +74,7 @@ function getArchive (key, cb) { }) }) archive.open(function () { + console.log('open?') if (archive.content) { archive.content.get(0, function (data) { // XXX: Hack to fetch a small bit of data so size properly updates diff --git a/src/js/components/header/index.js b/src/js/components/header/index.js index 37232800..353b170c 100644 --- a/src/js/components/header/index.js +++ b/src/js/components/header/index.js @@ -1,5 +1,6 @@ var yo = require('yo-yo') var importButton = require('dat-header/import') +var help = require('../help') var button = require('dat-button') module.exports = Header @@ -34,7 +35,7 @@ Header.prototype._render = function () { ${importButton({ download: this._props.download })} - + ${help()}
` diff --git a/src/js/components/help/index.js b/src/js/components/help/index.js index fe9b5ef5..b01f4422 100644 --- a/src/js/components/help/index.js +++ b/src/js/components/help/index.js @@ -1,15 +1,12 @@ +var yo = require('yo-yo') var intro = require('intro.js') -module.exports = Help - -function Help (el, clickHandler) { - if (!(this instanceof Help)) return new Help(el) - this.$el = document.getElementById(el) - this.$el.onclick = function () { +module.exports = function Help () { + function onclick () { var _intro = intro.introJs() _intro.setOptions({ steps: [{ - intro: 'You can create a new dat by clicking Reset' + intro: 'You can create a new dat by clicking Create New Dat' }, { intro: 'Drop some files here', @@ -17,10 +14,11 @@ function Help (el, clickHandler) { }, { intro: 'You can share the dat with this link', - element: 'input#share-link', + element: '#share-link', position: 'bottom' } ]}) _intro.start() } + return yo`` } From e171740bda71ecca9f1a0d1864cf0b1dcf8efea0 Mon Sep 17 00:00:00 2001 From: karissa Date: Fri, 15 Jul 2016 14:27:33 -0700 Subject: [PATCH 7/7] remove console log --- src/js/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/js/app.js b/src/js/app.js index 4e6c8f6b..8b7e7419 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -74,7 +74,6 @@ function getArchive (key, cb) { }) }) archive.open(function () { - console.log('open?') if (archive.content) { archive.content.get(0, function (data) { // XXX: Hack to fetch a small bit of data so size properly updates