Skip to content

Commit

Permalink
Fix popover layout fix for files and global
Browse files Browse the repository at this point in the history
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
skjnldsv committed Nov 7, 2016
1 parent c34d0b6 commit f2f5774
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 33 deletions.
18 changes: 0 additions & 18 deletions apps/files/css/files.css
Original file line number Diff line number Diff line change
Expand Up @@ -625,13 +625,6 @@ html.ie8 .column-mtime .selectedActions {
padding-right: 14px;
}

#fileList .popovermenu {
margin-right: 6px;
}
.ie8 #fileList .popovermenu {
margin-top: -10px;
}

.ie8 #fileList a.action img,
#fileList tr:hover a.action,
#fileList a.action.permanent,
Expand All @@ -649,7 +642,6 @@ html.ie8 .column-mtime .selectedActions {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
filter: alpha(opacity=30);
opacity: .3;
display:inline;
}
.ie8 #fileList a.action:hover img,
#fileList tr a.action.disabled.action-download,
Expand All @@ -661,7 +653,6 @@ html.ie8 .column-mtime .selectedActions {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70);
opacity: 7;
display:inline;
}
#fileList tr a.action.disabled {
background: none;
Expand Down Expand Up @@ -775,11 +766,6 @@ table.dragshadow td.size {
padding: initial;
}

#fileList .popovermenu a.action {
padding: 10px;
margin: -10px;
}

html.ie8 #controls .button.new {
padding-right: 0;
}
Expand Down Expand Up @@ -826,11 +812,7 @@ html.ie8 #controls .button.new {
}

#fileList .popovermenu .action {
display: block;
line-height: 30px;
padding-left: 5px;
color: #000;
padding: 0;
}

#filestable .filename .action .icon,
Expand Down
18 changes: 4 additions & 14 deletions core/css/apps.css
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
border-radius: 3px;
border-top-right-radius: 0;
z-index: 110;
margin: -5px 14px 5px 10px;
margin-top: -5px;
right: 0;
-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
Expand Down Expand Up @@ -655,35 +655,25 @@ em {
opacity: 1;
}

.popovermenu {
padding: 4px 12px;
}

.popovermenu li {
padding: 5px 0;
}

.popovermenu .menuitem img {
padding: initial;
}

.popovermenu a.menuitem,
.popovermenu label.menuitem,
.popovermenu .menuitem {
padding: 10px;
margin: -10px;
padding: 10px !important;
width: auto;
}

.popovermenu.hidden {
display: none;
}

.popovermenu .menuitem {
display: flex;
display: flex !important;
line-height: 30px;
padding-left: 5px;
color: #000;
padding: 0;
align-items: center;
}

Expand Down
3 changes: 2 additions & 1 deletion settings/css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ input#openid, input#webdav { width:20em; }
top: 44px;
}
.federationScopeMenu.bubble::after {
left: 45px;
right: 50%;
margin-right: -14px;
}
.federationScopeMenu.popovermenu {
font-weight: 100;
Expand Down

0 comments on commit f2f5774

Please sign in to comment.