diff options
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/button.scss | 12 | ||||
-rw-r--r-- | src/styles/content-tabs.scss | 12 | ||||
-rw-r--r-- | src/styles/image-upload.scss | 91 | ||||
-rw-r--r-- | src/styles/input.scss | 4 | ||||
-rw-r--r-- | src/styles/main.scss | 1 | ||||
-rw-r--r-- | src/styles/searchInput.scss | 16 | ||||
-rw-r--r-- | src/styles/services.scss | 1 | ||||
-rw-r--r-- | src/styles/settings.scss | 70 | ||||
-rw-r--r-- | src/styles/welcome.scss | 7 |
9 files changed, 171 insertions, 43 deletions
diff --git a/src/styles/button.scss b/src/styles/button.scss index 75d2cb1d4..8d2adbbcc 100644 --- a/src/styles/button.scss +++ b/src/styles/button.scss | |||
@@ -48,6 +48,18 @@ | |||
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
51 | &.franz-form__button--warning { | ||
52 | background: $theme-brand-warning; | ||
53 | |||
54 | &:hover { | ||
55 | background: darken($theme-brand-warning, 5%); | ||
56 | } | ||
57 | |||
58 | &:active { | ||
59 | background: lighten($theme-brand-warning, 5%); | ||
60 | } | ||
61 | } | ||
62 | |||
51 | &.franz-form__button--inverted { | 63 | &.franz-form__button--inverted { |
52 | background: none; | 64 | background: none; |
53 | padding: 10px 20px; | 65 | padding: 10px 20px; |
diff --git a/src/styles/content-tabs.scss b/src/styles/content-tabs.scss index aa3c8594b..47dfea2c4 100644 --- a/src/styles/content-tabs.scss +++ b/src/styles/content-tabs.scss | |||
@@ -12,15 +12,17 @@ | |||
12 | flex: 1; | 12 | flex: 1; |
13 | // border: 1px solid $theme-gray-lightest; | 13 | // border: 1px solid $theme-gray-lightest; |
14 | color: $theme-gray-dark; | 14 | color: $theme-gray-dark; |
15 | background: $theme-gray-lightest; | 15 | background: linear-gradient($theme-gray-lightest 80%, darken($theme-gray-lightest, 3%)); |
16 | border-bottom: 1px solid $theme-gray-lighter; | 16 | border-right: 1px solid $theme-gray-lighter; |
17 | box-shadow: inset 0px -3px 10px rgba(black, 0.05); | 17 | transition: background $theme-transition-time; |
18 | transition: all $theme-transition-time; | 18 | |
19 | &:last-of-type { | ||
20 | border-right: 0; | ||
21 | } | ||
19 | 22 | ||
20 | &.is-active { | 23 | &.is-active { |
21 | background: $theme-brand-primary; | 24 | background: $theme-brand-primary; |
22 | color: #FFF; | 25 | color: #FFF; |
23 | border-bottom: 1px solid $theme-brand-primary; | ||
24 | box-shadow: none; | 26 | box-shadow: none; |
25 | } | 27 | } |
26 | } | 28 | } |
diff --git a/src/styles/image-upload.scss b/src/styles/image-upload.scss new file mode 100644 index 000000000..06176a7af --- /dev/null +++ b/src/styles/image-upload.scss | |||
@@ -0,0 +1,91 @@ | |||
1 | .image-upload { | ||
2 | position: absolute; | ||
3 | width: 140px; | ||
4 | height: 140px; | ||
5 | border: 1px solid $theme-gray-lighter; | ||
6 | border-radius: $theme-border-radius-small; | ||
7 | background: $theme-gray-lightest; | ||
8 | overflow: hidden; | ||
9 | margin-top: 5px; | ||
10 | |||
11 | &__preview, | ||
12 | &__action { | ||
13 | position: absolute; | ||
14 | top: 0; | ||
15 | left: 0; | ||
16 | right: 0; | ||
17 | } | ||
18 | |||
19 | &__preview { | ||
20 | z-index: 1; | ||
21 | background-size: cover; | ||
22 | background-size: 100%; | ||
23 | background-repeat: no-repeat; | ||
24 | background-position: center center; | ||
25 | border-radius: 3px; | ||
26 | } | ||
27 | |||
28 | &__action { | ||
29 | position: relative; | ||
30 | z-index: 10; | ||
31 | opacity: 0; | ||
32 | transition: opacity 0.5s; | ||
33 | display: flex; | ||
34 | justify-content: center; | ||
35 | |||
36 | &-background { | ||
37 | position: absolute; | ||
38 | top: 0; | ||
39 | left: 0; | ||
40 | right: 0; | ||
41 | bottom: 0; | ||
42 | background: rgba($theme-gray, 0.7); | ||
43 | z-index: 10; | ||
44 | } | ||
45 | |||
46 | button { | ||
47 | position: relative; | ||
48 | z-index: 100; | ||
49 | color: #FFF; | ||
50 | |||
51 | .mdi { | ||
52 | color: #FFF; | ||
53 | } | ||
54 | } | ||
55 | } | ||
56 | |||
57 | &__dropzone { | ||
58 | text-align: center; | ||
59 | border-radius: 5px; | ||
60 | padding: 10px; | ||
61 | display: flex; | ||
62 | align-items: center; | ||
63 | justify-content: center; | ||
64 | flex-direction: column; | ||
65 | } | ||
66 | |||
67 | &__dropzone, | ||
68 | button { | ||
69 | .mdi { | ||
70 | margin-bottom: 5px; | ||
71 | } | ||
72 | |||
73 | p { | ||
74 | font-size: 10px; | ||
75 | line-height: 10px; | ||
76 | } | ||
77 | } | ||
78 | |||
79 | &:hover { | ||
80 | .image-upload__action { | ||
81 | opacity: 1; | ||
82 | } | ||
83 | } | ||
84 | } | ||
85 | |||
86 | .image-upload-wrapper { | ||
87 | .mdi { | ||
88 | font-size: 40px; | ||
89 | color: $theme-gray-light; | ||
90 | } | ||
91 | } \ No newline at end of file | ||
diff --git a/src/styles/input.scss b/src/styles/input.scss index 814dce5f8..7042f56e8 100644 --- a/src/styles/input.scss +++ b/src/styles/input.scss | |||
@@ -47,6 +47,10 @@ | |||
47 | padding: 8px; | 47 | padding: 8px; |
48 | // font-size: 18px; | 48 | // font-size: 18px; |
49 | color: $theme-gray; | 49 | color: $theme-gray; |
50 | |||
51 | &::placeholder { | ||
52 | color: lighten($theme-gray-light, 10%); | ||
53 | } | ||
50 | } | 54 | } |
51 | 55 | ||
52 | .franz-form__input-prefix, | 56 | .franz-form__input-prefix, |
diff --git a/src/styles/main.scss b/src/styles/main.scss index 0a082729c..261396f6f 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss | |||
@@ -35,3 +35,4 @@ $mdi-font-path: '../node_modules/mdi/fonts'; | |||
35 | @import './button.scss'; | 35 | @import './button.scss'; |
36 | @import './searchInput.scss'; | 36 | @import './searchInput.scss'; |
37 | @import './select.scss'; | 37 | @import './select.scss'; |
38 | @import './image-upload.scss'; | ||
diff --git a/src/styles/searchInput.scss b/src/styles/searchInput.scss index 28ff09fc4..633a31e09 100644 --- a/src/styles/searchInput.scss +++ b/src/styles/searchInput.scss | |||
@@ -1,4 +1,20 @@ | |||
1 | .search-input { | 1 | .search-input { |
2 | width: 100%; | 2 | width: 100%; |
3 | height: auto; | 3 | height: auto; |
4 | display: flex; | ||
5 | align-items: center; | ||
6 | padding: 0 10px; | ||
7 | border-radius: 30px; | ||
8 | background: $theme-gray-lightest; | ||
9 | padding: 5px 10px; | ||
10 | @extend %headline; | ||
11 | color: $theme-gray-light; | ||
12 | |||
13 | input { | ||
14 | padding-left: 10px; | ||
15 | background: none; | ||
16 | border: 0; | ||
17 | flex: 1; | ||
18 | color: $theme-gray-light; | ||
19 | } | ||
4 | } | 20 | } |
diff --git a/src/styles/services.scss b/src/styles/services.scss index 282c15121..9f6cfc772 100644 --- a/src/styles/services.scss +++ b/src/styles/services.scss | |||
@@ -24,6 +24,7 @@ | |||
24 | display: inline-flex; | 24 | display: inline-flex; |
25 | width: 0px; | 25 | width: 0px; |
26 | height: 0px; | 26 | height: 0px; |
27 | background: $theme-gray-lighter; | ||
27 | } | 28 | } |
28 | 29 | ||
29 | &.is-active { | 30 | &.is-active { |
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index 73cef0813..2182c9b5f 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -111,6 +111,26 @@ | |||
111 | &::-webkit-scrollbar-thumb:window-inactive { | 111 | &::-webkit-scrollbar-thumb:window-inactive { |
112 | background: none; | 112 | background: none; |
113 | } | 113 | } |
114 | |||
115 | .service-flex-grid { | ||
116 | display: flex; | ||
117 | } | ||
118 | |||
119 | .service-name { | ||
120 | flex: 1px; | ||
121 | } | ||
122 | |||
123 | .service-icon { | ||
124 | width: 140px; | ||
125 | float: right; | ||
126 | margin-top: 30px; | ||
127 | margin-left: 40px; | ||
128 | |||
129 | label { | ||
130 | font-weight: bold; | ||
131 | letter-spacing: -0.1px; | ||
132 | } | ||
133 | } | ||
114 | } | 134 | } |
115 | 135 | ||
116 | .settings__close { | 136 | .settings__close { |
@@ -129,30 +149,28 @@ | |||
129 | } | 149 | } |
130 | } | 150 | } |
131 | 151 | ||
132 | .settings__search-header { | 152 | .search-input { |
133 | display: flex; | 153 | margin-bottom: 30px; |
134 | align-items: center; | 154 | } |
135 | padding: 0 10px; | ||
136 | border-radius: $theme-border-radius; | ||
137 | transition: background $theme-transition-time; | ||
138 | @extend %headline; | ||
139 | font-size: 22px; | ||
140 | |||
141 | &:hover { | ||
142 | background: darken($theme-gray-lighter, 5%); | ||
143 | } | ||
144 | 155 | ||
145 | input { | 156 | &__options { |
146 | padding-left: 10px; | 157 | margin-top: 20px; |
147 | background: none; | 158 | flex: 1; |
148 | border: 0; | ||
149 | flex: 1; | ||
150 | @extend %headline; | ||
151 | } | ||
152 | } | 159 | } |
153 | 160 | ||
154 | .settings__options { | 161 | &__settings-group { |
155 | margin-top: 30px; | 162 | margin-top: 10px; |
163 | |||
164 | h3 { | ||
165 | font-weight: bold; | ||
166 | margin: 25px 0 15px; | ||
167 | color: $theme-gray-light; | ||
168 | letter-spacing: -0.1px; | ||
169 | |||
170 | &:first-of-type { | ||
171 | margin-top: 0; | ||
172 | } | ||
173 | } | ||
156 | } | 174 | } |
157 | 175 | ||
158 | .settings__message { | 176 | .settings__message { |
@@ -173,10 +191,6 @@ | |||
173 | margin: -10px 0 20px 55px;; | 191 | margin: -10px 0 20px 55px;; |
174 | font-size: 12px; | 192 | font-size: 12px; |
175 | color: $theme-gray-light; | 193 | color: $theme-gray-light; |
176 | |||
177 | &:last-of-type { | ||
178 | margin-bottom: 30px; | ||
179 | } | ||
180 | } | 194 | } |
181 | 195 | ||
182 | .settings__controls { | 196 | .settings__controls { |
@@ -312,12 +326,6 @@ | |||
312 | } | 326 | } |
313 | } | 327 | } |
314 | 328 | ||
315 | // @include element(add-service-teaser) { | ||
316 | // height: auto; | ||
317 | // margin-top: 20px; | ||
318 | // display: block; | ||
319 | // text-align: center; | ||
320 | // } | ||
321 | .emoji { | 329 | .emoji { |
322 | display: block; | 330 | display: block; |
323 | font-size: 40px; | 331 | font-size: 40px; |
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss index cfdcc80ad..46299b966 100644 --- a/src/styles/welcome.scss +++ b/src/styles/welcome.scss | |||
@@ -73,15 +73,8 @@ | |||
73 | width: 35px; | 73 | width: 35px; |
74 | height: 35px; | 74 | height: 35px; |
75 | margin: 0 10px 15px; | 75 | margin: 0 10px 15px; |
76 | filter: grayscale(1) | ||
77 | opacity(0.5); | ||
78 | transition: 0.5s filter, 0.5s opacity; | 76 | transition: 0.5s filter, 0.5s opacity; |
79 | 77 | ||
80 | &:hover { | ||
81 | filter: grayscale(0); | ||
82 | opacity: (1); | ||
83 | } | ||
84 | |||
85 | img { | 78 | img { |
86 | width: 35px; | 79 | width: 35px; |
87 | } | 80 | } |