diff options
Diffstat (limited to 'client/src/sass/include')
-rw-r--r-- | client/src/sass/include/_mixins.scss | 50 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 7 |
2 files changed, 53 insertions, 4 deletions
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index cf5ac8fd8..82c60a59d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -31,9 +31,19 @@ | |||
31 | text-overflow: ellipsis; | 31 | text-overflow: ellipsis; |
32 | } | 32 | } |
33 | 33 | ||
34 | @mixin prefix($property, $parameters...) { | 34 | @mixin fade-text ($fade-after, $background-color) { |
35 | @each $prefix in -webkit-, -moz-, -ms-, -o-, "" { | 35 | position: relative; |
36 | #{$prefix}#{$property}: $parameters; | 36 | overflow: hidden; |
37 | |||
38 | &:after { | ||
39 | content: ''; | ||
40 | pointer-events: none; | ||
41 | width: 100%; | ||
42 | height: 100%; | ||
43 | position: absolute; | ||
44 | left: 0; | ||
45 | top: 0; | ||
46 | background: linear-gradient(transparent $fade-after, $background-color); | ||
37 | } | 47 | } |
38 | } | 48 | } |
39 | 49 | ||
@@ -138,6 +148,33 @@ | |||
138 | } | 148 | } |
139 | } | 149 | } |
140 | 150 | ||
151 | @mixin orange-button-inverted { | ||
152 | @include button-focus(pvar(--mainColorLightest)); | ||
153 | |||
154 | border: 2px solid pvar(--mainColor); | ||
155 | font-weight: $font-regular; | ||
156 | |||
157 | &, &:active, &:focus { | ||
158 | color: pvar(--mainColor); | ||
159 | background-color: pvar(--mainBackgroundColor); | ||
160 | } | ||
161 | |||
162 | &:hover { | ||
163 | color: pvar(--mainColor); | ||
164 | background-color: pvar(--mainColorLightest); | ||
165 | } | ||
166 | |||
167 | &[disabled], &.disabled { | ||
168 | cursor: default; | ||
169 | color: pvar(--mainColor); | ||
170 | background-color: #C6C6C6; | ||
171 | } | ||
172 | |||
173 | my-global-icon { | ||
174 | @include apply-svg-color(pvar(--mainColor)) | ||
175 | } | ||
176 | } | ||
177 | |||
141 | @mixin tertiary-button { | 178 | @mixin tertiary-button { |
142 | @include button-focus($grey-button-outline-color); | 179 | @include button-focus($grey-button-outline-color); |
143 | 180 | ||
@@ -509,6 +546,13 @@ | |||
509 | min-height: $size; | 546 | min-height: $size; |
510 | } | 547 | } |
511 | 548 | ||
549 | @mixin channel-avatar ($size) { | ||
550 | width: $size; | ||
551 | height: $size; | ||
552 | min-width: $size; | ||
553 | min-height: $size; | ||
554 | } | ||
555 | |||
512 | @mixin chevron ($size, $border-width) { | 556 | @mixin chevron ($size, $border-width) { |
513 | border-style: solid; | 557 | border-style: solid; |
514 | border-width: $border-width $border-width 0 0; | 558 | border-width: $border-width $border-width 0 0; |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index c8316473d..bcd28215b 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -16,9 +16,10 @@ $grey-foreground-hover-color: #303030; | |||
16 | $grey-button-outline-color: scale-color($grey-foreground-color, $alpha: -95%); | 16 | $grey-button-outline-color: scale-color($grey-foreground-color, $alpha: -95%); |
17 | 17 | ||
18 | $main-color: hsl(24, 90%, 50%); | 18 | $main-color: hsl(24, 90%, 50%); |
19 | $main-hover-color: lighten($main-color, 5%); | ||
20 | $main-color-lighter: lighten($main-color, 10%); | 19 | $main-color-lighter: lighten($main-color, 10%); |
21 | $main-color-lightest: lighten($main-color, 40%); | 20 | $main-color-lightest: lighten($main-color, 40%); |
21 | $main-hover-color: lighten($main-color, 5%); | ||
22 | |||
22 | $secondary-color: hsl(187, 77%, 34%); | 23 | $secondary-color: hsl(187, 77%, 34%); |
23 | 24 | ||
24 | $support-button: inherit; | 25 | $support-button: inherit; |
@@ -50,6 +51,8 @@ $menu-lateral-padding: 26px; | |||
50 | $sub-menu-color: #F7F7F7; | 51 | $sub-menu-color: #F7F7F7; |
51 | $sub-menu-height: 81px; | 52 | $sub-menu-height: 81px; |
52 | 53 | ||
54 | $channel-background-color: #f6ede8; | ||
55 | |||
53 | $footer-height: 30px; | 56 | $footer-height: 30px; |
54 | $footer-margin: 30px; | 57 | $footer-margin: 30px; |
55 | 58 | ||
@@ -98,7 +101,9 @@ $variables: ( | |||
98 | 101 | ||
99 | --menuBackgroundColor: var(--menuBackgroundColor), | 102 | --menuBackgroundColor: var(--menuBackgroundColor), |
100 | --menuForegroundColor: var(--menuForegroundColor), | 103 | --menuForegroundColor: var(--menuForegroundColor), |
104 | |||
101 | --submenuColor: var(--submenuColor), | 105 | --submenuColor: var(--submenuColor), |
106 | --channelBackgroundColor: var(--channelBackgroundColor), | ||
102 | 107 | ||
103 | --inputForegroundColor: var(--inputForegroundColor), | 108 | --inputForegroundColor: var(--inputForegroundColor), |
104 | --inputBackgroundColor: var(--inputBackgroundColor), | 109 | --inputBackgroundColor: var(--inputBackgroundColor), |