1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00

Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Jeremy Benoist 2016-08-28 16:15:27 +02:00
commit cdd3010b47
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
13 changed files with 192 additions and 6 deletions

View file

@ -91,6 +91,7 @@ body {
body.login main {
padding: 0;
min-height: 100vh;
}
.border-bottom {
@ -256,6 +257,10 @@ nav input {
display: none;
}
input-field.nav-panel-add, .input-field.nav-panel-add form {
height: 100%;
}
/* ==========================================================================
2 = Side-nav
========================================================================== */
@ -342,6 +347,12 @@ main ul.row {
.card .card-content .card-title {
line-height: 32px;
max-height: 64px;
display: block;
}
.card .card-content i.right, .card .card-reveal i.right {
margin-left: 0;
}
.card .card-entry-labels {