From e6a463d1f3b7b5cdd89b67e260323f507898ffd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 25 Apr 2018 10:55:19 +0200 Subject: [PATCH 1/5] Personal settings: Fix visibility alignment and avatar description text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- settings/css/settings.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index a040ee6195..6108a77732 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -52,9 +52,6 @@ input { #displayavatar { text-align: center; - p { - text-align: left; - } } #uploadavatarbutton, #selectavatar, #removeavatar { @@ -119,6 +116,7 @@ input { background-size: 16px; background-position: left 8px; opacity: .3; + margin-top: -2px; margin-left: 10px; cursor: pointer; @@ -234,7 +232,7 @@ input { margin-bottom: 12px; display: inline-flex; flex-wrap: nowrap; - justify-content: space-between; + justify-content: flex-start; width: 100%; > label { white-space: nowrap; From 4b550eb699f611e1af1e116e4aa757389353d01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 25 Apr 2018 12:26:58 +0200 Subject: [PATCH 2/5] Move quota bar to info section and make it a bit simpler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- core/css/icons.scss | 4 ++ core/css/styles.scss | 34 ------------- settings/css/settings.scss | 30 +++++++++++ .../settings/personal/personal.info.php | 50 +++++++------------ 4 files changed, 52 insertions(+), 66 deletions(-) diff --git a/core/css/icons.scss b/core/css/icons.scss index 775decfa3a..8f2d474875 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -300,6 +300,10 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-image: url('../img/actions/public.svg?v=1'); } +.icon-quota { + background-image: url('../img/actions/quota.svg?v=1'); +} + .icon-rename { background-image: url('../img/actions/rename.svg?v=1'); } diff --git a/core/css/styles.scss b/core/css/styles.scss index 0bbd89f075..736713c3e7 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -927,40 +927,6 @@ code { font-family: 'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', monospace; } -#body-settings #quota { - cursor: default; - margin: 30px !important; - position: relative; - padding: 0 !important; - progress { - height: 36px; - &::-moz-progress-bar { - border-radius: 3px 0 0 3px; - } - &::-webkit-progress-value { - border-radius: 3px 0 0 3px; - } - } - div { - font-weight: normal; - white-space: nowrap; - position: absolute;; - top: 0; - &.quotatext-bg { - mix-blend-mode: luminosity; - } - &.quotatext-fg { - color: $color-primary-text; - overflow: hidden; - z-index: 50; - max-width: 100%; - } - .quotatext { - padding: .6em 1em; - } - } -} - .pager { list-style: none; float: right; diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 6108a77732..3e7e557664 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -160,6 +160,16 @@ input { .section { padding: 10px 10px; } + + .personal-info { + margin-right: 10%; + margin-bottom: 20px; + } + .personal-info[class^='icon-'], .personal-info[class*=' icon-'] { + background-position: 0px 2px; + padding-left: 30px; + opacity: 0.7; + } } @@ -270,6 +280,26 @@ input { } } + +#body-settings #quota { + cursor: default; + position: relative; + progress { + height: 6px; + &::-moz-progress-bar { + border-radius: 3px 0 0 3px; + } + &::-webkit-progress-value { + border-radius: 3px 0 0 3px; + } + } + div { + font-weight: normal; + white-space: nowrap; + } +} + + /* verify accounts */ /* only show pointer cursor when popup will be there */ .verification-dialog { diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php index 24f8907627..0f9c38ba8d 100644 --- a/settings/templates/settings/personal/personal.info.php +++ b/settings/templates/settings/personal/personal.info.php @@ -37,34 +37,6 @@ vendor_style('jcrop/css/jquery.Jcrop'); ?> -
- 80): ?> class="warn" > - -
-

- - t('You are using %s of %s', - [$_['usage'], $_['total_space']]));?> - - t('You are using %s of %s (%s %%)', - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> - -

-
-
-

- - t('You are using %s of %s', - [$_['usage'], $_['total_space']]));?> - - t('You are using %s of %s (%s %%)', - [$_['usage'], $_['total_space'], $_['usage_relative']]));?> - -

-
-
-
@@ -100,14 +72,28 @@ vendor_style('jcrop/css/jquery.Jcrop');
-
-
-

t('Groups')); ?>

-

t('You are member of the following groups:')); ?>

+
+

Details

+
+

t('You are member of the following groups:')); ?>

+
+
+

+ + t('You are using %s of %s', + [$_['usage'], $_['total_space']]));?> + + t('You are using %s of %s (%s %%)', + [$_['usage'], $_['total_space'], $_['usage_relative']]));?> + +

+
+ 80): ?> class="warn" > +
From d0efe1bf6c925a002f3777305fb6ad6f2f26f2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Sat, 28 Apr 2018 11:51:24 +0200 Subject: [PATCH 3/5] Translate details text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- settings/templates/settings/personal/personal.info.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php index 0f9c38ba8d..09aba90f50 100644 --- a/settings/templates/settings/personal/personal.info.php +++ b/settings/templates/settings/personal/personal.info.php @@ -73,7 +73,7 @@ vendor_style('jcrop/css/jquery.Jcrop');
-

Details

+

t('Details')); ?>

t('You are member of the following groups:')); ?>

From 94528ad2be8e2bccce42e92dc1abccd3a2433b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 3 May 2018 10:31:56 +0200 Subject: [PATCH 4/5] Move quota icon to core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files/css/files.scss | 3 --- apps/files/templates/appnavigation.php | 2 +- {apps/files/img => core/img/actions}/quota.svg | 0 3 files changed, 1 insertion(+), 4 deletions(-) rename {apps/files/img => core/img/actions}/quota.svg (100%) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index b89332248f..d2d810c1e6 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -105,9 +105,6 @@ .nav-icon-trashbin { background-image: url('../img/delete.svg?v=1'); } -.nav-icon-quota { - background-image: url('../img/quota.svg?v=1'); -} #app-navigation .nav-files a.nav-icon-files { width: auto; diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index a85e2515a9..c811ace8ab 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -15,7 +15,7 @@ if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { ?>has-tooltip" title=""> - +

t('%s of %s used', [$_['usage'], $_['total_space']])); diff --git a/apps/files/img/quota.svg b/core/img/actions/quota.svg similarity index 100% rename from apps/files/img/quota.svg rename to core/img/actions/quota.svg From b6457e4135b7275034ecac956cc1c4323eb4f4cd Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 3 May 2018 10:50:08 +0200 Subject: [PATCH 5/5] Only show used amount for unlimited quota users Signed-off-by: Morris Jobke --- settings/templates/settings/personal/personal.info.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php index 09aba90f50..e581e6d39e 100644 --- a/settings/templates/settings/personal/personal.info.php +++ b/settings/templates/settings/personal/personal.info.php @@ -84,8 +84,8 @@ vendor_style('jcrop/css/jquery.Jcrop');

- t('You are using %s of %s', - [$_['usage'], $_['total_space']]));?> + t('You are using %s', + [$_['usage']]));?> t('You are using %s of %s (%s %%)', [$_['usage'], $_['total_space'], $_['usage_relative']]));?>