diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2017-03-28 09:47:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 09:47:48 +0200 |
| commit | f88a578f8e49dc1e7078ed5e5c193aaac297aa73 (patch) | |
| tree | 698c75d7a8e069a22e9edc50d74d5e48180e2195 | |
| parent | 6309b9ec1db1e16eaf8a2717f1bd60f39afaf15d (diff) | |
| parent | 0322e7a29ed8de9a87b7f057ad4d77b24c257200 (diff) | |
| download | nextcloud-server-f88a578f8e49dc1e7078ed5e5c193aaac297aa73.tar.gz nextcloud-server-f88a578f8e49dc1e7078ed5e5c193aaac297aa73.zip | |
Merge pull request #4082 from nextcloud/fix-menu
Fix pop over menu opacity
| -rw-r--r-- | apps/files/css/files.scss | 18 | ||||
| -rw-r--r-- | core/css/apps.scss | 27 |
2 files changed, 26 insertions, 19 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..898a18ae9c9 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -8,9 +8,9 @@ * @copyright Copyright (c) 2016, Roeland Jago Douma <rullzer@owncloud.com> * @copyright Copyright (c) 2016, jowi <sjw@gmx.ch> * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de> - * @copyright Copyright (c) 2015, Jan-Christoph Borchardt <hey@jancborchardt.net> * @copyright Copyright (c) 2015, Thomas Müller <thomas.mueller@tmit.eu> * @copyright Copyright (c) 2015, Vincent Petry <pvince81@owncloud.com> + * @copyright Copyright (c) 2014-2017, Jan-Christoph Borchardt <hey@jancborchardt.net> * * @license GNU AGPL version 3 or any later version * @@ -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=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; + } + } [class^='icon-'], [class*=' icon-']{ /* Keep padding to define the width to |