1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00

Merge pull request #2460 from wallabag/ui-changes

UI Changes
This commit is contained in:
Nicolas Lœuillet 2016-11-04 08:49:52 +01:00 committed by GitHub
commit 2db9142bfc
13 changed files with 232 additions and 134 deletions

View file

@ -581,7 +581,6 @@ img.preview {
div.pagination ul {
text-align: right;
margin-bottom: 50px;
}
.nb-results {

View file

@ -17,12 +17,11 @@
0 = Common
========================================================================== */
@font-face {
font-family: icomoon;
src: url("../fonts/IcoMoon-Free.ttf");
font-weight: normal;
font-style: normal;
}
/**
*
* Material icons
*
*/
@font-face {
font-family: 'Material Icons';
@ -62,6 +61,33 @@
font-feature-settings: 'liga';
}
/* Rules for sizing the icon. */
.material-icons.md-18 { font-size: 18px; }
.material-icons.md-24 { font-size: 24px; }
.material-icons.md-36 { font-size: 36px; }
.material-icons.md-48 { font-size: 48px; }
/* Rules for using icons as black on a light background. */
.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
/* Rules for using icons as white on a dark background. */
.material-icons.md-light { color: rgba(255, 255, 255, 1); }
.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
/**
*
* Icomoon icons
*
*/
@font-face {
font-family: icomoon;
src: url("../fonts/IcoMoon-Free.ttf");
font-weight: normal;
font-style: normal;
}
[class^="icon-"]::before,
[class*=" icon-"]::before {
font-family: icomoon;
@ -207,8 +233,17 @@ div.pagination ul .next.disabled {
color: #fff;
}
.page-footer .footer-copyright {
min-width: 50px;
height: auto !important;
line-height: 1em !important;
}
.page-footer .footer-copyright p {
display: inline;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: block;
}
.hidden {
@ -397,13 +432,23 @@ main ul.row {
}
.data .card .card-body {
height: 22em;
height: 19em;
overflow: hidden;
}
.card .card-content .card-title {
line-height: 32px;
max-height: 64px;
.card .card-content .card-title,
.card .card-reveal .card-title {
line-height: 22.8px;
max-height: 80px;
font-size: 19px;
font-family: roberto, "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #313131;
}
.card .card-content .activator,
.card .card-reveal .activator {
cursor: pointer;
font-family: "Material Icons";
}
.card .card-content i.right,
@ -411,6 +456,18 @@ main ul.row {
margin-left: 0;
}
.card .card-content .original {
line-height: 24px;
font-size: 15px;
}
a.original {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
display: block;
}
.card .card-entry-labels {
position: absolute;
top: 10px;
@ -433,7 +490,7 @@ main ul.row {
}
.card .card-entry-labels-hidden {
margin-top: 5px;
margin: 2.5px auto;
}
.card .card-entry-labels-hidden li {
@ -464,8 +521,8 @@ main ul.row {
margin-bottom: 10px;
}
.card .card-action .original {
line-height: 24px;
.card .card-action {
padding: 10px 5px 10px 15px;
}
.card .card-action ul.links {
@ -483,6 +540,11 @@ main ul.row {
color: #fff;
}
.card .card-action .reading-time {
display: inline-flex;
vertical-align: middle;
}
.quickstart .card .card-action a,
.quickstart .card .card-action a:hover {
color: #fff !important;
@ -499,7 +561,7 @@ main ul.row {
}
.card .card-image {
height: 14em;
height: 10em;
}
.card .card-image .preview {
@ -526,7 +588,8 @@ main ul.row {
}
#article > header > h1 {
font-size: 1.6em;
font-size: 2em;
margin: 2.1rem 0 0.68rem;
}
.reader-mode {
@ -565,9 +628,21 @@ main ul.row {
z-index: 9999;
}
#article aside .link {
color: #000;
#article aside .tools {
font-size: 0.8em;
display: flex;
flex-flow: row wrap;
margin: 0 auto;
}
#article aside .tools li {
display: inline-flex;
vertical-align: middle;
margin: auto 10px;
}
#article aside .tools a {
color: #000;
text-decoration: none;
}
@ -578,10 +653,11 @@ main ul.row {
#article aside .chip {
background-color: rgba(0, 151, 167, 0.85);
color: #fff;
padding: 0 15px 0 10px;
margin: auto 2px;
}
#article aside .chip a,
#article aside .chip i {
color: #fff;
}
@ -608,7 +684,6 @@ main ul.row {
}
#article {
padding: 15px;
max-width: 35em;
margin-left: auto;
margin-right: auto;
@ -652,7 +727,14 @@ main ul.row {
}
}
@media only screen and (min-width: 993px) and (max-width: 1180px) {
@media only screen and (min-width: 1200px) and (max-width: 1650px) {
.row .col.l3 {
width: 33.33333%;
margin-left: 0;
}
}
@media only screen and (min-width: 993px) and (max-width: 1200px) {
.row .col.l1 {
width: 25%;
margin-left: 0;
@ -708,6 +790,14 @@ main ul.row {
.nb-results {
display: none;
}
main ul.row {
padding: 0;
}
.row .col {
padding: 0;
}
}
/* ==========================================================================