Merge branch 'design_dialogs' into design_dialogs_props

This commit is contained in:
David Benqué
2019-11-22 16:09:09 +00:00
9 changed files with 58 additions and 59 deletions

View File

@@ -24,7 +24,7 @@
@alertify-input-bg: @colortheme_modal-input;
@alertify-input-fg: @colortheme_modal-input-fg;
@alertify_padding-base: @variables_padding; // XXX to align tab contents with buttons. could change @variables-padding: 12px
@alertify_padding-base: @variables_padding;
@alertify_box-shadow: @variables_shadow;
// Logs to show that something has happened
@@ -226,7 +226,7 @@
width: 100%;
font-size: 100%;
padding: @alertify_padding-base;
&[readonly="readonly"]{
&[readonly] {
background-color: @alertify-light-bg;
color: @cryptpad_text_col;
border-color: @alertify-input-fg;
@@ -348,8 +348,8 @@
nav {
padding: @alertify_padding-base;
text-align: right;
button{
margin:0px !important; // XXX was not overriding the button margin
button {
margin: 0px !important;
&:not(:last-child) {
margin-right: @alertify_padding-base !important;
}

View File

@@ -66,7 +66,7 @@
padding: 8px 12px;
margin: 1em;
width: 300px;
&[type="text"]{
&[type="text"] {
background-color: @colortheme_modal-input-fg;
color: @cryptpad_text_col;
border: 1px solid @colortheme_modal-input;

View File

@@ -5,24 +5,24 @@
}
& {
// Share modal
.msg.cp-inline-radio-group{
.radio-group{
.msg.cp-inline-radio-group {
.radio-group {
display: flex;
flex-direction: row;
.cp-radio{
.cp-radio {
margin-right: 30px;
}
}
}
// Properties modal
.cp-app-prop{
.cp-app-prop {
margin-bottom: 10px;
}
.cp-app-prop-content{
.cp-app-prop-content {
color: @cryptpad_text_col;
}
}
}