diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-09 09:33:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-09 09:33:28 +0200 |
commit | e66883b37ae0796256b3aba550670a2d76cfc98a (patch) | |
tree | 3cce3c78e9f9f327470f0370a1b4065fe7e0009e /client/src/app/header | |
parent | 6ad971d5f5e9ea2adfc58bd83ba1790efa4a8d12 (diff) | |
download | PeerTube-e66883b37ae0796256b3aba550670a2d76cfc98a.tar.gz PeerTube-e66883b37ae0796256b3aba550670a2d76cfc98a.tar.zst PeerTube-e66883b37ae0796256b3aba550670a2d76cfc98a.zip |
`fitWidth` for `video-miniature`, fluid grid (#2830)
* Fluid abstract video list
* normalize timestamp display on miniatures
* use grid for abstract-video-list
- refactor scss function var to pvar to avoid overriding css variables
- move fluid-grid margins to adapt-margin-content-width mixin for maintainability
- fix video-miniature-name margin-top on small screen
* move sceenratio function in a mixin
* display no miniature avatar in channel videos view
Diffstat (limited to 'client/src/app/header')
-rw-r--r-- | client/src/app/header/search-typeahead.component.scss | 10 | ||||
-rw-r--r-- | client/src/app/header/suggestion.component.scss | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss index 33b88825f..0a30ebd55 100644 --- a/client/src/app/header/search-typeahead.component.scss +++ b/client/src/app/header/search-typeahead.component.scss | |||
@@ -10,7 +10,7 @@ | |||
10 | font-size: 14px; | 10 | font-size: 14px; |
11 | 11 | ||
12 | &::placeholder { | 12 | &::placeholder { |
13 | color: var(--inputPlaceholderColor); | 13 | color: pvar(--inputPlaceholderColor); |
14 | } | 14 | } |
15 | } | 15 | } |
16 | 16 | ||
@@ -18,7 +18,7 @@ | |||
18 | @include icon(25px); | 18 | @include icon(25px); |
19 | height: 21px; | 19 | height: 21px; |
20 | 20 | ||
21 | background-color: var(--mainForegroundColor); | 21 | background-color: pvar(--mainForegroundColor); |
22 | mask: url('../../assets/images/header/search.svg') no-repeat 50% 50%; | 22 | mask: url('../../assets/images/header/search.svg') no-repeat 50% 50%; |
23 | 23 | ||
24 | // yolo | 24 | // yolo |
@@ -37,10 +37,10 @@ | |||
37 | #typeahead-help, | 37 | #typeahead-help, |
38 | #typeahead-instructions, | 38 | #typeahead-instructions, |
39 | my-suggestions ::ng-deep ul { | 39 | my-suggestions ::ng-deep ul { |
40 | border: 1px solid var(--mainBackgroundColor); | 40 | border: 1px solid pvar(--mainBackgroundColor); |
41 | border-bottom-right-radius: 3px; | 41 | border-bottom-right-radius: 3px; |
42 | border-bottom-left-radius: 3px; | 42 | border-bottom-left-radius: 3px; |
43 | background: var(--mainBackgroundColor); | 43 | background: pvar(--mainBackgroundColor); |
44 | transition: .3s ease; | 44 | transition: .3s ease; |
45 | transition-property: box-shadow; | 45 | transition-property: box-shadow; |
46 | } | 46 | } |
@@ -67,7 +67,7 @@ my-suggestions ::ng-deep ul { | |||
67 | 67 | ||
68 | #typeahead-container { | 68 | #typeahead-container { |
69 | input { | 69 | input { |
70 | border: 1px solid var(--mainBackgroundColor) !important; | 70 | border: 1px solid pvar(--mainBackgroundColor) !important; |
71 | box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 20px 0px; | 71 | box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 20px 0px; |
72 | flex-grow: 1; | 72 | flex-grow: 1; |
73 | transition: box-shadow .3s ease, width .2s ease; | 73 | transition: box-shadow .3s ease, width .2s ease; |
diff --git a/client/src/app/header/suggestion.component.scss b/client/src/app/header/suggestion.component.scss index 1de2f43bd..692a81daa 100644 --- a/client/src/app/header/suggestion.component.scss +++ b/client/src/app/header/suggestion.component.scss | |||
@@ -5,21 +5,21 @@ a { | |||
5 | width: 100%; | 5 | width: 100%; |
6 | 6 | ||
7 | &, &:hover { | 7 | &, &:hover { |
8 | color: var(--mainForegroundColor); | 8 | color: pvar(--mainForegroundColor); |
9 | 9 | ||
10 | &.focus-visible { | 10 | &.focus-visible { |
11 | background-color: var(--mainHoverColor); | 11 | background-color: pvar(--mainHoverColor); |
12 | color: var(--mainBackgroundColor); | 12 | color: pvar(--mainBackgroundColor); |
13 | } | 13 | } |
14 | } | 14 | } |
15 | } | 15 | } |
16 | 16 | ||
17 | .bg-gray { | 17 | .bg-gray { |
18 | background-color: var(--mainBackgroundColor); | 18 | background-color: pvar(--mainBackgroundColor); |
19 | } | 19 | } |
20 | 20 | ||
21 | .text-gray-light { | 21 | .text-gray-light { |
22 | color: var(--mainForegroundColor); | 22 | color: pvar(--mainForegroundColor); |
23 | } | 23 | } |
24 | 24 | ||
25 | my-global-icon { | 25 | my-global-icon { |
@@ -28,5 +28,5 @@ my-global-icon { | |||
28 | top: -2px; | 28 | top: -2px; |
29 | margin: 5px; | 29 | margin: 5px; |
30 | 30 | ||
31 | @include apply-svg-color(var(--mainForegroundColor)); | 31 | @include apply-svg-color(pvar(--mainForegroundColor)); |
32 | } | 32 | } |