Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2017-11-16 16:46:54 +00:00
commit ef6fcaf703
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/skins/vector/css/matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss
View File

@ -21,19 +21,7 @@ limitations under the License.
} }
.mx_EncryptedEventDialog .mx_MemberDeviceInfo_textButton { .mx_EncryptedEventDialog .mx_MemberDeviceInfo_textButton {
border: 0px; @mixin mx_DialogButton;
height: 36px;
border-radius: 40px;
border: solid 1px $accent-color;
font-weight: 600;
font-size: 14px;
font-family: $font-family;
margin-left: 0px;
margin-right: 8px;
padding-left: 1.5em;
padding-right: 1.5em;
outline: none;
cursor: pointer;
color: $accent-color;
background-color: $primary-bg-color; background-color: $primary-bg-color;
color: $accent-color;
} }

17
src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
View File

@ -43,22 +43,9 @@ limitations under the License.
} }
.mx_UnknownDeviceDialog .mx_MemberDeviceInfo_textButton { .mx_UnknownDeviceDialog .mx_MemberDeviceInfo_textButton {
border: 0px; @mixin mx_DialogButton_small;
height: 24px;
border-radius: 40px;
border: solid 1px $accent-color;
font-weight: 600;
font-size: 13px;
font-family: $font-family;
margin-left: 0px;
margin-right: 8px;
padding-left: 0.5em;
padding-right: 0.5em;
width: 85px;
outline: none;
cursor: pointer;
color: $accent-color;
background-color: $primary-bg-color; background-color: $primary-bg-color;
color: $accent-color;
} }
.mx_UnknownDeviceDialog .mx_UnknownDeviceDialog_deviceList li { .mx_UnknownDeviceDialog .mx_UnknownDeviceDialog_deviceList li {