aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-12-10 13:33:06 +0100
committerGitHub <noreply@github.com>2017-12-10 13:33:06 +0100
commit55bd59962c41b4ee34fde2569ddf093e5ad71fd8 (patch)
tree1f07466586f2bc58179c929629f697c8082f8097 /app/Resources
parente99be2c134d836a26faa1defb3b1b473834df58b (diff)
parentf072829ce38e6daac46c84cce58af5f67087a30f (diff)
downloadwallabag-55bd59962c41b4ee34fde2569ddf093e5ad71fd8.tar.gz
wallabag-55bd59962c41b4ee34fde2569ddf093e5ad71fd8.tar.zst
wallabag-55bd59962c41b4ee34fde2569ddf093e5ad71fd8.zip
Merge pull request #3467 from Simounet/feat/nav-improved
Feat/nav improved
Diffstat (limited to 'app/Resources')
-rw-r--r--app/Resources/static/themes/material/css/media_queries.scss2
-rw-r--r--app/Resources/static/themes/material/css/nav.scss41
2 files changed, 32 insertions, 11 deletions
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 48f3aefc..69e3d47d 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -27,7 +27,7 @@
27 } 27 }
28 28
29 .nav-panel-buttom { 29 .nav-panel-buttom {
30 justify-content: space-around; 30 justify-content: space-between;
31 } 31 }
32 32
33 #article { 33 #article {
diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss
index 7898f662..99a048b0 100644
--- a/app/Resources/static/themes/material/css/nav.scss
+++ b/app/Resources/static/themes/material/css/nav.scss
@@ -2,10 +2,13 @@
2/* ========================================================================== 2/* ==========================================================================
3 Nav 3 Nav
4 ========================================================================== */ 4 ========================================================================== */
5 5nav,
6nav { 6.nav-wrapper {
7 height: auto; 7 height: auto;
8 line-height: initial;
9}
8 10
11nav {
9 input { 12 input {
10 color: #aaa; 13 color: #aaa;
11 } 14 }
@@ -17,15 +20,27 @@ nav {
17 20
18.nav-wrapper { 21.nav-wrapper {
19 display: flex; 22 display: flex;
23 padding: 0.6rem 0.4rem 0.6rem 0.75rem;
20 flex-wrap: wrap; 24 flex-wrap: wrap;
21 justify-content: space-between; 25 justify-content: space-between;
22 min-height: 64px; 26 align-items: center;
23 27
24 .button-collapse { 28 .button-collapse {
25 padding: 0 15px; 29 margin-left: 0;
30 margin-right: 0.5rem;
31 padding: 0 0.5rem;
32 height: auto;
33 line-height: 1;
34 background-color: transparent;
35 border: none;
26 } 36 }
27} 37}
28 38
39nav .nav-wrapper i {
40 height: 46px;
41 line-height: 46px;
42}
43
29.nav-input { 44.nav-input {
30 display: none; 45 display: none;
31} 46}
@@ -34,10 +49,6 @@ nav {
34 display: flex; 49 display: flex;
35 flex-grow: 1; 50 flex-grow: 1;
36 justify-content: flex-end; 51 justify-content: flex-end;
37
38 li {
39 max-height: 64px;
40 }
41} 52}
42 53
43.nav-panel-add .add, 54.nav-panel-add .add,
@@ -50,9 +61,8 @@ nav {
50 transition: background 0.2s ease; 61 transition: background 0.2s ease;
51 62
52 .action { 63 .action {
53 padding-left: 0.75rem; 64 margin: 0;
54 font-size: 2.1rem; 65 font-size: 2.1rem;
55 white-space: nowrap;
56 } 66 }
57 67
58 .input-field input { 68 .input-field input {
@@ -71,6 +81,11 @@ nav {
71 } 81 }
72} 82}
73 83
84.nav-panel-top {
85 display: flex;
86 align-items: center;
87}
88
74.input-field { 89.input-field {
75 &.nav-panel-add label, 90 &.nav-panel-add label,
76 &.nav-panel-search label { 91 &.nav-panel-search label {
@@ -109,3 +124,9 @@ nav {
109#button_export { 124#button_export {
110 display: none; 125 display: none;
111} 126}
127
128@media (min-width: 993px) {
129 .button-collapse {
130 display: none;
131 }
132}