Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
This commit is contained in:
@@ -117,7 +117,7 @@ a:focus,
|
||||
}
|
||||
|
||||
input, optgroup, select, textarea {
|
||||
color: $font_colour;
|
||||
font-size: 0.9rem !important;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ nav {
|
||||
width: 100%;
|
||||
max-height: 50%;
|
||||
background: $comment_item_colour;
|
||||
padding: 20px;
|
||||
padding: 1rem;
|
||||
border-bottom: #ccc 1px solid;
|
||||
overflow: auto;
|
||||
-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
|
||||
@@ -1059,8 +1059,6 @@ img.mail-conv-sender-photo {
|
||||
height: $reply_photo;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.wall-item-ago,
|
||||
.dropdown-sub-text {
|
||||
color: #777;
|
||||
@@ -1480,17 +1478,17 @@ dl.bb-dl > dd > li {
|
||||
|
||||
|
||||
/* Turn checkboxes into switches */
|
||||
.field.checkbox > div {
|
||||
.form-group.checkbox > div {
|
||||
position: relative; width: 60px;
|
||||
-webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
|
||||
display:inline-block;
|
||||
}
|
||||
|
||||
.field.checkbox input {
|
||||
.form-group.checkbox input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.field.checkbox > div label {
|
||||
.form-group.checkbox > div label {
|
||||
display: block; overflow: hidden; cursor: pointer;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
@@ -1500,11 +1498,11 @@ dl.bb-dl > dd > li {
|
||||
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
|
||||
}
|
||||
|
||||
.field.checkbox:hover label {
|
||||
.form-group.checkbox:hover label {
|
||||
color: $link_colour;
|
||||
}
|
||||
|
||||
.field.checkbox:hover > div label {
|
||||
.form-group.checkbox:hover > div label {
|
||||
border-color: $link_colour;
|
||||
}
|
||||
|
||||
@@ -1543,11 +1541,11 @@ dl.bb-dl > dd > li {
|
||||
-o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
|
||||
}
|
||||
|
||||
.field.checkbox > div > input:checked + label .onoffswitch-inner {
|
||||
.form-group.checkbox > div > input:checked + label .onoffswitch-inner {
|
||||
margin-left: 0px;
|
||||
}
|
||||
|
||||
.field.checkbox > div > input:checked + label .onoffswitch-switch {
|
||||
.form-group.checkbox > div > input:checked + label .onoffswitch-switch {
|
||||
right: 0px;
|
||||
background-color: #0275d8;
|
||||
}
|
||||
|
Reference in New Issue
Block a user