Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 0466f1d

Browse files
authored
Merge pull request #5298 from matrix-org/jryans/2020-10-polishing
Visual tweaks from 2020-10-06 polishing
2 parents 5a4ca45 + 576ea6d commit 0466f1d

File tree

7 files changed

+29
-23
lines changed

7 files changed

+29
-23
lines changed

res/css/_common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
262262
font-weight: 300;
263263
font-size: $font-15px;
264264
position: relative;
265-
padding: 25px 30px 30px 30px;
265+
padding: 24px;
266266
max-height: 80%;
267267
box-shadow: 2px 15px 30px 0 $dialog-shadow-color;
268268
border-radius: 8px;

res/css/structures/_TabbedView.scss

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ limitations under the License.
1717

1818
.mx_TabbedView {
1919
margin: 0;
20-
padding: 0 0 0 58px;
20+
padding: 0 0 0 16px;
2121
display: flex;
2222
flex-direction: column;
2323
position: absolute;
2424
top: 0;
2525
bottom: 0;
2626
left: 0;
2727
right: 0;
28+
margin-top: 8px;
2829
}
2930

3031
.mx_TabbedView_tabLabels {
@@ -35,13 +36,13 @@ limitations under the License.
3536
}
3637

3738
.mx_TabbedView_tabLabel {
39+
display: flex;
40+
align-items: center;
3841
vertical-align: text-top;
3942
cursor: pointer;
40-
display: block;
41-
border-radius: 3px;
42-
font-size: $font-14px;
43-
min-height: 24px; // use min-height instead of height to allow the label to overflow a bit
44-
margin-bottom: 6px;
43+
padding: 8px 0;
44+
border-radius: 8px;
45+
font-size: $font-13px;
4546
position: relative;
4647
}
4748

@@ -51,9 +52,8 @@ limitations under the License.
5152
}
5253

5354
.mx_TabbedView_maskedIcon {
54-
margin-left: 6px;
55-
margin-right: 9px;
56-
margin-top: 1px;
55+
margin-left: 8px;
56+
margin-right: 16px;
5757
width: 16px;
5858
height: 16px;
5959
display: inline-block;
@@ -65,10 +65,9 @@ limitations under the License.
6565
mask-repeat: no-repeat;
6666
mask-size: 16px;
6767
width: 16px;
68-
height: 22px;
68+
height: 16px;
6969
mask-position: center;
7070
content: '';
71-
vertical-align: middle;
7271
}
7372

7473
.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {

res/css/views/dialogs/_RoomSettingsDialog.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ limitations under the License.
4848
white-space: nowrap;
4949
overflow: hidden;
5050
margin: 0 auto;
51-
padding-left: 40px;
5251
padding-right: 80px;
5352
}
5453

res/css/views/dialogs/_SettingsDialog.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ limitations under the License.
3636
}
3737

3838
.mx_Dialog_title {
39-
text-align: center;
4039
margin-bottom: 24px;
4140
}
4241
}

res/css/views/right_panel/_BaseCard.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ limitations under the License.
4040
width: 20px;
4141
margin: 12px;
4242
top: 0;
43+
border-radius: 10px;
4344

4445
&::before {
4546
content: "";
@@ -55,7 +56,6 @@ limitations under the License.
5556
}
5657

5758
.mx_BaseCard_back {
58-
border-radius: 4px;
5959
left: 0;
6060

6161
&::before {
@@ -66,7 +66,6 @@ limitations under the License.
6666
}
6767

6868
.mx_BaseCard_close {
69-
border-radius: 10px;
7069
right: 0;
7170

7271
&::before {

res/css/views/rooms/_MemberList.scss

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,21 @@ limitations under the License.
9696
}
9797

9898
.mx_MemberList_invite span {
99-
background-image: url('$(res)/img/element-icons/room/invite.svg');
100-
background-repeat: no-repeat;
101-
background-position: center left;
102-
background-size: 20px;
103-
padding: 8px 0 8px 25px;
99+
padding: 8px 0;
100+
display: inline-flex;
101+
102+
&::before {
103+
content: '';
104+
display: inline-block;
105+
background-color: $button-fg-color;
106+
mask-image: url('$(res)/img/element-icons/room/invite.svg');
107+
mask-position: center;
108+
mask-repeat: no-repeat;
109+
mask-size: 20px;
110+
width: 20px;
111+
height: 20px;
112+
margin-right: 5px;
113+
}
104114
}
105115

106116
.mx_MemberList_inviteCommunity span {
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)