diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-03-06 16:58:55 +0100 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-03-06 16:58:55 +0100 |
commit | 54e7884775197877dd941b44bef03b3c6387b22a (patch) | |
tree | 6a37e8e5476c382b84b77327597e209a9afb64e3 /client/src/sass | |
parent | de702865f47f647fafb34ca05dde3ea780a4ecb1 (diff) | |
download | PeerTube-54e7884775197877dd941b44bef03b3c6387b22a.tar.gz PeerTube-54e7884775197877dd941b44bef03b3c6387b22a.tar.zst PeerTube-54e7884775197877dd941b44bef03b3c6387b22a.zip |
Normalize modal close buttons, and cancel/submit button styles
Diffstat (limited to 'client/src/sass')
-rw-r--r-- | client/src/sass/bootstrap.scss | 8 | ||||
-rw-r--r-- | client/src/sass/include/_mixins.scss | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index bb7b21274..61f9d016b 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -95,15 +95,15 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
95 | } | 95 | } |
96 | 96 | ||
97 | my-global-icon { | 97 | my-global-icon { |
98 | @include icon(24px); | 98 | @include icon(22px); |
99 | 99 | ||
100 | position: relative; | 100 | position: relative; |
101 | top: 3px; | 101 | top: 5px; |
102 | float: right; | 102 | float: right; |
103 | 103 | ||
104 | margin: 0; | 104 | margin: 0; |
105 | padding: 0; | 105 | padding: 0; |
106 | opacity: 1; | 106 | opacity: .5; |
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
@@ -113,7 +113,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; | |||
113 | 113 | ||
114 | .action-button-cancel { | 114 | .action-button-cancel { |
115 | @include peertube-button; | 115 | @include peertube-button; |
116 | @include grey-button; | 116 | @include tertiary-button; |
117 | 117 | ||
118 | display: inline-block; | 118 | display: inline-block; |
119 | margin-right: 10px; | 119 | margin-right: 10px; |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index de9c9d6d6..9a8d0073a 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -150,6 +150,19 @@ | |||
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | @mixin tertiary-button { | ||
154 | color: $grey-foreground-color; | ||
155 | background-color: transparent; | ||
156 | |||
157 | &[disabled], &.disabled { | ||
158 | cursor: default; | ||
159 | } | ||
160 | |||
161 | my-global-icon { | ||
162 | @include apply-svg-color(transparent) | ||
163 | } | ||
164 | } | ||
165 | |||
153 | @mixin grey-button { | 166 | @mixin grey-button { |
154 | &, &:active, &:focus { | 167 | &, &:active, &:focus { |
155 | background-color: $grey-background-color; | 168 | background-color: $grey-background-color; |