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

[github/wallabag/wallabag.git] / app / Resources / static / themes / material / css / main.css

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index f5687318aec697b7c2f49273749f135976f71840..df126fb47d698caea95f11a2a7d0691b76686951 100755 (executable)
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -150,6 +150,11 @@
   background-image: url("../../_global/img/icons/diaspora-icon--black.png");
 }
 
+/* Unmark.it */
+.icon-image--unmark {
+  background-image: url("../../_global/img/icons/unmark-icon--black.png");
+}
+
 /* Shaarli */
 .icon-image--shaarli {
   background-image: url("../../_global/img/icons/shaarli.png");
@@ -233,8 +238,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 {
@@ -430,7 +444,7 @@ main ul.row {
 .card .card-content .card-title,
 .card .card-reveal .card-title {
   line-height: 22.8px;
-  max-height: 64px;
+  max-height: 80px;
   font-size: 19px;
   font-family: roberto, "Helvetica Neue", Helvetica, Arial, sans-serif;
   color: #313131;
@@ -452,6 +466,13 @@ main ul.row {
   font-size: 15px;
 }
 
+a.original {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  display: block;
+}
+
 .card .card-entry-labels {
   position: absolute;
   top: 10px;
@@ -491,6 +512,10 @@ main ul.row {
   white-space: nowrap;
 }
 
+.card .card-entry-labels-hidden li:first-child {
+  margin-left: 0;
+}
+
 .card-entry-tags a,
 .card-entry-labels a,
 .card-tag-labels a,
@@ -548,7 +573,12 @@ main ul.row {
   height: 10em;
 }
 
-.card .card-image .preview {
+.card .card-fullimage {
+  height: 13.5em;
+}
+
+.card .card-image .preview,
+.card .card-fullimage .preview {
   height: 14em;
   background-size: cover;
   background-repeat: no-repeat;
@@ -619,10 +649,9 @@ main ul.row {
   margin: 0 auto;
 }
 
-#article aside .tools li {
+article aside .tools li {
   display: inline-flex;
   vertical-align: middle;
-  margin: auto 10px;
 }
 
 #article aside .tools a {
@@ -668,7 +697,6 @@ main ul.row {
   }
 
   #article {
-    padding: 15px;
     max-width: 35em;
     margin-left: auto;
     margin-right: auto;
@@ -712,7 +740,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;