Skip to content

Commit 351a94b

Browse files
ara4nara4n
committed
oops - wrong branch
Revert "WIP of new CSS" This reverts commit ad4e341.
1 parent ad4e341 commit 351a94b

39 files changed

+98
-156
lines changed

‎.gitignore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
node_modules
22
vector/bundle.*
33
lib
4-
bundle.css
5-
.DS_Store
6-
key.pem
7-
cert.pem
8-
build

‎src/skins/vector/css/common.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ html {
2222
}
2323

2424
body {
25-
font-family: 'Myriad Pro', Helvetica, Arial, Sans-Serif;
25+
font-family: 'Lato', Helvetica, Arial, Sans-Serif;
2626
font-size: 16px;
2727
color: #454545;
2828
border: 0px;
@@ -34,7 +34,7 @@ div.error {
3434
}
3535

3636
h2 {
37-
color: #454545;
37+
color: #80cef4;
3838
font-weight: 400;
3939
font-size: 20px;
4040
margin-top: 16px;
@@ -44,7 +44,7 @@ h2 {
4444
a:hover,
4545
a:link,
4646
a:visited {
47-
color: #76cfa6;
47+
color: #80CEF4;
4848
}
4949

5050
.mx_ContextualMenu_background {
@@ -149,7 +149,7 @@ a:visited {
149149
font-weight: 400;
150150
font-size: 16px;
151151
color: #fff;
152-
background-color: #76cfa6;
152+
background-color: #80cef4;
153153
margin-left: 8px;
154154
margin-right: 8px;
155155
padding-left: 1em;

‎src/skins/vector/css/hide.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.mx_RoomDropTarget,
2-
.mx_RoomList_favouritesLabel,
3-
.mx_RoomList_archiveLabel,
2+
.mx_RoomList_favourites_label,
3+
.mx_RoomList_archive_label,
44
.mx_RoomHeader_search,
55
.mx_RoomSettings_encrypt,
66
.mx_CreateRoom_encrypt,

‎src/skins/vector/css/molecules/EventTile.css‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ limitations under the License.
2222
}
2323

2424
.mx_EventTile_avatar {
25-
padding-left: 18px;
25+
padding-left: 12px;
2626
padding-right: 12px;
2727
margin-left: -64px;
28-
margin-top: -4px;
28+
margin-top: -7px;
2929
float: left;
3030
}
3131

@@ -48,8 +48,9 @@ limitations under the License.
4848
}
4949

5050
.mx_EventTile .mx_MessageTimestamp {
51-
color: #acacac;
52-
font-size: 12px;
51+
color: #454545;
52+
opacity: 0.5;
53+
font-size: 14px;
5354
float: right;
5455
}
5556

‎src/skins/vector/css/molecules/MImageTile.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ limitations under the License.
2323
}
2424

2525
.mx_MImageTile_download {
26-
color: #76cfa6;
26+
color: #80cef4;
2727
cursor: pointer;
2828
}
2929

3030
.mx_MImageTile_download a {
31-
color: #76cfa6;
31+
color: #80cef4;
3232
text-decoration: none;
3333
}
3434

‎src/skins/vector/css/molecules/MemberTile.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ limitations under the License.
2727
padding-top: 3px;
2828
padding-bottom: 3px;
2929
vertical-align: middle;
30-
width: 36px;
31-
height: 36px;
30+
width: 40px;
31+
height: 40px;
3232
position: relative;
3333
}
3434

@@ -60,8 +60,8 @@ limitations under the License.
6060

6161
.mx_MemberTile_power {
6262
position: absolute;
63-
width: 44px;
64-
height: 44px;
63+
width: 48px;
64+
height: 48px;
6565
left: 10px;
6666
top: -1px;
6767
}

‎src/skins/vector/css/molecules/MessageComposer.css‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,30 @@ limitations under the License.
1515
*/
1616

1717
.mx_MessageComposer_wrapper {
18-
max-width: 960px;
19-
height: 70px;
18+
max-width: 720px;
19+
height: 50px;
2020
vertical-align: middle;
2121
margin: auto;
2222
background-color: #fff;
23-
border-top: 2px solid #e1dddd;
23+
border-radius: 25px;
24+
border: 1px solid #a9dbf4;
2425
}
2526

2627
.mx_MessageComposer_row {
2728
display: table-row;
2829
width: 100%;
29-
height: 70px;
30+
height: 50px;
3031
}
3132

3233
.mx_MessageComposer .mx_MessageComposer_avatar {
3334
display: table-cell;
34-
padding-left: 10px;
35-
padding-right: 20px;
36-
height: 70px;
35+
padding-left: 5px;
36+
padding-right: 10px;
37+
height: 50px;
3738
}
3839

3940
.mx_MessageComposer .mx_MessageComposer_avatar img {
40-
margin-top: 18px;
41+
margin-top: 5px;
4142
border-radius: 20px;
4243
background-color: #dbdbdb;
4344
}
@@ -46,7 +47,7 @@ limitations under the License.
4647
display: table-cell;
4748
width: 100%;
4849
vertical-align: middle;
49-
height: 70px;
50+
height: 50px;
5051
}
5152

5253
.mx_MessageComposer_input textarea {
@@ -63,16 +64,12 @@ limitations under the License.
6364
box-shadow: none;
6465

6566
/* needed for FF */
66-
font-family: 'Myriad Pro', Helvetica, Arial, Sans-Serif;
67+
font-family: 'Lato', Helvetica, Arial, Sans-Serif;
6768
}
6869

