MDL-54698 message: change preferences to on/off text

This commit is contained in:
Ryan Wyllie
2016-10-07 16:26:40 +08:00
committed by Mark Nelson
parent fbdcd49993
commit efa079072c
5 changed files with 135 additions and 49 deletions
+43 -6
View File
@@ -278,9 +278,24 @@
}
.preferences-container {
.container-fluid {
padding: 0;
.span6 {
min-height: 20px;
}
}
.align-bottom {
vertical-align: bottom;
}
.preference-table {
border: 1px solid #ddd;
thead {
th {
text-align: center;
}
}
tr {
td {
&:not(:first-child) {
@@ -311,24 +326,46 @@
display: inline-block;
vertical-align: middle;
input[type="checkbox"]:checked + .preference-state-image-container {
border: 2px solid #5cb85c;
input[type="checkbox"]:checked + .preference-state-status-container {
background-color: #5cb85c;
.on-text {
display: inline-block;
}
.off-text {
display: none;
}
}
.preference-state-image-container {
.preference-state-status-container {
width: 30px;
height: 30px;
line-height: 30px;
text-align: center;
border-radius: 4px;
border: 2px solid #d9534f;
background-color: #d9534f;
color: #fff;
.loading-icon {
display: none;
}
.on-text {
display: none;
}
.off-text {
display: inline-block;
}
}
&.loading {
.preference-state-image-container {
.state-icon {
input[type="checkbox"]:checked + .preference-state-status-container {
.on-text,
.off-text {
display: none;
}
}
.preference-state-status-container {
.on-text,
.off-text {
display: none;
}
.loading-icon {
+37 -7
View File
@@ -5995,9 +5995,21 @@ a.ygtvspacer:hover {
.dir-rtl .core_message-messenger-sendmessage .message-send {
float: left;
}
.preferences-container .container-fluid {
padding: 0;
}
.preferences-container .container-fluid .span6 {
min-height: 20px;
}
.preferences-container .align-bottom {
vertical-align: bottom;
}
.preferences-container .preference-table {
border: 1px solid #ddd;
}
.preferences-container .preference-table thead th {
text-align: center;
}
.preferences-container .preference-table tr td:not(:first-child) {
width: 150px;
text-align: center;
@@ -6023,24 +6035,42 @@ a.ygtvspacer:hover {
display: inline-block;
vertical-align: middle;
}
.preferences-container .preference-table .preference-row .preference-state input[type="checkbox"]:checked + .preference-state-image-container {
border: 2px solid #5cb85c;
.preferences-container .preference-table .preference-row .preference-state input[type="checkbox"]:checked + .preference-state-status-container {
background-color: #5cb85c;
}
.preferences-container .preference-table .preference-row .preference-state .preference-state-image-container {
.preferences-container .preference-table .preference-row .preference-state input[type="checkbox"]:checked + .preference-state-status-container .on-text {
display: inline-block;
}
.preferences-container .preference-table .preference-row .preference-state input[type="checkbox"]:checked + .preference-state-status-container .off-text {
display: none;
}
.preferences-container .preference-table .preference-row .preference-state .preference-state-status-container {
width: 30px;
height: 30px;
line-height: 30px;
text-align: center;
border-radius: 4px;
border: 2px solid #d9534f;
background-color: #d9534f;
color: #fff;
}
.preferences-container .preference-table .preference-row .preference-state .preference-state-image-container .loading-icon {
.preferences-container .preference-table .preference-row .preference-state .preference-state-status-container .loading-icon {
display: none;
}
.preferences-container .preference-table .preference-row .preference-state.loading .preference-state-image-container .state-icon {
.preferences-container .preference-table .preference-row .preference-state .preference-state-status-container .on-text {
display: none;
}
.preferences-container .preference-table .preference-row .preference-state.loading .preference-state-image-container .loading-icon {
.preferences-container .preference-table .preference-row .preference-state .preference-state-status-container .off-text {
display: inline-block;
}
.preferences-container .preference-table .preference-row .preference-state.loading input[type="checkbox"]:checked + .preference-state-status-container .on-text,
.preferences-container .preference-table .preference-row .preference-state.loading input[type="checkbox"]:checked + .preference-state-status-container .off-text {
display: none;
}
.preferences-container .preference-table .preference-row .preference-state.loading .preference-state-status-container .on-text,
.preferences-container .preference-table .preference-row .preference-state.loading .preference-state-status-container .off-text {
display: none;
}
.preferences-container .preference-table .preference-row .preference-state.loading .preference-state-status-container .loading-icon {
display: block;
}
.preferences-container .preference-table .preference-row.loading .preference-name .loading-icon {