X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2FResources%2Fstatic%2Fthemes%2Fmaterial%2Fcss%2Fmain.css;h=ee4ad4e0f1124dc3ac55cbf684bbb1571dda195d;hb=a3477df5c93bc3d27baac08410a716fa6e92309f;hp=d91b469ffaa00d84e070e06962d4a9e93232c700;hpb=e08477803079d0097885e026797256da7fd30f6c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index d91b469f..ee4ad4e0 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -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;
@@ -124,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");
@@ -133,7 +164,7 @@ body {
   display: flex;
   min-height: 100vh;
   flex-direction: column;
-  background: #f0f0f0;
+  background: #fafafa;
 }
 
 body.login main {
@@ -163,7 +194,6 @@ main,
 
 .results {
   height: 1em;
-  line-height: 30px;
 }
 
 .results .nb-results,
@@ -172,6 +202,14 @@ main,
   margin-bottom: 0;
 }
 
+.results .nb-results {
+  display: inline-flex;
+}
+
+.results a {
+  color: #444;
+}
+
 .pagination {
   float: right;
 }
@@ -207,8 +245,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 {
@@ -236,6 +283,17 @@ nav input {
   color: #aaa;
 }
 
+nav {
+  height: auto;
+}
+
+.nav-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  min-height: 64px;
+}
+
 .nav-wrapper .button-collapse {
   padding: 0 15px;
 }
@@ -244,8 +302,10 @@ nav input {
   display: none;
 }
 
-.nav-panels {
-  overflow: hidden;
+.nav-panel-buttom {
+  display: flex;
+  flex-grow: 1;
+  justify-content: flex-end;
 }
 
 .nav-panel-buttom li {
@@ -282,11 +342,13 @@ nav input {
   color: #444;
 }
 
-.input-field.nav-panel-add label {
+.input-field.nav-panel-add label,
+.input-field.nav-panel-search label {
   left: 1rem;
 }
 
-.input-field.nav-panel-add .close {
+.input-field.nav-panel-add .close,
+.input-field.nav-panel-search .close {
   position: absolute;
   top: 0;
   right: 1rem;
@@ -305,8 +367,11 @@ nav input {
 }
 
 .input-field.nav-panel-add,
-.input-field.nav-panel-add form {
-  height: 100%;
+.input-field.nav-panel-add form,
+.input-field.nav-panel-search,
+.input-field.nav-panel-search form {
+  display: flex;
+  flex: 1;
 }
 
 /* ==========================================================================
@@ -360,6 +425,10 @@ span.numberItems {
   float: right;
 }
 
+nav ul a:hover {
+  background-color: initial;
+}
+
 /* ==========================================================================
  * 3 = Filters slider
  * ========================================================================== */
@@ -372,7 +441,6 @@ span.numberItems {
 .side-nav.fixed.right-aligned {
   right: -250px;
   left: auto !important;
-  overflow-y: visible;
 }
 
 #filters div.with-checkbox {
@@ -393,13 +461,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,
@@ -407,6 +485,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;
@@ -429,7 +519,7 @@ main ul.row {
 }
 
 .card .card-entry-labels-hidden {
-  margin-top: 5px;
+  margin: 2.5px auto;
 }
 
 .card .card-entry-labels-hidden li {
@@ -446,6 +536,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,
@@ -460,8 +554,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 {
@@ -470,6 +564,18 @@ main ul.row {
   line-height: 24px;
 }
 
+.card .card-action ul.tools li a.tool {
+  margin-right: 5px !important;
+}
+
+.card-stacked:hover ul.tools-list {
+  display: block;
+}
+
+.card-stacked ul.tools-list {
+  display: none;
+}
+
 .card .card-action a {
   color: #fff;
   margin: 0;
@@ -479,6 +585,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;
@@ -495,10 +606,15 @@ main ul.row {
 }
 
 .card .card-image {
-  height: 14em;
+  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;
@@ -512,7 +628,55 @@ main ul.row {
 #article {
   font-size: 20px;
   margin: 0 auto;
-  max-width: 40em;
+  max-width: 45em;
+}
+
+#article article {
+  color: #424242;
+  font-size: 18px;
+  line-height: 1.7em;
+}
+
+#article article h1,
+#article article h2,
+#article article h3,
+#article article h4,
+#article article h5,
+#article article h6 {
+  color: #212121;
+}
+
+#article article h1 strong,
+#article article h2 strong,
+#article article h3 strong,
+#article article h4 strong,
+#article article h5 strong,
+#article article h6 strong {
+  font-weight: 500;
+}
+
+#article article h6 {
+  font-size: 1.2rem;
+}
+
+#article article h5 {
+  font-size: 1.6rem;
+}
+
+#article article h4 {
+  font-size: 1.9rem;
+}
+
+#article article h3 {
+  font-size: 2.2rem;
+}
+
+#article article h2 {
+  font-size: 2.5rem;
+}
+
+#article article h1 {
+  font-size: 2.7rem;
 }
 
 #article img,
@@ -521,8 +685,49 @@ main ul.row {
   height: auto;
 }
 
+#article article a {
+  border-bottom: 1px dotted #03a9f4;
+  text-decoration: none;
+}
+
+#article article a:hover {
+  border-bottom-style: solid;
+}
+
+#article article ul {
+  padding-left: 30px;
+}
+
+#article article ul,
+#article article ul li {
+  list-style-type: disc;
+}
+
+#article article blockquote {
+  font-style: italic;
+}
+
+#article article strong {
+  font-weight: bold;
+}
+
+#article article pre {
+  box-sizing: border-box;
+  margin: 0 0 1.75em;
+  border: #e3f2fd 1px solid;
+  width: 100%;
+  padding: 10px;
+  font-family: monospace;
+  font-size: 0.8em;
+  white-space: pre;
+  overflow: auto;
+  background: #f5f5f5;
+  border-radius: 3px;
+}
+
 #article > header > h1 {
   font-size: 2em;
