From 6cee8d7664c74ce42e4efb75b6d4e6cdd3107040 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Wed, 4 Oct 2017 21:07:04 -0600 Subject: [PATCH] fixes for last review --- ui/js/component/fileTile/view.jsx | 9 ++------- ui/js/component/header/view.jsx | 1 + ui/scss/_gui.scss | 4 ++-- ui/scss/component/_file-tile.scss | 17 ++++++----------- ui/scss/component/_header.scss | 2 +- ui/scss/component/_scrollbar.scss | 2 +- ui/scss/component/_tabs.scss | 2 +- ui/scss/mixin/link.scss | 4 ++-- 8 files changed, 16 insertions(+), 25 deletions(-) diff --git a/ui/js/component/fileTile/view.jsx b/ui/js/component/fileTile/view.jsx index e7ff1fb64..a16a51435 100644 --- a/ui/js/component/fileTile/view.jsx +++ b/ui/js/component/fileTile/view.jsx @@ -129,19 +129,14 @@ class FileTile extends React.PureComponent {

{title}

+ {uri} {description &&
- + {description}
} -
- - - {uri} - -
diff --git a/ui/js/component/header/view.jsx b/ui/js/component/header/view.jsx index 81b70d703..89f6df923 100644 --- a/ui/js/component/header/view.jsx +++ b/ui/js/component/header/view.jsx @@ -47,6 +47,7 @@ export const Header = props => { navigate("/wallet")} button="text" + className="no-underline" icon="icon-bank" label={balance} title={__("Wallet")} diff --git a/ui/scss/_gui.scss b/ui/scss/_gui.scss index e758ebe8a..5f66a1cb1 100644 --- a/ui/scss/_gui.scss +++ b/ui/scss/_gui.scss @@ -44,8 +44,8 @@ body position: absolute; top: var(--header-height); bottom: 0; - left: 5px; - right: 5px; + left: 3px; + right: 3px; main { margin-left: auto; margin-right: auto; diff --git a/ui/scss/component/_file-tile.scss b/ui/scss/component/_file-tile.scss index c975e6585..73273f2e9 100644 --- a/ui/scss/component/_file-tile.scss +++ b/ui/scss/component/_file-tile.scss @@ -1,4 +1,3 @@ - $height-file-tile: $spacing-vertical * 6; .file-tile__row { overflow: hidden; @@ -16,23 +15,19 @@ $height-file-tile: $spacing-vertical * 6; padding-top: $spacing-vertical * 1/3; margin-left: $height-file-tile + $spacing-vertical / 2; } + .card__title-primary { margin-top: 0; } - .meta { - font-size: 0.9em; + + .file-tile__uri { color: var(--color-primary); - background: var(--color-canvas); - border: 1px solid rgba(0, 0, 0, 0.15); - border-radius: 3px; + font-size: 0.82em; display: inline-block; - padding: 4px 8px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - max-width: 80%; - .meta-uri { - margin-left: 8px; - } + max-width: 85%; } + } diff --git a/ui/scss/component/_header.scss b/ui/scss/component/_header.scss index 49881422c..769622fd8 100644 --- a/ui/scss/component/_header.scss +++ b/ui/scss/component/_header.scss @@ -20,7 +20,7 @@ padding-right: $spacing-vertical / 4; .button-alt { background: var(--header-button-bg) !important; - font-size: 17px; + font-size: 1em; } .button-alt:hover { background: var(--header-button-hover-bg) !important; diff --git a/ui/scss/component/_scrollbar.scss b/ui/scss/component/_scrollbar.scss index 6bf891e62..14afcca10 100644 --- a/ui/scss/component/_scrollbar.scss +++ b/ui/scss/component/_scrollbar.scss @@ -1,5 +1,5 @@ ::-webkit-scrollbar { - width: 6px; + width: 7px; overflow: auto; } diff --git a/ui/scss/component/_tabs.scss b/ui/scss/component/_tabs.scss index 3a3dfe92a..06d7a794d 100644 --- a/ui/scss/component/_tabs.scss +++ b/ui/scss/component/_tabs.scss @@ -15,7 +15,7 @@ nav.sub-header text-transform: uppercase; display: inline-block; vertical-align: baseline; - margin: 0 8px; + margin: 0 16px; padding: 0 8px; color: var(--tab-color); position: relative; diff --git a/ui/scss/mixin/link.scss b/ui/scss/mixin/link.scss index 37c3b1b02..ae6e752da 100644 --- a/ui/scss/mixin/link.scss +++ b/ui/scss/mixin/link.scss @@ -9,8 +9,8 @@ } } - &:not(.underline) { - text-decoration: none; + &:not(.no-underline) { + text-decoration: underline; .icon { text-decoration: none; }