nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into matthew/homepages

Browse Source 
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
This commit is contained in:
Luke Barnard
2017-02-01 11:34:24 +00:00
parent 3155d79a7e 6369d76a74
commit 1f3ab4425a
178 changed files with 3223 additions and 1151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/skins/vector/css/vector-web/structures/CompatibilityPage.css → src/skins/vector/css/vector-web/structures/_CompatibilityPage.scss
View File

15
src/skins/vector/css/vector-web/structures/LeftPanel.css → src/skins/vector/css/vector-web/structures/_LeftPanel.scss
View File

@@ -17,13 +17,8 @@ limitations under the License.
.mx_LeftPanel {
position: relative;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
flex-direction: column;
-webkit-flex-direction: column;
}
.mx_LeftPanel_hideButton {
@@ -39,13 +34,8 @@ limitations under the License.
}
.mx_LeftPanel .mx_RoomList_scrollbar {
-webkit-box-ordinal-group: 1;
-moz-box-ordinal-group: 1;
-ms-flex-order: 1;
-webkit-order: 1;
order: 1;
-webkit-flex: 1 1 0;
flex: 1 1 0;
overflow-y: auto;
@@ -57,16 +47,11 @@ limitations under the License.
}
.mx_LeftPanel .mx_BottomLeftMenu {
-webkit-box-ordinal-group: 3;
-moz-box-ordinal-group: 3;
-ms-flex-order: 3;
-webkit-order: 3;
order: 3;
border-top: 1px solid rgba(118, 207, 166, 0.2);
margin-left: 16px; /* gutter */
margin-right: 16px; /* gutter */
-webkit-flex: 0 0 60px;
flex: 0 0 60px;
z-index: 1;
}

33
src/skins/vector/css/vector-web/structures/RightPanel.css → src/skins/vector/css/vector-web/structures/_RightPanel.scss
View File

