Skip to content

Commit b855aea

Browse files
authored
Merge pull request #64292 from nextcloud/fix/ui/grid-icon-transparency
fix(files): make the background of the grid icon opaque
2 parents 7cf4272 + 5c879bf commit b855aea

7 files changed

Lines changed: 37 additions & 21 deletions

File tree

‎apps/files/css/files.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/files/css/files.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/files/css/files.scss‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,17 +1300,29 @@ table.dragshadow td.size {
13001300
}
13011301

13021302
/* Grid view toggle */
1303-
#view-toggle {
1303+
/*
1304+
* The toggle is sticky and floats on top of the scrolling file list and the
1305+
* breadcrumbs. The button itself is pill-shaped, so its transparent corners
1306+
* used to let the content behind it bleed through at the edges. This wrapper
1307+
* sits behind the button and paints an opaque backing across the whole area,
1308+
* masking anything that scrolls underneath it.
1309+
*/
1310+
#view-toggle-wrapper {
1311+
position: sticky;
1312+
float: right;
1313+
top: 0;
1314+
right: 0;
1315+
z-index: 100;
13041316
background-color: var(--color-main-background-translucent);
1317+
}
1318+
1319+
#view-toggle {
1320+
display: block;
1321+
background-color: var(--color-main-background);
13051322
border: none;
1306-
margin: 0;
1323+
margin: 2px;
13071324
padding: 22px;
13081325
opacity: .5;
1309-
float: right;
1310-
right: var(--default-grid-baseline);
1311-
top: var(--default-grid-baseline);
1312-
z-index: 100;
1313-
position: sticky;
13141326

13151327
&:hover,
13161328
&:focus,
@@ -1349,7 +1361,7 @@ table.dragshadow td.size {
13491361
}
13501362

13511363
/* Right-align view toggle on link share page */
1352-
#view-toggle {
1364+
#view-toggle-wrapper {
13531365
position: absolute;
13541366
right: 0;
13551367
top: 0;

‎apps/files/css/merged.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)