diff options
author | OzoneGrif | 2020-01-31 02:26:12 +0100 |
---|---|---|
committer | GitHub | 2020-01-31 02:26:12 +0100 |
commit | d94b987463169b254ab69a79ddb58e5beccb0941 (patch) | |
tree | 51f66cdada6a8e920ba80a3aae76393e0127d825 /viewer/src/assets/scss | |
parent | 15c806adec22239096a910b92b49fcfb964815bd (diff) | |
parent | 2157b66f3ea43137391939992cac4dc901a4ac4e (diff) | |
download | ldgallery-d94b987463169b254ab69a79ddb58e5beccb0941.tar.gz |
Merge pull request #65 from pacien/oz-viewer
viewer improvements
Diffstat (limited to 'viewer/src/assets/scss')
-rw-r--r-- | viewer/src/assets/scss/buefy.scss | 3 | ||||
-rw-r--r-- | viewer/src/assets/scss/global.scss | 26 | ||||
-rw-r--r-- | viewer/src/assets/scss/theme.scss | 11 |
3 files changed, 32 insertions, 8 deletions
diff --git a/viewer/src/assets/scss/buefy.scss b/viewer/src/assets/scss/buefy.scss index 7fdb883..735ce6a 100644 --- a/viewer/src/assets/scss/buefy.scss +++ b/viewer/src/assets/scss/buefy.scss | |||
@@ -24,8 +24,7 @@ | |||
24 | @import "buefy_variables"; | 24 | @import "buefy_variables"; |
25 | 25 | ||
26 | // 2. Setup your Custom Colors | 26 | // 2. Setup your Custom Colors |
27 | // $linkedin: #0077b5; | 27 | @import "@/assets/scss/theme.scss"; |
28 | // $linkedin-invert: findColorInvert($linkedin); | ||
29 | 28 | ||
30 | @import "~bulma/sass/utilities/derived-variables"; | 29 | @import "~bulma/sass/utilities/derived-variables"; |
31 | 30 | ||
diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss index 1903c9e..b418911 100644 --- a/viewer/src/assets/scss/global.scss +++ b/viewer/src/assets/scss/global.scss | |||
@@ -32,6 +32,9 @@ | |||
32 | .nowrap { | 32 | .nowrap { |
33 | white-space: nowrap; | 33 | white-space: nowrap; |
34 | } | 34 | } |
35 | .no-scroll-x { | ||
36 | overflow-x: hidden; | ||
37 | } | ||
35 | 38 | ||
36 | .flex { | 39 | .flex { |
37 | display: flex; | 40 | display: flex; |
@@ -44,19 +47,35 @@ | |||
44 | align-items: center; | 47 | align-items: center; |
45 | } | 48 | } |
46 | 49 | ||
50 | // === Links | ||
51 | |||
52 | .link { | ||
53 | color: $link; | ||
54 | cursor: pointer; | ||
55 | text-decoration: none; | ||
56 | &:hover { | ||
57 | color: $link-hover; | ||
58 | } | ||
59 | } | ||
60 | |||
61 | .disabled { | ||
62 | color: $disabled-color !important; | ||
63 | } | ||
64 | |||
47 | // === Scrollbar styling | 65 | // === Scrollbar styling |
48 | 66 | ||
49 | .scrollbar { | 67 | .scrollbar { |
50 | overflow: auto; | 68 | overflow: auto; |
51 | } | 69 | } |
52 | .scrollbar::-webkit-scrollbar { | 70 | .scrollbar::-webkit-scrollbar { |
53 | width: 12px; | 71 | width: 10px; |
72 | height: 10px; | ||
54 | } | 73 | } |
55 | .scrollbar::-webkit-scrollbar-corner { | 74 | .scrollbar::-webkit-scrollbar-corner { |
56 | background-color: transparent; | 75 | background-color: transparent; |
57 | } | 76 | } |
58 | .scrollbar::-webkit-scrollbar-thumb { | 77 | .scrollbar::-webkit-scrollbar-thumb { |
59 | box-shadow: inset 0 0 6px black; | 78 | box-shadow: inset 0 0 1px black; |
60 | background-color: $toolbar-color; | 79 | background-color: $toolbar-color; |
61 | } | 80 | } |
62 | 81 | ||
@@ -71,6 +90,9 @@ | |||
71 | margin: 1px; | 90 | margin: 1px; |
72 | } | 91 | } |
73 | } | 92 | } |
93 | img { | ||
94 | image-orientation: from-image; | ||
95 | } | ||
74 | 96 | ||
75 | // === Effect to apply on lazy-image loading | 97 | // === Effect to apply on lazy-image loading |
76 | 98 | ||
diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss index efd5d79..d3aac99 100644 --- a/viewer/src/assets/scss/theme.scss +++ b/viewer/src/assets/scss/theme.scss | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | // === Theme | 20 | // === Theme |
21 | 21 | ||
22 | $layout-top: 70px; | 22 | $layout-top: 35px; |
23 | $layout-left: 250px; | 23 | $layout-left: 250px; |
24 | 24 | ||
25 | $panel-top-bgcolor: #225; | 25 | $panel-top-bgcolor: #225; |
@@ -27,7 +27,10 @@ $panel-top-txtcolor: white; | |||
27 | $panel-left-bgcolor: $panel-top-bgcolor; | 27 | $panel-left-bgcolor: $panel-top-bgcolor; |
28 | $panel-left-txtcolor: $panel-top-txtcolor; | 28 | $panel-left-txtcolor: $panel-top-txtcolor; |
29 | $content-bgcolor: #1e1e1e; | 29 | $content-bgcolor: #1e1e1e; |
30 | |||
31 | $toolbar-color: #d62929; | 30 | $toolbar-color: #d62929; |
32 | 31 | $loader-color: #272727; | |
33 | $loader-color: #119; | 32 | $link: $panel-top-txtcolor; |
33 | $link-hover: lightblue; | ||
34 | $disabled-color: rgba($link, 0.3); | ||
35 | $control-radius: 0; | ||
36 | $input-radius: 0; | ||