From 22a16e36f6526887ed8f5e5d3c9f9e5da0b4a8cd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 21 Aug 2018 16:18:59 +0200 Subject: Add local user subscriptions --- client/src/sass/application.scss | 7 ++++ client/src/sass/include/_mixins.scss | 57 ++++++++++++++++++++++----------- client/src/sass/include/_variables.scss | 2 ++ 3 files changed, 47 insertions(+), 19 deletions(-) (limited to 'client/src/sass') 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 { display: flex; align-items: center; padding-left: $not-expanded-horizontal-margins; + padding-right: $not-expanded-horizontal-margins; } // Override some properties if the main content is expanded (no menu on the left) @@ -96,6 +97,7 @@ label { .sub-menu { padding-left: $expanded-horizontal-margins; + padding-right: $expanded-horizontal-margins; } } } @@ -294,6 +296,10 @@ table { .sub-menu { padding-left: 50px; + + .title-page { + font-size: 15px; + } } } } @@ -316,6 +322,7 @@ table { .sub-menu { padding-left: 15px; + padding-right: 15px; margin-bottom: 10px; } 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 @@ font-size: 13px; } +@mixin actor-owner { + @include disable-default-a-behaviour; + + display: block; + font-size: 13px; + margin-top: 4px; + color: #000; + + span:hover { + opacity: 0.8; + } + + img { + @include avatar(18px); + + margin-left: 7px; + position: relative; + top: -2px; + } +} + @mixin sub-menu-with-actor { height: 160px; display: flex; @@ -371,7 +392,7 @@ position: relative; top: 3px; font-size: 14px; - color: #777272; + color: $grey-actor-name; } } @@ -380,24 +401,7 @@ } .actor-owner { - @include disable-default-a-behaviour; - - display: block; - font-size: 13px; - margin-top: 4px; - color: #000; - - span:hover { - opacity: 0.8; - } - - img { - @include avatar(18px); - - margin-left: 7px; - position: relative; - top: -2px; - } + @include actor-owner; } } } @@ -426,3 +430,18 @@ background-image: url($imageUrl); } } + +@mixin row-blocks { + display: flex; + min-height: 130px; + padding-bottom: 20px; + margin-bottom: 20px; + border-bottom: 1px solid #C6C6C6; + + @media screen and (max-width: 800px) { + flex-direction: column; + height: auto; + text-align: center; + align-items: center; + } +} \ 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; $grey-background: #f6f2f2; $red-error: #FF0000; +$grey-actor-name: #777272; + $expanded-horizontal-margins: 150px; $not-expanded-horizontal-margins: 30px; -- cgit v1.2.3