+  margin: 2.1rem 0 0.68rem;
 }
 
 .reader-mode {
@@ -561,9 +766,20 @@ 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;
+}
+
+#article aside .tools a {
+  color: #000;
   text-decoration: none;
 }
 
@@ -574,10 +790,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;
 }
@@ -603,6 +820,25 @@ main ul.row {
     width: auto;
   }
 
+  .nav-panels .action {
+    padding-right: 0.75rem;
+  }
+
+  .nav-panel-buttom {
+    justify-content: space-around;
+  }
+
+  #article {
+    max-width: 35em;
+    margin-left: auto;
+    margin-right: auto;
+    font-size: 18px;
+  }
+
+  #article > header > h1 {
+    font-size: 1.33em;
+  }
+
   .reader-mode {
     width: 240px !important;
   }
@@ -628,15 +864,24 @@ main ul.row {
   .pagination li.next {
     width: auto;
   }
+
+  .drag-target + .drag-target {
+    height: 50%;
+  }
+
+  .drag-target + .drag-target + .drag-target {
+    top: 50%;
+  }
 }
 
-@media only screen and (min-width: 400px) {
-  .nav-panel-buttom {
-    float: right;
+@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: 1180px) {
+@media only screen and (min-width: 993px) and (max-width: 1200px) {
   .row .col.l1 {
     width: 25%;
     margin-left: 0;
@@ -692,6 +937,14 @@ main ul.row {
   .nb-results {
     display: none;
   }
+
+  main ul.row {
+    padding: 0;
+  }
+
+  .row .col {
+    padding: 0;
+  }
 }
 
 /* ==========================================================================
@@ -760,3 +1013,7 @@ div.settings div.file-field div {
 .input-field label.active {
   font-size: 1rem;
 }
+
+nav .input-field input {
+  margin: 0;
+}