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

Merge pull request #947 from BookStackApp/bookshelves

Browse Source 
Bookshelves
This commit is contained in:
Dan Brown
2018-09-21 15:29:52 +01:00
committed by GitHub
parent 32e34f10ff c8d893fac7
commit 131fcae4c7
61 changed files with 2100 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,8 +192,26 @@ div[class^="col-"] img {
flex-direction: column;
border: 1px solid #ddd;
min-width: 100px;
h2 {
width: 100%;
font-size: 1.5em;
margin: 0 0 10px;
}
h2 a {
display: block;
width: 100%;
line-height: 1.2;
text-decoration: none;
}
p {
font-size: .85em;
margin: 0;
line-height: 1.6em;
}
.grid-card-content {
flex: 1;
border-top: 0;
border-bottom-width: 2px;
}
.grid-card-content, .grid-card-footer {
padding: $-l;
@ -203,6 +221,23 @@ div[class^="col-"] img {
}
}
.book-grid-item .grid-card-content h2 a {
color: $color-book;
fill: $color-book;
}
.bookshelf-grid-item .grid-card-content h2 a {
color: $color-bookshelf;
fill: $color-bookshelf;
}
.book-grid-item .grid-card-footer {
p.small {
font-size: .8em;
margin: 0;
}
}
@include smaller-than($m) {
.grid.third {
grid-template-columns: 1fr 1fr;

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

@ -412,32 +412,3 @@ ul.pagination {
}
}
.book-grid-item .grid-card-content {
border-top: 0;
border-bottom-width: 2px;
h2 {
width: 100%;
font-size: 1.5em;
margin: 0 0 10px;
}
h2 a {
display: block;
width: 100%;
line-height: 1.2;
color: #009688;;
fill: #009688;;
text-decoration: none;
}
p {
font-size: .85em;
margin: 0;
line-height: 1.6em;
}
}
.book-grid-item .grid-card-footer {
p.small {
font-size: .8em;
margin: 0;
}
}

8
resources/assets/sass/_text.scss
View File

@ -281,6 +281,14 @@ p.secondary, p .secondary, span.secondary, .text-secondary {
}
}
.text-bookshelf {
color: $color-bookshelf;
fill: $color-bookshelf;
&:hover {
color: $color-bookshelf;
fill: $color-bookshelf;
}
}
.text-book {
color: $color-book;
fill: $color-book;

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

@ -47,6 +47,7 @@ $warning: $secondary;
$primary-faded: rgba(21, 101, 192, 0.15);
// Item Colors
$color-bookshelf: #af5a5a;
$color-book: #009688;
$color-chapter: #ef7c3c;
$color-page: $primary;

20
resources/assets/sass/styles.scss
View File

@ -206,6 +206,12 @@ $btt-size: 40px;
transition: all ease-in-out 120ms;
cursor: pointer;
}
&.compact {
font-size: 10px;
.entity-item-snippet {
display: none;
}
}
}
.entity-list-item.selected {
@ -214,6 +220,20 @@ $btt-size: 40px;
}
}
.scroll-box {
max-height: 250px;
overflow-y: scroll;
border: 1px solid #DDD;
border-radius: 3px;
.scroll-box-item {
padding: $-xs $-m;
border-bottom: 1px solid #DDD;
&:last-child {
border-bottom: 0;
}
}
}
.center-box {
margin: $-xxl auto 0 auto;
width: 420px;