Skip to content

Commit 30d180c

Browse files
committed
WIP: to be moved to correct places
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent acf55e3 commit 30d180c

File tree

4 files changed

+88
-17
lines changed

4 files changed

+88
-17
lines changed

apps/files/css/files.scss

+3-8
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
thead {
6969
position: -webkit-sticky;
7070
position: sticky;
71-
// header + breadcrumbs
72-
top: variables.$header-height;
71+
// breadcrumbs
72+
top: 44px;
7373
// under breadcrumbs, over file list
7474
z-index: 60;
7575
display: block;
@@ -310,11 +310,6 @@ table th.column-last, table td.column-last {
310310
max-width: 130px;
311311
}
312312

313-
#app-content-files thead,
314-
#app-content-trashbin thead {
315-
top: 94px;
316-
}
317-
318313
#app-content-recent,
319314
#app-content-favorites,
320315
#app-content-shareoverview,
@@ -1193,7 +1188,7 @@ table.dragshadow td.size {
11931188
padding: 22px;
11941189
opacity: .5;
11951190
position: fixed;
1196-
right: 0;
1191+
right: 16px;
11971192
z-index: 100;
11981193

11991194
&:hover,

core/css/apps.scss

+82-7
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,36 @@
1919
@use 'sass:math';
2020
@import 'functions';
2121

22+
23+
:root {
24+
--body-container-margin: 8px;
25+
--body-container-radius: var(--border-radius-large);
26+
}
27+
28+
@media screen and (max-width: 768px) {
29+
:root {
30+
--body-container-margin: 0;
31+
--body-container-radius: 0;
32+
}
33+
}
34+
35+
36+
html {
37+
width: 100%;
38+
height: 100%;
39+
position: absolute;
40+
background: url('/apps/dashboard/img/kamil-porembinski-clouds.jpg');
41+
background-size: cover;
42+
background-position: top center;
43+
}
44+
2245
body {
23-
background: url('/apps/dashboard/img/kamil-porembinski-clouds.jpg');
24-
background-size: contain;
25-
position: fixed;
46+
background: url('/apps/dashboard/img/kamil-porembinski-clouds.jpg');
47+
background-size: cover;
48+
background-position: top center;
49+
position: fixed;
50+
width: 100%;
51+
height: 100%;
2652
}
2753

2854
/* BASE STYLING ------------------------------------------------------------ */
@@ -615,12 +641,11 @@ kbd {
615641
position: static;
616642
// padding is included in height
617643
min-height: 100%;
618-
margin: 8px;
644+
margin: var(--body-container-margin);
619645
margin-top: 50px;
620646
display: flex;
621-
height: calc(100vh - 50px - 8px);
622-
border-radius: var(--border-radius-large);
623-
box-sizing: content-box;
647+
height: calc(100vh - 50px - var(--body-container-margin));
648+
border-radius: var(--body-container-radius);
624649
overflow-y: scroll;
625650
}
626651

@@ -1345,3 +1370,53 @@ $outter-margin: math.div($popoveritem-height - $popovericon-size, 2);
13451370
display: flex;
13461371
}
13471372
}
1373+
1374+
#app-sidebar-vue:not(.app-sidebar--full) {
1375+
position: initial;
1376+
border-radius: 0 var(--body-container-radius) var(--body-container-radius) 0;
1377+
max-height: 100%;
1378+
min-height: 100%;
1379+
}
1380+
1381+
#app-navigation, #app-navigation-vue {
1382+
position: relative; // TODO: Fix on mobile/desktop
1383+
height: 100%;
1384+
max-height: 100%;
1385+
min-height: 100%;
1386+
padding: 12px;
1387+
}
1388+
1389+
#content, #content-vue {
1390+
box-sizing: border-box;
1391+
position: static;
1392+
// padding is included in height
1393+
min-height: 100%;
1394+
margin: var(--body-container-margin);
1395+
margin-top: 50px;
1396+
display: flex;
1397+
height: calc(100vh - 50px - var(--body-container-margin));
1398+
border-radius: var(--body-container-radius);
1399+
position: fixed;
1400+
overflow: hidden;
1401+
width: calc(100% - var(--body-container-margin) * 2);
1402+
max-height: calc(100% - 50px - var(--body-container-margin));
1403+
min-height: calc(100% - 50px - var(--body-container-margin));
1404+
1405+
padding: 0;
1406+
}
1407+
1408+
#app-content, #app-content-vue {
1409+
position: initial;
1410+
max-height: 100%;
1411+
min-height: 100%;
1412+
overflow: scroll;
1413+
}
1414+
1415+
1416+
// mobile.scss
1417+
1418+
@media only screen and (max-width: variables.$breakpoint-mobile) {
1419+
#app-navigation {
1420+
position: fixed;
1421+
}
1422+
}

core/css/styles.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ body {
203203
-ms-user-select: none;
204204
user-select: none;
205205
display: flex;
206-
top: variables.$header-height;
206+
top: 0;
207207
}
208208

209209
/* position controls for apps with app-navigation */

core/templates/layout.user.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
p($theme->getTitle());
2323
?>
2424
</title>
25-
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
25+
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0 user-scalable=no" />
26+
2627
<?php if ($theme->getiTunesAppId() !== '') { ?>
2728
<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
2829
<?php } ?>

0 commit comments

Comments
 (0)