diff options
author | Chocobozzz <me@florianbigard.com> | 2019-01-17 11:16:08 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-01-17 11:16:08 +0100 |
commit | 17bb716bc49b30cc8f22e32f73b9b53ab9ae560d (patch) | |
tree | 0fa89809a3d9622a28c75e5bbc1520d9ba32c2ef | |
parent | 457bb213b273a9b206cc5654eb085cede4e916ad (diff) | |
download | PeerTube-17bb716bc49b30cc8f22e32f73b9b53ab9ae560d.tar.gz PeerTube-17bb716bc49b30cc8f22e32f73b9b53ab9ae560d.tar.zst PeerTube-17bb716bc49b30cc8f22e32f73b9b53ab9ae560d.zip |
Fix some styles
Video edit tags, dropdown actions font ...
-rw-r--r-- | client/src/app/header/header.component.scss | 1 | ||||
-rw-r--r-- | client/src/app/shared/buttons/button.component.scss | 1 | ||||
-rw-r--r-- | client/src/app/videos/+video-edit/shared/video-edit.component.scss | 13 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 1 | ||||
-rw-r--r-- | client/src/sass/primeng-custom.scss | 55 |
5 files changed, 41 insertions, 30 deletions
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss index cdc457b96..cea415d9b 100644 --- a/client/src/app/header/header.component.scss +++ b/client/src/app/header/header.component.scss | |||
@@ -6,6 +6,7 @@ | |||
6 | padding-left: 10px; | 6 | padding-left: 10px; |
7 | margin-right: 15px; | 7 | margin-right: 15px; |
8 | padding-right: 40px; // For the search icon | 8 | padding-right: 40px; // For the search icon |
9 | font-size: 14px; | ||
9 | 10 | ||
10 | &::placeholder { | 11 | &::placeholder { |
11 | color: var(--inputPlaceholderColor); | 12 | color: var(--inputPlaceholderColor); |
diff --git a/client/src/app/shared/buttons/button.component.scss b/client/src/app/shared/buttons/button.component.scss index be41669cd..04199a2a9 100644 --- a/client/src/app/shared/buttons/button.component.scss +++ b/client/src/app/shared/buttons/button.component.scss | |||
@@ -5,7 +5,6 @@ | |||
5 | @include peertube-button-link; | 5 | @include peertube-button-link; |
6 | @include button-with-icon(21px, 0, -2px); | 6 | @include button-with-icon(21px, 0, -2px); |
7 | 7 | ||
8 | font-size: 15px; | ||
9 | font-weight: $font-semibold; | 8 | font-weight: $font-semibold; |
10 | color: $grey-foreground-color; | 9 | color: $grey-foreground-color; |
11 | background-color: $grey-background-color; | 10 | background-color: $grey-background-color; |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss index cc32fb254..bb775cb0a 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss | |||
@@ -23,10 +23,6 @@ my-peertube-checkbox { | |||
23 | display: block; | 23 | display: block; |
24 | } | 24 | } |
25 | 25 | ||
26 | input, select { | ||
27 | font-size: 15px | ||
28 | } | ||
29 | |||
30 | .label-tags + span { | 26 | .label-tags + span { |
31 | font-size: 15px; | 27 | font-size: 15px; |
32 | } | 28 | } |
@@ -167,10 +163,10 @@ p-calendar { | |||
167 | } | 163 | } |
168 | 164 | ||
169 | tag { | 165 | tag { |
170 | background-color: var(--inputColor) !important; | 166 | background-color: $grey-background-color !important; |
167 | color: #000 !important; | ||
171 | border-radius: 3px !important; | 168 | border-radius: 3px !important; |
172 | font-size: 15px !important; | 169 | font-size: 15px !important; |
173 | color: var(--mainForegroundColor) !important; | ||
174 | height: 30px !important; | 170 | height: 30px !important; |
175 | line-height: 30px !important; | 171 | line-height: 30px !important; |
176 | margin: 0 5px 0 0 !important; | 172 | margin: 0 5px 0 0 !important; |
@@ -193,7 +189,10 @@ p-calendar { | |||
193 | top: -1px; | 189 | top: -1px; |
194 | height: auto !important; | 190 | height: auto !important; |
195 | vertical-align: middle !important; | 191 | vertical-align: middle !important; |
196 | fill: $grey-foreground-color !important; | 192 | |
193 | path { | ||
194 | fill: $grey-foreground-color !important; | ||
195 | } | ||
197 | } | 196 | } |
198 | 197 | ||
199 | &:hover { | 198 | &:hover { |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 1da240db8..8749649d3 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -76,6 +76,7 @@ | |||
76 | border-radius: 3px; | 76 | border-radius: 3px; |
77 | padding-left: 15px; | 77 | padding-left: 15px; |
78 | padding-right: 15px; | 78 | padding-right: 15px; |
79 | font-size: 15px; | ||
79 | 80 | ||
80 | &::placeholder { | 81 | &::placeholder { |
81 | color: var(--inputPlaceholderColor); | 82 | color: var(--inputPlaceholderColor); |
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 6057b1db0..7ba011180 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss | |||
@@ -263,33 +263,40 @@ p-calendar .ui-datepicker { | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
266 | .ui-chkbox { | ||
266 | 267 | ||
267 | .ui-chkbox-box { | 268 | &, .ui-chkbox-box { |
268 | &.ui-state-active { | 269 | width: 18px !important; |
269 | border-color: var(--mainColor) !important; | 270 | height: 18px !important; |
270 | background-color: var(--mainColor) !important; | ||
271 | } | 271 | } |
272 | 272 | ||
273 | .ui-chkbox-icon { | 273 | .ui-chkbox-box { |
274 | position: relative; | 274 | &.ui-state-active { |
275 | overflow: visible !important; | 275 | border-color: var(--mainColor) !important; |
276 | 276 | background-color: var(--mainColor) !important; | |
277 | &:after { | ||
278 | content: ''; | ||
279 | position: absolute; | ||
280 | top: 1px; | ||
281 | left: 7px; | ||
282 | width: 5px; | ||
283 | height: 13px; | ||
284 | opacity: 0; | ||
285 | transform: rotate(45deg) scale(0); | ||
286 | border-right: 2px solid var(--mainBackgroundColor); | ||
287 | border-bottom: 2px solid var(--mainBackgroundColor); | ||
288 | } | 277 | } |
289 | 278 | ||
290 | &.pi-check:after { | 279 | .ui-chkbox-icon { |
291 | opacity: 1; | 280 | position: relative; |
292 | transform: rotate(45deg) scale(1); | 281 | overflow: visible !important; |
282 | |||
283 | &:after { | ||
284 | content: ''; | ||
285 | position: absolute; | ||
286 | top: 1px; | ||
287 | left: 6px; | ||
288 | width: 5px; | ||
289 | height: 12px; | ||
290 | opacity: 0; | ||
291 | transform: rotate(45deg) scale(0); | ||
292 | border-right: 2px solid var(--mainBackgroundColor); | ||
293 | border-bottom: 2px solid var(--mainBackgroundColor); | ||
294 | } | ||
295 | |||
296 | &.pi-check:after { | ||
297 | opacity: 1; | ||
298 | transform: rotate(45deg) scale(1); | ||
299 | } | ||
293 | } | 300 | } |
294 | } | 301 | } |
295 | } | 302 | } |
@@ -354,3 +361,7 @@ p-toast { | |||
354 | } | 361 | } |
355 | } | 362 | } |
356 | } | 363 | } |
364 | |||
365 | .ui-widget { | ||
366 | font-family: $main-fonts !important; | ||
367 | } | ||