6970
/* hack for FF as vertical alignment of custom placeholder text is broken */
7071
.mx_MessageComposer_input textarea::-moz-placeholder {
7172
line-height: 100%;
72-
color: #76cfa6;
73-
}
74-
.mx_MessageComposer_input textarea::-webkit-input-placeholder {
75-
color: #76cfa6;
7673
}
7774

7875
.mx_MessageComposer_upload {

‎src/skins/vector/css/molecules/RoomHeader.css‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ limitations under the License.
1818
}
1919

2020
.mx_RoomHeader_wrapper {
21-
max-width: 960px;
21+
max-width: 720px;
2222
margin: auto;
2323
height: 88px;
24-
border-bottom: 1px solid #eeeeee;
24+
border-bottom: 1px solid #a8dbf3;
2525

2626
display: -webkit-box;
2727
display: -moz-box;
@@ -47,7 +47,7 @@ limitations under the License.
4747
.mx_RoomHeader_textButton {
4848
height: 48px;
4949
margin-top: 18px;
50-
background-color: #76cfa6;
50+
background-color: #80cef4;
5151
border-radius: 48px;
5252
margin-right: 8px;
5353
color: #fff;
@@ -92,7 +92,7 @@ limitations under the License.
9292

9393
.mx_RoomHeader_simpleHeader {
9494
line-height: 88px;
95-
color: #76cfa6;
95+
color: #80cef4;
9696
font-weight: 400;
9797
font-size: 20px;
9898
overflow: hidden;
@@ -102,8 +102,8 @@ limitations under the License.
102102
.mx_RoomHeader_name {
103103
vertical-align: middle;
104104
height: 28px;
105-
color: #454545;
106-
font-weight: 800;
105+
color: #80cef4;
106+
font-weight: 400;
107107
font-size: 20px;
108108
padding-left: 16px;
109109
padding-right: 16px;
@@ -133,7 +133,7 @@ limitations under the License.
133133
vertical-align: bottom;
134134
float: left;
135135
max-height: 38px;
136-
color: #454545;
136+
color: #70b5d7;
137137
font-weight: 300;
138138
padding-left: 16px;
139139
padding-right: 16px;

‎src/skins/vector/css/molecules/RoomSettings.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ limitations under the License.
6161
font-weight: 400;
6262
font-size: 16px;
6363
color: #fff;
64-
background-color: #76cfa6;
64+
background-color: #80cef4;
6565
width: auto;
6666
margin: auto;
6767
padding: 6px;

‎src/skins/vector/css/molecules/RoomTile.css‎

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@ limitations under the License.
1717
.mx_RoomTile {
1818
cursor: pointer;
1919
display: table-row;
20-
font-size: 14px;
20+
color: #818794;
2121
}
2222

2323
.mx_RoomTile_avatar {
2424
display: table-cell;
25-
background: #eaf5f0;
26-
padding-right: 8px;
25+
padding-right: 10px;
2726
padding-top: 3px;
2827
padding-bottom: 3px;
29-
padding-left: 18px;
28+
padding-left: 10px;
3029
vertical-align: middle;
31-
width: 24px;
32-
height: 24px;
30+
width: 36px;
31+
height: 36px;
3332
position: relative;
3433
}
3534

@@ -44,8 +43,6 @@ limitations under the License.
4443
overflow: hidden;
4544
text-overflow: ellipsis;
4645
padding-right: 16px;
47-
color: #454545;
48-
opacity: 0.8;
4946
}
5047

5148
.collapsed .mx_RoomTile_name {
@@ -66,7 +63,7 @@ limitations under the License.
6663
}
6764
6865
.mx_RoomTile_badge {
69-
background-color: #76cfa6;
66+
background-color: #80cef4;
7067
color: #fff;
7168
border-radius: 26px;
7269
font-weight: 400;
@@ -78,7 +75,6 @@ limitations under the License.
7875
}
7976
*/
8077

81-
/*
8278
.mx_RoomTile_badge {
8379
background-color: #ff0064;
8480
border: 3px solid #fff;
@@ -89,37 +85,20 @@ limitations under the License.
8985
right: 9px;
9086
bottom: 3px;
9187
}
92-
*/
93-
94-
.mx_RoomTile_highlight .mx_RoomTile_sidebadge,
95-
.mx_RoomTile_unread .mx_RoomTile_sidebadge {
96-
background-color: #76cfa6;
97-
width: 4px;
98-
position: absolute;
99-
left: 0px;
100-
}
10188

10289
.mx_RoomTile_unread,
10390
.mx_RoomTile_highlight,
10491
.mx_RoomTile_invited
10592
{
10693
font-weight: bold;
94+
color: #000;
10795
}
10896

10997
.mx_RoomTile_selected {
98+
background-color: #f3f8fa;
99+
color: #80cef4;
110100
font-weight: bold;
111101
}
112102

113-
.mx_RoomTile.mx_RoomTile_selected {
114-
background: url('img/selected.png');
115-
background-repeat: no-repeat;
116-
background-position: right center;
117-
}
118-
119-
.mx_RoomTile_arrow {
120-
position: absolute;
121-
right: 0px;
122-
}
123-
124103
.mx_RoomTile:hover {
125104
}

0 commit comments

Comments
 (0)