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

2 files changed, 29 insertions, 1 deletions

diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index 61e7b22a..44db2070 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -1192,6 +1192,14 @@ pre code {
   }
 }
 
+@media screen and (max-height: 770px) {
+  .menu.users,
+  .menu.internal,
+  .menu.developer {
+    display: none;
+  }
+}
+
 @media screen and (max-width: 500px) {
   .entry {
     width: 100%;
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index d91b469f..2cc2e8a0 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -360,6 +360,10 @@ span.numberItems {
   float: right;
 }
 
+nav ul a:hover {
+  background-color: initial;
+}
+
 /* ==========================================================================
  * 3 = Filters slider
  * ========================================================================== */
@@ -522,7 +526,7 @@ main ul.row {
 }
 
 #article > header > h1 {
-  font-size: 2em;
+  font-size: 1.6em;
 }
 
 .reader-mode {
@@ -603,6 +607,18 @@ main ul.row {
     width: auto;
   }
 
+  #article {
+    padding: 15px;
+    max-width: 35em;
+    margin-left: auto;
+    margin-right: auto;
+    font-size: 18px;
+  }
+
+  #article > header > h1 {
+    font-size: 1.33em;
+  }
+
   .reader-mode {
     width: 240px !important;
   }
@@ -760,3 +776,7 @@ div.settings div.file-field div {
 .input-field label.active {
   font-size: 1rem;
 }
+
+nav .input-field input {
+  margin: 0;
+}