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

[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 d3cd1244fc3887e1ec644728429d8ea065975da5..005cc30207e1205980237d8cce78a9eca7cf6dbd 100755 (executable)
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -174,7 +174,7 @@ div.pagination ul .next.disabled {
 
 footer.page-footer {
   margin-top: 10px;
-  padding-top: 10px;
+  padding-top: 0px;
 }
 
 footer .row {
@@ -257,7 +257,7 @@ nav input {
   display: none;
 }
 
-input-field.nav-panel-add, .input-field.nav-panel-add form {
+.input-field.nav-panel-add, .input-field.nav-panel-add form {
     height: 100%;
 }
 
@@ -308,6 +308,10 @@ input-field.nav-panel-add, .input-field.nav-panel-add form {
   margin: 0 1rem;
 }
 
+span.numberItems {
+  float: right;
+}
+
 /* ==========================================================================
  * 3 = Filters slider
  * ========================================================================== */
@@ -348,7 +352,6 @@ 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 {
@@ -408,12 +411,12 @@ main ul.row {
 }
 
 .card .card-action a {
-  color: #fff;
+  color: #fff !important;
   margin: 0;
 }
 
 .card .card-action a:hover {
-  color: #fff;
+  color: #fff !important;
 }
 
 .settings .div_tabs {
@@ -671,3 +674,7 @@ div.settings div.input-field ul {
 div.settings div.file-field div {
   margin-top: inherit;
 }
+
+.input-field label.active {
+    font-size: 1rem;
+}