@@ -17,26 +17,16 @@ limitations under the License.
.mx_RightPanel {
position: relative;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
flex-direction: column;
-webkit-flex-direction: column;
}
.mx_RightPanel_header {
-webkit-box-ordinal-group: 1;
-moz-box-ordinal-group: 1;
-ms-flex-order: 1;
-webkit-order: 1;
order: 1;
border-bottom: 1px solid #e5e5e5;
border-bottom: 1px solid $primary-hairline-color;
margin-right: 20px;
-webkit-flex: 0 0 70px;
flex: 0 0 70px;
}
@@ -45,7 +35,7 @@ limitations under the License.
.mx_RightPanel_headerButtonGroup {
margin-top: 6px;
float: left;
background-color: #fff;
background-color: $primary-bg-color;
margin-left: 0px;
}
@@ -68,12 +58,13 @@ limitations under the License.
width: 25px;
height: 5px;
border-radius: 5px;
background-color: rgba(118, 207, 166, 0.2);
background-color: $accent-color;
opacity: 0.2;
}
.mx_RightPanel_headerButton_badge {
font-size: 11px;
color: #76cfa6;
color: $accent-color;
font-weight: bold;
padding-bottom: 2px;
}
@@ -81,33 +72,23 @@ limitations under the License.
.mx_RightPanel .mx_MemberList,
.mx_RightPanel .mx_MemberInfo,
.mx_RightPanel_blank {
-webkit-box-ordinal-group: 2;
-moz-box-ordinal-group: 2;
-ms-flex-order: 2;
-webkit-order: 2;
order: 2;
flex: 1 1 0;
-webkit-flex: 1 1 0;
}
.mx_RightPanel_footer {
-webkit-box-ordinal-group: 3;
-moz-box-ordinal-group: 3;
-ms-flex-order: 3;
-webkit-order: 3;
order: 3;
border-top: 1px solid #e5e5e5;
border-top: 1px solid $primary-hairline-color;
margin-right: 20px;
-webkit-flex: 0 0 60px;
flex: 0 0 60px;
}
.mx_RightPanel_footer .mx_RightPanel_invite {
line-height: 35px;
font-size: 14px;
color: #4A4A4A;
color: $primary-fg-color;
padding-top: 13px;
padding-left: 5px;
cursor: pointer;

23
src/skins/vector/css/vector-web/structures/RoomDirectory.css → src/skins/vector/css/vector-web/structures/_RoomDirectory.scss
View File

@@ -20,35 +20,23 @@ limitations under the License.
margin-left: auto;
margin-right: auto;
margin-bottom: 12px;
color: #4a4a4a;
color: $primary-fg-color;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
flex-direction: column;
-webkit-flex-direction: column;
}
.mx_RoomDirectory_list {
-webkit-flex: 1;
flex: 1;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
flex-direction: column;
-webkit-flex-direction: column;
}
.mx_RoomDirectory_list .mx_RoomView_messageListWrapper {
justify-content: flex-start;
-webkit-justify-content: flex-start;
}
.mx_RoomDirectory_listheader {
@@ -72,13 +60,12 @@ limitations under the License.
.mx_RoomDirectory_tableWrapper {
overflow-y: auto;
-webkit-flex: 1 1 0;
flex: 1 1 0;
}
.mx_RoomDirectory_table {
font-size: 14px;
color: #4a4a4a;
color: $primary-fg-color;
width: 100%;
text-align: left;
table-layout: fixed;
@@ -110,11 +97,11 @@ limitations under the License.
padding-right: 5px;
height: 15px;
border-radius: 11px;
background-color: #eaf5f0;
background-color: $plinth-bg-color;
text-transform: uppercase;
font-weight: 600;
font-size: 11px;
color: #61c295;
color: $accent-color;
}
.mx_RoomDirectory_topic {
@@ -123,7 +110,7 @@ limitations under the License.
.mx_RoomDirectory_alias {
font-size: 12px;
color: #b3b3b3;
color: $settings-grey-fg-color;
}
.mx_RoomDirectory_roomMemberCount {

36
src/skins/vector/css/vector-web/structures/RoomSubList.css → src/skins/vector/css/vector-web/structures/_RoomSubList.scss
View File

@@ -29,7 +29,7 @@ limitations under the License.
.mx_RoomSubList_label {
position: relative;
text-transform: uppercase;
color: #3d3b39;
color: $roomsublist-label-fg-color;
font-weight: 600;
font-size: 12px;
width: 203px; /* padding + width = LHS Panel width */
@@ -39,8 +39,8 @@ limitations under the License.
padding-top: 6px;
padding-bottom: 6px;
cursor: pointer;
background-color: #d3efe1;
border-top: solid 2px #eaf5f0;
background-color: $roomsublist-label-bg-color;
border-top: solid 2px $secondary-accent-color;
}
.mx_RoomSubList_label.mx_RoomSubList_fixed {
@@ -63,7 +63,7 @@ limitations under the License.
display: inline-block;
font-size: 12px;
font-weight: normal;
color: #76cfa6;
color: $accent-color;
padding-left: 5px;
text-transform: none;
}
@@ -80,14 +80,14 @@ limitations under the License.
right: 8px; /*gutter */
top: 7px;
border-radius: 8px;
color: #fff;
color: $accent-fg-color;
font-weight: 600;
font-size: 10px;
text-align: center;
padding-top: 1px;
padding-left: 4px;
padding-right: 4px;
background-color: #76cfa6;
background-color: $accent-color;
}
/*
@@ -97,7 +97,7 @@ limitations under the License.
*/
.mx_RoomSubList_badgeHighlight {
background-color: #ff0064;
background-color: $warning-color;
}
/* This is the bottom of the speech bubble */
@@ -108,7 +108,7 @@ limitations under the License.
width: 0;
height: 0;
margin-left: 5px;
border-top: 5px solid #ff0064;
border-top: 5px solid $warning-color;
border-right: 7px solid transparent;
}
@@ -129,7 +129,7 @@ limitations under the License.
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 6px solid #76cfa6;
border-top: 6px solid $accent-color;
}
.mx_RoomSubList_chevronUp {
@@ -137,14 +137,14 @@ limitations under the License.
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 6px solid #76cfa6;
border-bottom: 6px solid $accent-color;
}
.mx_RoomSubList_chevronRight {
width: 0;
height: 0;
border-top: 5px solid transparent;
border-left: 6px solid #76cfa6;
border-left: 6px solid $accent-color;
border-bottom: 5px solid transparent;
}
@@ -165,7 +165,7 @@ limitations under the License.
.mx_RoomSubList_line {
display: inline-block;
width: 159px;
border-top: dotted 2px #76cfa6;
border-top: dotted 2px $accent-color;
vertical-align: middle;
}
@@ -179,7 +179,7 @@ limitations under the License.
font-size: 10px;
font-weight: 600;
text-align: left;
color: #76cfa6;
color: $accent-color;
padding-left: 7px;
padding-right: 7px;
padding-left: 7px;
@@ -198,20 +198,20 @@ limitations under the License.
right: 8px; /*gutter */
top: -2px;
border-radius: 8px;
border: solid 1px #76cfa6;
color: #fff;
border: solid 1px $accent-color;
color: $accent-fg-color;
font-weight: 600;
font-size: 10px;
text-align: center;
padding-top: 1px;
padding-left: 3px;
padding-right: 3px;
background-color: #fff;
background-color: $primary-bg-color;
vertical-align: middle;
}
.mx_RoomSubList_moreBadge.mx_RoomSubList_moreBadgeNotify {
background-color: #76cfa6;
background-color: $accent-color;
border: 0;
padding-top: 3px;
padding-left: 4px;
@@ -219,7 +219,7 @@ limitations under the License.
}
.mx_RoomSubList_moreBadge.mx_RoomSubList_moreBadgeHighlight {
background-color: #ff0064;
background-color: $warning-color;
border: 0;
padding-top: 3px;
padding-left: 4px;

0
src/skins/vector/css/vector-web/structures/ViewSource.css → src/skins/vector/css/vector-web/structures/_ViewSource.scss
View File