diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-05-03 23:01:57 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-05-04 15:01:44 +0200 |
commit | 25a42e293be90d35afad2096e9db2fa3d617d855 (patch) | |
tree | 5739da8e2aed75447cf0fd608089cc8849c0da33 /client/src/sass | |
parent | 801d957155d574bda984206021cdd1fe58ef56b9 (diff) | |
download | PeerTube-25a42e293be90d35afad2096e9db2fa3d617d855.tar.gz PeerTube-25a42e293be90d35afad2096e9db2fa3d617d855.tar.zst PeerTube-25a42e293be90d35afad2096e9db2fa3d617d855.zip |
Fix rowsPerPage change, add filter clear button, update video-abuse-list search query param dynamically
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/application.scss | 5 | ||||
-rw-r--r-- | client/src/sass/bootstrap.scss | 41 | ||||
-rw-r--r-- | client/src/sass/primeng-custom.scss | 3 |
3 files changed, 43 insertions, 6 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 62503fc02..bbecd8ba8 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -339,6 +339,11 @@ table { | |||
339 | .peertube-select-container { | 339 | .peertube-select-container { |
340 | width: 100% !important; | 340 | width: 100% !important; |
341 | } | 341 | } |
342 | |||
343 | .caption input[type=text] { | ||
344 | width: unset !important; | ||
345 | flex-grow: 1; | ||
346 | } | ||
342 | } | 347 | } |
343 | } | 348 | } |
344 | } | 349 | } |
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 50f1dafed..cb266cc68 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -27,7 +27,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
27 | } | 27 | } |
28 | 28 | ||
29 | /* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */ | 29 | /* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */ |
30 | .dropdown:not(.btn-group):not(.dropdown-root):not(.action-dropdown) { | 30 | .dropdown:not(.btn-group):not(.dropdown-root):not(.action-dropdown):not(.input-group-prepend) { |
31 | z-index: z(dropdown) !important; | 31 | z-index: z(dropdown) !important; |
32 | 32 | ||
33 | &.list-overflow-menu, | 33 | &.list-overflow-menu, |
@@ -270,10 +270,9 @@ ngb-tooltip-window { | |||
270 | & > .form-control { | 270 | & > .form-control { |
271 | flex: initial; | 271 | flex: initial; |
272 | } | 272 | } |
273 | 273 | input.form-control { | |
274 | .input-group-prepend, | 274 | width: unset !important; |
275 | .input-group-append { | 275 | flex-grow: 1; |
276 | height: 30px; | ||
277 | } | 276 | } |
278 | 277 | ||
279 | .input-group-prepend + input { | 278 | .input-group-prepend + input { |
@@ -281,3 +280,35 @@ ngb-tooltip-window { | |||
281 | border-bottom-left-radius: 0 !important; | 280 | border-bottom-left-radius: 0 !important; |
282 | } | 281 | } |
283 | } | 282 | } |
283 | |||
284 | .has-feedback.has-clear { | ||
285 | position: relative; | ||
286 | |||
287 | input { | ||
288 | padding-right: 1.5rem !important; | ||
289 | } | ||
290 | |||
291 | .form-control-clear { | ||
292 | color: rgba(0, 0, 0, 0.4); | ||
293 | /* | ||
294 | * Enable pointer events as they have been disabled since Bootstrap 3.3 | ||
295 | * See https://github.com/twbs/bootstrap/pull/14104 | ||
296 | */ | ||
297 | pointer-events: all; | ||
298 | display: flex; | ||
299 | justify-content: center; | ||
300 | align-items: center; | ||
301 | position: absolute; | ||
302 | right: .5rem; | ||
303 | height: 95%; | ||
304 | |||
305 | &:hover { | ||
306 | color: rgba(0, 0, 0, 0.7); | ||
307 | cursor: pointer; | ||
308 | } | ||
309 | } | ||
310 | |||
311 | input:placeholder-shown + .form-control-clear { | ||
312 | display: none; | ||
313 | } | ||
314 | } | ||
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index eab2b2dfd..d48f2dfc4 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss | |||
@@ -30,7 +30,8 @@ p-table { | |||
30 | 30 | ||
31 | .caption { | 31 | .caption { |
32 | height: 40px; | 32 | height: 40px; |
33 | display: flex; | 33 | width: 100%; |
34 | display: inline-flex; | ||
34 | align-items: center; | 35 | align-items: center; |
35 | 36 | ||
36 | .input-group-text { | 37 | .input-group-text { |