Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
a58ea58380
|
@ -159,8 +159,12 @@ limitations under the License.
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_GroupView_rooms_header h3 {
|
.mx_GroupView h3 {
|
||||||
margin-bottom: 10px
|
text-transform: uppercase;
|
||||||
|
color: $h3-color;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 13px;
|
||||||
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_GroupView_rooms_header .mx_AccessibleButton {
|
.mx_GroupView_rooms_header .mx_AccessibleButton {
|
||||||
|
@ -169,15 +173,24 @@ limitations under the License.
|
||||||
height: 24px;
|
height: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_GroupView_rooms_header_addButton {
|
.mx_GroupView_group {
|
||||||
display: inline-block;
|
border-top: 1px solid $primary-hairline-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_GroupView_rooms_header_addButton object {
|
.mx_GroupView_group_disabled {
|
||||||
|
opacity: 0.3;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_GroupView_rooms_header_addButton_label {
|
.mx_GroupView_rooms_header_addRow_button {
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_GroupView_rooms_header_addRow_button object {
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_GroupView_rooms_header_addRow_label {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
|
@ -222,14 +235,6 @@ limitations under the License.
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_GroupView_memberSettings h3 {
|
|
||||||
text-transform: uppercase;
|
|
||||||
color: $h3-color;
|
|
||||||
font-weight: 600;
|
|
||||||
font-size: 13px;
|
|
||||||
margin-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_GroupView_memberSettings input {
|
.mx_GroupView_memberSettings input {
|
||||||
margin-right: 6px;
|
margin-right: 6px;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue