matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-07 21:23:00 +03:00
Code Activity

Merge pull request #2512 from matrix-org/travis/usettings/tab/flair

Browse Source 
Implement flair tab in user settings
This commit is contained in:
Travis Ralston
2019-01-28 20:37:22 -07:00
committed by GitHub
parent c204cd7be3 70b34aa2c3
commit d34390d230
9 changed files with 87 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/css/structures/_TabbedView.scss
View File

@@ -55,6 +55,7 @@ limitations under the License.
.mx_TabbedView_maskedIcon {;
margin-left: 6px;
margin-right: 9px;
margin-top: 1px;
width: 14px;
height: 14px;
display: inline-block;
@@ -66,7 +67,7 @@ limitations under the License.
mask-repeat: no-repeat;
mask-size: 14px;
width: 14px;
height: 15px;
height: 18px;
mask-position: center;
content: '';
vertical-align: middle;

4
res/css/views/dialogs/_UserSettingsDialog.scss
View File

@@ -44,3 +44,7 @@ limitations under the License.
.mx_UserSettingsDialog_labsIcon:before {
mask-image: url('$(res)/img/feather-icons/flag.svg');
}
.mx_UserSettingsDialog_flairIcon:before {
mask-image: url('$(res)/img/feather-icons/flair.svg');
}

21
res/css/views/groups/_GroupPublicityToggle.scss
View File

@@ -20,23 +20,14 @@ limitations under the License.
margin: 8px;
}
.mx_GroupPublicity_toggle > label {
display: flex;
align-items: flex-start;
}
.mx_GroupPublicity_toggle > label,
.mx_GroupPublicity_toggle .mx_GroupTile {
width: 50%;
}
.mx_GroupPublicity_toggle input {
margin-right: 8px;
vertical-align: -4px;
}
.mx_GroupPublicity_toggle .mx_GroupTile {
display: flex;
align-items: flex-start;
cursor: pointer;
box-sizing: border-box;
width: 100%;
}
.mx_GroupPublicity_toggle .mx_ToggleSwitch {
float: right;
}