webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Rolled tri-layout to page edit and book-create

Browse Source
This commit is contained in:
Dan Brown
2018-12-09 16:51:31 +00:00
parent ff0b9004bc
commit 7f95b51b00
16 changed files with 138 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/assets/sass/_forms.scss
View File

@ -206,11 +206,9 @@ input:checked + .toggle-switch {
}
.form-group[collapsible] {
margin-left: -$-m;
margin-right: -$-m;
padding: 0 $-m;
border-top: 1px solid #DDD;
border-bottom: 1px solid #DDD;
border: 1px solid #DDD;
border-radius: 4px;
.collapse-title {
margin-left: -$-m;
margin-right: -$-m;
@ -238,9 +236,6 @@ input:checked + .toggle-switch {
&.open .collapse-title label:before {
transform: rotate(90deg);
}
&+.form-group[collapsible] {
margin-top: -($-s + 1);
}
}
.inline-input-style {

21
resources/assets/sass/_grid.scss
View File

@ -50,6 +50,13 @@ body.flexbox {
flex: 1;
}
.content-wrap.card {
padding: $-l $-xxl;
margin-left: auto;
margin-right: auto;
margin-bottom: $-xl;
overflow: auto;
}
.tri-layout-container {
display: grid;
@ -68,17 +75,6 @@ body.flexbox {
.tri-layout-middle {
grid-area: b;
}
.content-wrap.card {
padding: $-l $-xxl;
margin-left: auto;
margin-right: auto;
margin-bottom: $-xl;
overflow: auto;
&.thin {
width: 940px;
max-width: 100%;
}
}
}
@include smaller-than($xxl) {
.tri-layout-container {
@ -97,6 +93,7 @@ body.flexbox {
position: sticky;
top: $-m;
max-height: 100vh;
min-height: 50vh;
overflow-y: scroll;
overflow-x: visible;
scrollbar-width: none;
@ -150,7 +147,7 @@ body.flexbox {
}
.tri-layout-left, .tri-layout-right {
opacity: 0.8;
opacity: 0.7;
transition: opacity ease-in-out 120ms;
&:hover {
opacity: 1;

3
resources/assets/sass/_lists.scss
View File

@ -271,6 +271,9 @@ ul.pagination {
color: $color-page-draft;
fill: $color-page-draft;
}
> .dropdown-container {
display: block;
}
}
.entity-list-item, .icon-list-item {

19
resources/assets/sass/_pages.scss
View File

@ -38,11 +38,7 @@
width: 100%;
max-width: 840px;
margin: 0 auto;
margin-top: $-xxl;
overflow-wrap: break-word;
&.flex {
margin-top: $-xl;
}
.align-left {
text-align: left;
}
@ -342,15 +338,10 @@
}
}
.comments-container {
width: 100%;
margin-top: $-xl;
margin-bottom: $-m;
h5 {
color: #888;
font-weight: normal;
margin-top: 0.5em;
}
.comments-container h5 {
color: #888;
font-weight: normal;
margin-top: 0.5em;
}
.comment-editor .CodeMirror, .comment-editor .CodeMirror-scroll {
@ -401,6 +392,8 @@
position: relative;
overflow: hidden;
padding: $-xs $-m;
color: #666;
fill: currentColor;
&:after {
content: '';
position: absolute;

2
resources/assets/sass/_variables.scss
View File

@ -26,7 +26,7 @@ $-s: 12px;
$-xs: 6px;
$-xxs: 3px;
$spacing: (('xxs', $-xxs), ('xs', $-xs), ('s', $-s), ('m', $-m), ('l', $-l), ('xl', $-xl), ('xxl', $-xxl));
$spacing: (('none', 0), ('xxs', $-xxs), ('xs', $-xs), ('s', $-s), ('m', $-m), ('l', $-l), ('xl', $-xl), ('xxl', $-xxl));
// Fonts
$text: -apple-system, BlinkMacSystemFont,