From e1ad305e0b7fddc3dd0c6a7b974e712f1f936202 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Sun, 26 Mar 2017 14:09:22 -0600 Subject: [PATCH 1/2] Fix pop over menu opacity Signed-off-by: Morris Jobke --- apps/files/css/files.scss | 18 +++++++++++++++--- core/css/apps.scss | 25 ++++++++++--------------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 54ed05385fa..1a95ce1e34b 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -622,7 +622,6 @@ html.ie8 .column-mtime .selectedActions { #fileList tr:hover a.action, #fileList a.action.permanent, #fileList tr:focus a.action, -#fileList a.action.permanent, #fileList tr:hover a.action.no-permission:hover, #fileList tr:focus a.action.no-permission:focus, /*#fileList .name:focus .action,*/ @@ -648,6 +647,19 @@ html.ie8 .column-mtime .selectedActions { opacity: .7; display:inline; } + +#fileList .fileActionsMenu a.action.permanent { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important; + filter: alpha(opacity=70) !important; + opacity: .7 !important; +} +#fileList .fileActionsMenu a.action.permanent:hover, +#fileList .fileActionsMenu a.action.permanent:focus { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important; + filter: alpha(opacity=100) !important; + opacity: 1 !important; +} + #fileList tr a.action.disabled { background: none; } @@ -655,8 +667,8 @@ html.ie8 .column-mtime .selectedActions { /* show share action of shared items darker to distinguish from non-shared */ #fileList a.action.action-share.permanent.shared-style, /* show hovered permanent entries darker */ -#fileList tr a.action.action.permanent:hover, -#fileList tr a.action.action.permanent:focus { +#fileList tr a.action.permanent:hover, +#fileList tr a.action.permanent:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important; filter: alpha(opacity=70) !important; opacity: .7 !important; diff --git a/core/css/apps.scss b/core/css/apps.scss index e9ed9f470cd..daddc9a4f0a 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -632,9 +632,6 @@ em { cursor: pointer; line-height: 36px; border: 0; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)' !important; - filter: alpha(opacity = 50) !important; - opacity: .5 !important; background-color: transparent; display: flex; align-items: center; @@ -643,26 +640,14 @@ em { margin: 0; font-weight: inherit; box-shadow: none; - color: nc-lighten($color-main-text, 20%) !important; /* Overwrite app-navigation li */ /* prevent .action class to break the design */ &.action { padding: inherit !important; } - &:hover, &:focus { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)' !important; - filter: alpha(opacity = 100) !important; - opacity: 1 !important; - background-color: transparent; - } > span { cursor: pointer; white-space: nowrap; } - span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important; - filter: alpha(opacity = 70) !important; - opacity: .7 !important; - } > p { width: 150px; line-height: 1.6em; @@ -678,6 +663,16 @@ em { padding: 0 10px; } } + .menuitem { + -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important; + filter: alpha(opacity = 70) !important; + opacity: .7 !important; + &:hover, &:focus { + -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)' !important; + filter: alpha(opacity = 100) !important; + opacity: 1 !important; + } + } [class^='icon-'], [class*=' icon-']{ /* Keep padding to define the width to From 0322e7a29ed8de9a87b7f057ad4d77b24c257200 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 27 Mar 2017 11:23:33 +0200 Subject: [PATCH 2/2] highlight active entry in personal info menu again Signed-off-by: Jan-Christoph Borchardt --- core/css/apps.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index daddc9a4f0a..898a18ae9c9 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -8,9 +8,9 @@ * @copyright Copyright (c) 2016, Roeland Jago Douma * @copyright Copyright (c) 2016, jowi * @copyright Copyright (c) 2015, Hendrik Leppelsack - * @copyright Copyright (c) 2015, Jan-Christoph Borchardt * @copyright Copyright (c) 2015, Thomas Müller * @copyright Copyright (c) 2015, Vincent Petry + * @copyright Copyright (c) 2014-2017, Jan-Christoph Borchardt * * @license GNU AGPL version 3 or any later version * @@ -664,10 +664,10 @@ em { } } .menuitem { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important; - filter: alpha(opacity = 70) !important; - opacity: .7 !important; - &:hover, &:focus { + -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)' !important; + filter: alpha(opacity = 50) !important; + opacity: .5 !important; + &:hover, &:focus, &.active { -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)' !important; filter: alpha(opacity = 100) !important; opacity: 1 !important;