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/sass/bootstrap.scss | |
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/sass/bootstrap.scss')
-rw-r--r-- | client/src/sass/bootstrap.scss | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 7985472ed..0dc58a7c9 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -51,8 +51,8 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
51 | padding: 3px 15px; | 51 | padding: 3px 15px; |
52 | 52 | ||
53 | &.active { | 53 | &.active { |
54 | color: var(--mainBackgroundColor) !important; | 54 | color: pvar(--mainBackgroundColor) !important; |
55 | background-color: var(--mainHoverColor); | 55 | background-color: pvar(--mainHoverColor); |
56 | opacity: .9; | 56 | opacity: .9; |
57 | } | 57 | } |
58 | 58 | ||
@@ -94,7 +94,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
94 | text-align: center; | 94 | text-align: center; |
95 | 95 | ||
96 | .modal-content { | 96 | .modal-content { |
97 | background-color: var(--mainBackgroundColor); | 97 | background-color: pvar(--mainBackgroundColor); |
98 | } | 98 | } |
99 | 99 | ||
100 | .modal-header { | 100 | .modal-header { |
@@ -161,7 +161,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
161 | a { | 161 | a { |
162 | @include disable-default-a-behaviour; | 162 | @include disable-default-a-behaviour; |
163 | 163 | ||
164 | color: var(--mainForegroundColor); | 164 | color: pvar(--mainForegroundColor); |
165 | } | 165 | } |
166 | } | 166 | } |
167 | 167 | ||
@@ -170,7 +170,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
170 | .nav-link { | 170 | .nav-link { |
171 | @include disable-default-a-behaviour; | 171 | @include disable-default-a-behaviour; |
172 | 172 | ||
173 | color: var(--mainForegroundColor) !important; | 173 | color: pvar(--mainForegroundColor) !important; |
174 | } | 174 | } |
175 | } | 175 | } |
176 | 176 | ||
@@ -180,9 +180,9 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
180 | } | 180 | } |
181 | &.active { | 181 | &.active { |
182 | font-weight: $font-semibold; | 182 | font-weight: $font-semibold; |
183 | background-color: var(--mainBackgroundColor) !important; | 183 | background-color: pvar(--mainBackgroundColor) !important; |
184 | border: none; | 184 | border: none; |
185 | border-bottom: 2px solid var(--mainColor); | 185 | border-bottom: 2px solid pvar(--mainColor); |
186 | } | 186 | } |
187 | &:hover { | 187 | &:hover { |
188 | border-top-color: transparent; | 188 | border-top-color: transparent; |
@@ -192,7 +192,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
192 | } | 192 | } |
193 | 193 | ||
194 | .card { | 194 | .card { |
195 | background-color: var(--mainBackgroundColor); | 195 | background-color: pvar(--mainBackgroundColor); |
196 | border-color: #dee2e6; | 196 | border-color: #dee2e6; |
197 | } | 197 | } |
198 | 198 | ||
@@ -240,27 +240,27 @@ ngb-tooltip-window { | |||
240 | } | 240 | } |
241 | 241 | ||
242 | .btn-outline-tertiary { | 242 | .btn-outline-tertiary { |
243 | color: var(--secondaryColor); | 243 | color: pvar(--secondaryColor); |
244 | border-color: var(--secondaryColor); | 244 | border-color: pvar(--secondaryColor); |
245 | 245 | ||
246 | &:focus-within, | 246 | &:focus-within, |
247 | &:focus, | 247 | &:focus, |
248 | &:hover { | 248 | &:hover { |
249 | color: var(--mainBackgroundColor); | 249 | color: pvar(--mainBackgroundColor); |
250 | background-color: var(--secondaryColor); | 250 | background-color: pvar(--secondaryColor); |
251 | } | 251 | } |
252 | } | 252 | } |
253 | 253 | ||
254 | // input box-shadow on focus | 254 | // input box-shadow on focus |
255 | .form-control { | 255 | .form-control { |
256 | font-size: 15px; | 256 | font-size: 15px; |
257 | color: var(--mainForegroundColor); | 257 | color: pvar(--mainForegroundColor); |
258 | background-color: var(--inputBackgroundColor); | 258 | background-color: pvar(--inputBackgroundColor); |
259 | outline: none; | 259 | outline: none; |
260 | 260 | ||
261 | &:focus-within, | 261 | &:focus-within, |
262 | &:focus { | 262 | &:focus { |
263 | box-shadow: #{$focus-box-shadow-form} var(--mainColorLightest); | 263 | box-shadow: #{$focus-box-shadow-form} pvar(--mainColorLightest); |
264 | 264 | ||
265 | &.input-error { | 265 | &.input-error { |
266 | box-shadow: #{$focus-box-shadow-form} #{scale-color($red, $alpha: -75%)}; | 266 | box-shadow: #{$focus-box-shadow-form} #{scale-color($red, $alpha: -75%)}; |