diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-21 16:18:59 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-27 09:41:54 +0200 |
commit | 22a16e36f6526887ed8f5e5d3c9f9e5da0b4a8cd (patch) | |
tree | 93c53e0619f966bd9ff1bb698c411277a9447a41 /client/src/sass | |
parent | 99492dbc0d87ef54d0dab7d8d44f8d0de5722bdd (diff) | |
download | PeerTube-22a16e36f6526887ed8f5e5d3c9f9e5da0b4a8cd.tar.gz PeerTube-22a16e36f6526887ed8f5e5d3c9f9e5da0b4a8cd.tar.zst PeerTube-22a16e36f6526887ed8f5e5d3c9f9e5da0b4a8cd.zip |
Add local user subscriptions
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/application.scss | 7 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 57 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 2 |
3 files changed, 47 insertions, 19 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index dc0ffe912..b2d7c2bec 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -83,6 +83,7 @@ label { | |||
83 | display: flex; | 83 | display: flex; |
84 | align-items: center; | 84 | align-items: center; |
85 | padding-left: $not-expanded-horizontal-margins; | 85 | padding-left: $not-expanded-horizontal-margins; |
86 | padding-right: $not-expanded-horizontal-margins; | ||
86 | } | 87 | } |
87 | 88 | ||
88 | // Override some properties if the main content is expanded (no menu on the left) | 89 | // Override some properties if the main content is expanded (no menu on the left) |
@@ -96,6 +97,7 @@ label { | |||
96 | 97 | ||
97 | .sub-menu { | 98 | .sub-menu { |
98 | padding-left: $expanded-horizontal-margins; | 99 | padding-left: $expanded-horizontal-margins; |
100 | padding-right: $expanded-horizontal-margins; | ||
99 | } | 101 | } |
100 | } | 102 | } |
101 | } | 103 | } |
@@ -294,6 +296,10 @@ table { | |||
294 | 296 | ||
295 | .sub-menu { | 297 | .sub-menu { |
296 | padding-left: 50px; | 298 | padding-left: 50px; |
299 | |||
300 | .title-page { | ||
301 | font-size: 15px; | ||
302 | } | ||
297 | } | 303 | } |
298 | } | 304 | } |
299 | } | 305 | } |
@@ -316,6 +322,7 @@ table { | |||
316 | 322 | ||
317 | .sub-menu { | 323 | .sub-menu { |
318 | padding-left: 15px; | 324 | padding-left: 15px; |
325 | padding-right: 15px; | ||
319 | margin-bottom: 10px; | 326 | margin-bottom: 10px; |
320 | } | 327 | } |
321 | 328 | ||
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index b0b0f544c..aafe478f9 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -335,6 +335,27 @@ | |||
335 | font-size: 13px; | 335 | font-size: 13px; |
336 | } | 336 | } |
337 | 337 | ||
338 | @mixin actor-owner { | ||
339 | @include disable-default-a-behaviour; | ||
340 | |||
341 | display: block; | ||
342 | font-size: 13px; | ||
343 | margin-top: 4px; | ||
344 | color: #000; | ||
345 | |||
346 | span:hover { | ||
347 | opacity: 0.8; | ||
348 | } | ||
349 | |||
350 | img { | ||
351 | @include avatar(18px); | ||
352 | |||
353 | margin-left: 7px; | ||
354 | position: relative; | ||
355 | top: -2px; | ||
356 | } | ||
357 | } | ||
358 | |||
338 | @mixin sub-menu-with-actor { | 359 | @mixin sub-menu-with-actor { |
339 | height: 160px; | 360 | height: 160px; |
340 | display: flex; | 361 | display: flex; |
@@ -371,7 +392,7 @@ | |||
371 | position: relative; | 392 | position: relative; |
372 | top: 3px; | 393 | top: 3px; |
373 | font-size: 14px; | 394 | font-size: 14px; |
374 | color: #777272; | 395 | color: $grey-actor-name; |
375 | } | 396 | } |
376 | } | 397 | } |
377 | 398 | ||
@@ -380,24 +401,7 @@ | |||
380 | } | 401 | } |
381 | 402 | ||
382 | .actor-owner { | 403 | .actor-owner { |
383 | @include disable-default-a-behaviour; | 404 | @include actor-owner; |
384 | |||
385 | display: block; | ||
386 | font-size: 13px; | ||
387 | margin-top: 4px; | ||
388 | color: #000; | ||
389 | |||
390 | span:hover { | ||
391 | opacity: 0.8; | ||
392 | } | ||
393 | |||
394 | img { | ||
395 | @include avatar(18px); | ||
396 | |||
397 | margin-left: 7px; | ||
398 | position: relative; | ||
399 | top: -2px; | ||
400 | } | ||
401 | } | 405 | } |
402 | } | 406 | } |
403 | } | 407 | } |
@@ -426,3 +430,18 @@ | |||
426 | background-image: url($imageUrl); | 430 | background-image: url($imageUrl); |
427 | } | 431 | } |
428 | } | 432 | } |
433 | |||
434 | @mixin row-blocks { | ||
435 | display: flex; | ||
436 | min-height: 130px; | ||
437 | padding-bottom: 20px; | ||
438 | margin-bottom: 20px; | ||
439 | border-bottom: 1px solid #C6C6C6; | ||
440 | |||
441 | @media screen and (max-width: 800px) { | ||
442 | flex-direction: column; | ||
443 | height: auto; | ||
444 | text-align: center; | ||
445 | align-items: center; | ||
446 | } | ||
447 | } \ No newline at end of file | ||
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index f1f755126..e6db98642 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -12,6 +12,8 @@ $black-background: #000; | |||
12 | $grey-background: #f6f2f2; | 12 | $grey-background: #f6f2f2; |
13 | $red-error: #FF0000; | 13 | $red-error: #FF0000; |
14 | 14 | ||
15 | $grey-actor-name: #777272; | ||
16 | |||
15 | $expanded-horizontal-margins: 150px; | 17 | $expanded-horizontal-margins: 150px; |
16 | $not-expanded-horizontal-margins: 30px; | 18 | $not-expanded-horizontal-margins: 30px; |
17 | 19 | ||