From c4bebe3b888cfc5dd691810dc76194a3bd8e0e2b Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Fri, 2 Jun 2017 12:05:38 +0200 Subject: [PATCH 1/5] Fix opacity and padding inconsistency in breadcrumbs Signed-off-by: Marin Treselj --- core/css/styles.scss | 26 +++++++++++--------------- core/img/places/home.svg | 2 +- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/core/css/styles.scss b/core/css/styles.scss index a8ddcfd172c35..3a6d325b2ad95 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1218,9 +1218,14 @@ span.ui-icon { /* ---- BREADCRUMB ---- */ -div.crumb { +.breadcrumb { + margin-right: 10px; float: left; - display: block; + display: flex; +} +div.crumb { + display: flex; + opacity: 0.5; background-image: url('../img/breadcrumb.svg?v=1'); background-repeat: no-repeat; background-position: right center; @@ -1230,22 +1235,13 @@ div.crumb { display: none; } a, > span { - position: relative; - top: 12px; - padding: 14px 24px 14px 17px; - color: nc-lighten($color-main-text, 33%); + padding: 14px; } - &.last a { + &.last .icon-shared { padding-right: 0; } - &:first-child a { - position: relative; - top: 13px; - padding-right: 14px; - } &.last { font-weight: 600; - margin-right: 10px; } &.ellipsized { padding: 0 10px 0 5px; @@ -1256,8 +1252,8 @@ div.crumb { top: 8px !important; } &:hover, &:focus, a:focus, &:active { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)'; - opacity: .7; + -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; + opacity: 1; } } diff --git a/core/img/places/home.svg b/core/img/places/home.svg index 30ef3e31ad4ee..30b7a86503a5d 100644 --- a/core/img/places/home.svg +++ b/core/img/places/home.svg @@ -1 +1 @@ - \ No newline at end of file + From 1c1414e18908b204a3ceb13f1041e3e100538195 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Mon, 5 Jun 2017 11:00:00 +0200 Subject: [PATCH 2/5] scour home.svg Signed-off-by: Marin Treselj --- core/img/places/home.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/img/places/home.svg b/core/img/places/home.svg index 30b7a86503a5d..600c5a537c4cc 100644 --- a/core/img/places/home.svg +++ b/core/img/places/home.svg @@ -1 +1 @@ - + From fe9e61844f131dd924d1924b32e029f6553d9cc5 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Sat, 10 Jun 2017 22:53:40 +0200 Subject: [PATCH 3/5] Fix icon-public and .ellipsis Signed-off-by: Marin Treselj --- core/css/styles.scss | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/css/styles.scss b/core/css/styles.scss index 3a6d325b2ad95..65718f2249bf1 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1237,19 +1237,14 @@ div.crumb { a, > span { padding: 14px; } - &.last .icon-shared { + .shared { padding-right: 0; } &.last { font-weight: 600; } &.ellipsized { - padding: 0 10px 0 5px; - } - a.ellipsislink { - padding: 0 !important; - position: relative; - top: 8px !important; + line-height: 10px; } &:hover, &:focus, a:focus, &:active { -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; From eaeae3326b6104e2102f02044dc38bc7a3f900b6 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Fri, 23 Jun 2017 13:08:29 +0200 Subject: [PATCH 4/5] Fix vertical text position sharing icons' positions. Signed-off-by: Marin Treselj --- core/css/styles.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/css/styles.scss b/core/css/styles.scss index 65718f2249bf1..77147334f2876 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1231,21 +1231,21 @@ div.crumb { background-position: right center; height: 44px; background-size: auto 24px; + line-height: 12px; &.hidden { display: none; } a, > span { padding: 14px; } - .shared { - padding-right: 0; + .icon-public, .icon-shared { + position: relative; + right: 14px; + margin-right: -14px; } &.last { font-weight: 600; } - &.ellipsized { - line-height: 10px; - } &:hover, &:focus, a:focus, &:active { -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; From 5c70aa5a2043f3f32f6c647531a291ac61f53778 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Fri, 30 Jun 2017 13:36:43 +0200 Subject: [PATCH 5/5] fix padding Signed-off-by: Marin Treselj --- apps/files_sharing/css/sharebreadcrumb.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/files_sharing/css/sharebreadcrumb.scss b/apps/files_sharing/css/sharebreadcrumb.scss index f3096f450137d..ef1cd6158e1cf 100644 --- a/apps/files_sharing/css/sharebreadcrumb.scss +++ b/apps/files_sharing/css/sharebreadcrumb.scss @@ -25,7 +25,6 @@ div.crumb span.icon-public { display: inline-block; cursor: pointer; opacity: 0.2; - margin-right: 6px; } div.crumb span.icon-shared.shared,