Skip to content

Fix pop over menu opacity #4082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Mar 28, 2017
Merged

Fix pop over menu opacity #4082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1ad305
Fix pop over menu opacity
MorrisJobke Mar 26, 2017
0322e7a
highlight active entry in personal info menu again
jancborchardt Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,*/
Expand All @@ -648,15 +647,28 @@ 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;
}

/* 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;
Expand Down
27 changes: 11 additions & 16 deletions core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand Down