Skip to content

Commit 38b9aec

Browse files
committed
Cleanup structure
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
1 parent a4b5ff8 commit 38b9aec

File tree

10 files changed

+169
-212
lines changed

10 files changed

+169
-212
lines changed

apps/files_sharing/js/public.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ OCA.Sharing.PublicApp = {
6767
$el,
6868
{
6969
id: 'files.public',
70-
scrollContainer: $('#content-wrapper'),
70+
scrollContainer: $('#app-content'),
7171
dragOptions: dragOptions,
7272
folderDropOptions: folderDropOptions,
7373
fileActions: fileActions,

core/css/apps.scss

Lines changed: 17 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ kbd {
8080

8181
#app-navigation {
8282
width: 250px;
83-
height: 100%;
84-
float: left;
83+
/* header height */
84+
height: calc(100vh - 50px);
85+
position: fixed;
8586
box-sizing: border-box;
8687
background-color: var(--color-main-background);
8788
padding-bottom: 44px;
@@ -590,9 +591,11 @@ kbd {
590591
/* APP-CONTENT ---------------------------------------------------------------*/
591592
/* Part where the content will be loaded into */
592593
#app-content {
594+
margin-left: 250px;
595+
z-index: 1000;
596+
background-color: var(--color-main-background);
593597
position: relative;
594-
height: 100%;
595-
overflow-y: auto;
598+
min-height: calc(100vh - 50px);
596599
/* no top border for first settings item */
597600
> .section:first-child {
598601
border-top: none;
@@ -602,11 +605,6 @@ kbd {
602605
}
603606
}
604607

605-
#app-content-wrapper {
606-
min-width: 100%;
607-
min-height: 100%;
608-
}
609-
610608
/* APP-SIDEBAR ----------------------------------------------------------------*/
611609

612610
/*
@@ -1025,21 +1023,26 @@ $popovericon-size: 16px;
10251023
}
10261024

10271025
/* CONTENT WRAPPER --------------------------------------------------------- */
1026+
#content {
1027+
/* header height */
1028+
padding-top: 50px;
1029+
box-sizing: border-box;
1030+
position: relative;
1031+
}
1032+
/* if app-content-list is present */
10281033
#app-content-wrapper {
10291034
display: flex;
10301035
position: relative;
10311036
align-items: start;
1032-
height: 100%;
1033-
width: 100%;
10341037
.app-content-list,
10351038
.app-content-detail {
1036-
min-height: 100%;
1037-
max-height: 100%;
1039+
min-height: calc(100vh - 50px);
1040+
max-height: calc(100vh - 50px);
10381041
overflow-x: hidden;
10391042
overflow-y: auto;
10401043
}
10411044
}
1042-
1045+
10431046
/* CONTENT LIST ------------------------------------------------------------- */
10441047
.app-content-list {
10451048
width: 300px;
@@ -1203,51 +1206,3 @@ $popovericon-size: 16px;
12031206
}
12041207
}
12051208

1206-
/* MOBILE ------------------------------------------------------------------- */
1207-
/* Mobile width < 768px */
1208-
@media only screen and (max-width: 768px) {
1209-
1210-
/* full width for message list on mobile */
1211-
.app-content-list {
1212-
width: 100%;
1213-
background: var(--color-main-background);
1214-
position: relative;
1215-
z-index: 100;
1216-
}
1217-
1218-
/* overlay message detail on top of message list */
1219-
.app-content-detail {
1220-
background: var(--color-main-background);
1221-
width: 100%;
1222-
left: 0;
1223-
height: 100%;
1224-
top: 0;
1225-
box-shadow: 0 0 100px rgba(100, 100, 100, .9);
1226-
position: absolute;
1227-
}
1228-
1229-
/* Show app details page */
1230-
#app-content.showdetails {
1231-
#app-navigation-toggle {
1232-
transform: translateX(-44px);
1233-
}
1234-
#app-navigation-toggle-back {
1235-
position: fixed;
1236-
display: inline-block !important;
1237-
top: 45px;
1238-
left: 0;
1239-
width: 44px;
1240-
height: 44px;
1241-
z-index: 149;
1242-
background-color: rgba(255, 255, 255, .7);
1243-
cursor: pointer;
1244-
opacity: .6;
1245-
transform: rotate(90deg);
1246-
}
1247-
.app-content-list {
1248-
transform: translateX(-100%);
1249-
}
1250-
}
1251-
1252-
/* end of media query */
1253-
}

0 commit comments

Comments
 (0)