aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/sass/include
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-27 16:12:41 +0200
committerChocobozzz <me@florianbigard.com>2021-05-27 16:12:41 +0200
commit8f608a4cb22ab232cfab20665050764b38bac9c7 (patch)
tree6a6785aae79bf5939ad7b7a50a1bd8031268d2b4 /client/src/sass/include
parent030ccfce59a8cb8f2fee6ea8dd363ba635c5c5c2 (diff)
parentc215e627b575d2c4085ccb222f4ca8d0237b7552 (diff)
downloadPeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.gz
PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.zst
PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.zip
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'client/src/sass/include')
-rw-r--r--client/src/sass/include/_actor.scss2
-rw-r--r--client/src/sass/include/_mixins.scss49
2 files changed, 13 insertions, 38 deletions
diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss
index 38bd90ae6..372e7bd24 100644
--- a/client/src/sass/include/_actor.scss
+++ b/client/src/sass/include/_actor.scss
@@ -44,6 +44,8 @@
44 } 44 }
45 45
46 .actor-display-name { 46 .actor-display-name {
47 @include peertube-word-wrap;
48
47 display: flex; 49 display: flex;
48 flex-wrap: wrap; 50 flex-wrap: wrap;
49 } 51 }
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index b2083e516..06e55532a 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -336,20 +336,6 @@
336 cursor: pointer; 336 cursor: pointer;
337} 337}
338 338
339@mixin select-arrow-down {
340 top: 50%;
341 right: calc(0% + 15px);
342 content: ' ';
343 height: 0;
344 width: 0;
345 position: absolute;
346 pointer-events: none;
347 border: 5px solid rgba(0, 0, 0, 0);
348 border-top-color: #000;
349 margin-top: -2px;
350 z-index: 100;
351}
352
353@mixin responsive-width ($width) { 339@mixin responsive-width ($width) {
354 width: $width; 340 width: $width;
355 341
@@ -381,7 +367,17 @@
381 } 367 }
382 368
383 &::after { 369 &::after {
384 @include select-arrow-down; 370 top: 50%;
371 right: calc(0% + 15px);
372 content: ' ';
373 height: 0;
374 width: 0;
375 position: absolute;
376 pointer-events: none;
377 border: 5px solid rgba(0, 0, 0, 0);
378 border-top-color: #000;
379 margin-top: -2px;
380 z-index: 100;
385 } 381 }
386 382
387 select { 383 select {
@@ -849,29 +845,6 @@
849 } 845 }
850} 846}
851 847
852@mixin admin-sub-header-responsive {
853 flex-direction: column;
854
855 .form-sub-title {
856 margin-right: 0 !important;
857 margin-bottom: 10px;
858 text-align: center;
859 }
860
861 .admin-sub-nav {
862 display: block;
863 overflow-x: auto;
864 white-space: nowrap;
865 height: 50px;
866 padding: 10px 0;
867 width: 100%;
868
869 a {
870 margin-left: 5px;
871 }
872 }
873}
874
875// applies ratio (default to 16:9) to a child element (using $selector) only using 848// applies ratio (default to 16:9) to a child element (using $selector) only using
876// an immediate's parent size. This allows to set a ratio without explicit 849// an immediate's parent size. This allows to set a ratio without explicit
877// dimensions, as width/height cannot be computed from each other. 850// dimensions, as width/height cannot be computed from each other.