Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into kegan/vector-components

Browse Source
This commit is contained in:
Kegan Dougal 2015-12-01 15:39:02 +00:00
commit e07c03a7bb
23 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/RoomDNDView.js
View File

@ -68,7 +68,7 @@ var roomTileSource = {
if (monitor.didDrop() && item.targetList.props.editable) { if (monitor.didDrop() && item.targetList.props.editable) {
// if we moved lists, remove the old tag // if we moved lists, remove the old tag
if (item.targetList !== item.originalList) { if (item.targetList !== item.originalList && item.originalList.props.tagName) {
// commented out attempts to set a spinner on our target component as component is actually // commented out attempts to set a spinner on our target component as component is actually
// the original source component being dragged, not our target. To fix we just need to // the original source component being dragged, not our target. To fix we just need to
// move all of this to endDrop in the target instead. FIXME later. // move all of this to endDrop in the target instead. FIXME later.

10
src/skins/vector/css/atoms/ImageView.css
View File

@ -87,13 +87,13 @@ limitations under the License.
} }
.mx_ImageView_name { .mx_ImageView_name {
font-size: 20px; font-size: 18px;
margin-bottom: 6px; margin-bottom: 6px;
pointer-events: all; pointer-events: all;
} }
.mx_ImageView_metadata { .mx_ImageView_metadata {
font-size: 16px; font-size: 15px;
opacity: 0.5; opacity: 0.5;
pointer-events: all; pointer-events: all;
} }
@ -105,13 +105,13 @@ limitations under the License.
margin-bottom: 6px; margin-bottom: 6px;
border-radius: 5px; border-radius: 5px;
background-color: #454545; background-color: #454545;
font-size: 16px; font-size: 14px;
padding: 9px; padding: 9px;
border: 1px solid #fff; border: 1px solid #fff;
} }
.mx_ImageView_size { .mx_ImageView_size {
font-size: 12px; font-size: 11px;
} }
.mx_ImageView_link { .mx_ImageView_link {
@ -121,7 +121,7 @@ limitations under the License.
.mx_ImageView_button { .mx_ImageView_button {
pointer-events: all; pointer-events: all;
font-size: 16px; font-size: 15px;
opacity: 0.5; opacity: 0.5;
margin-top: 18px; margin-top: 18px;
cursor: pointer; cursor: pointer;

2
src/skins/vector/css/atoms/MemberAvatar.css
View File

@ -20,6 +20,7 @@ limitations under the License.
.mx_MemberAvatar_initial { .mx_MemberAvatar_initial {
position: absolute; position: absolute;
z-index: 1;
color: #fff; color: #fff;
text-align: center; text-align: center;
speak: none; speak: none;
@ -28,4 +29,5 @@ limitations under the License.
.mx_MemberAvatar_image { .mx_MemberAvatar_image {
border-radius: 20px; border-radius: 20px;
vertical-align: top;
} }

1
src/skins/vector/css/atoms/RoomAvatar.css
View File

@ -15,6 +15,7 @@ limitations under the License.
*/ */
.mx_RoomAvatar { .mx_RoomAvatar {
vertical-align: middle;
} }
.mx_RoomAvatar_initial { .mx_RoomAvatar_initial {

16
src/skins/vector/css/common.css
View File

@ -22,13 +22,13 @@ html {
} }
body { body {
/* Myriad Pro lacks combining diacritics, so these will fall through /* Open Sans lacks combining diacritics, so these will fall through
to the next font. Helevetica's diacritics however do not combine to the next font. Helevetica's diacritics however do not combine
nicely with Myriad Pro (on OSX, at least) and result in a huge nicely with Open Sans (on OSX, at least) and result in a huge
horizontal mess. Arial empirically gets it right, hence prioritising horizontal mess. Arial empirically gets it right, hence prioritising
Arial here. */ Arial here. */
font-family: 'Myriad Pro', Arial, Helvetica, Sans-Serif; font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
font-size: 16px; font-size: 15px;
color: #454545; color: #454545;
border: 0px; border: 0px;
margin: 0px; margin: 0px;
@ -41,7 +41,7 @@ div.error {
h2 { h2 {
color: #454545; color: #454545;
font-weight: 400; font-weight: 400;
font-size: 20px; font-size: 18px;
margin-top: 16px; margin-top: 16px;
margin-bottom: 16px; margin-bottom: 16px;
} }
@ -129,7 +129,7 @@ a:visited {
text-align: center; text-align: center;
z-index: 4010; z-index: 4010;
font-weight: 300; font-weight: 300;
font-size: 16px; font-size: 15px;
position: relative; position: relative;
border-radius: 8px; border-radius: 8px;
max-width: 80%; max-width: 80%;
@ -172,7 +172,7 @@ a:visited {
height: 36px; height: 36px;
border-radius: 36px; border-radius: 36px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 15px;
color: #fff; color: #fff;
background-color: #76cfa6; background-color: #76cfa6;
margin-left: 8px; margin-left: 8px;
@ -187,6 +187,6 @@ a:visited {
padding: 12px; padding: 12px;
border-bottom: 1px solid #a4a4a4; border-bottom: 1px solid #a4a4a4;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 18px;
line-height: 1.4; line-height: 1.4;
} }

14
src/skins/vector/css/molecules/EventTile.css
View File

@ -25,9 +25,10 @@ limitations under the License.
padding-left: 18px; padding-left: 18px;
padding-right: 12px; padding-right: 12px;
margin-left: -73px; margin-left: -73px;
margin-top: -4px; margin-top: -2px;
float: left; float: left;
position: relative; position: relative;
top: 0px;
} }
.mx_EventTile_avatar img { .mx_EventTile_avatar img {
@ -42,7 +43,7 @@ limitations under the License.
.mx_EventTile .mx_SenderProfile { .mx_EventTile .mx_SenderProfile {
color: #454545; color: #454545;
opacity: 0.5; opacity: 0.5;
font-size: 14px; font-size: 13px;
margin-bottom: 4px; margin-bottom: 4px;
display: block; display: block;
overflow-y: hidden; overflow-y: hidden;
@ -50,7 +51,7 @@ limitations under the License.
.mx_EventTile .mx_MessageTimestamp { .mx_EventTile .mx_MessageTimestamp {
color: #acacac; color: #acacac;
font-size: 12px; font-size: 11px;
} }
.mx_EventTile_line { .mx_EventTile_line {
@ -74,6 +75,7 @@ limitations under the License.
font-family: inherit ! important; font-family: inherit ! important;
white-space: normal ! important; white-space: normal ! important;
line-height: inherit ! important; line-height: inherit ! important;
font-size: 15px;
} }
.mx_MessageTile_content .markdown-body h1, .mx_MessageTile_content .markdown-body h1,
@ -111,7 +113,9 @@ limitations under the License.
color: #ddd; color: #ddd;
} }
.mx_EventTile_highlight { .mx_EventTile_highlight,
.mx_EventTile_highlight .markdown-body
{
color: #FF0064; color: #FF0064;
} }
@ -175,6 +179,6 @@ limitations under the License.
.mx_EventTile_readAvatarRemainder { .mx_EventTile_readAvatarRemainder {
color: #acacac; color: #acacac;
font-size: 12px; font-size: 11px;
position: absolute; position: absolute;
} }

4
src/skins/vector/css/molecules/MemberInfo.css
View File

@ -38,7 +38,7 @@ limitations under the License.
.mx_MemberInfo_profileField { .mx_MemberInfo_profileField {
font-color: #999999; font-color: #999999;
font-size: 14px; font-size: 13px;
position: relative; position: relative;
background-color: #fff; background-color: #fff;
} }
@ -51,7 +51,7 @@ limitations under the License.
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;
text-align: center; text-align: center;
font-size: 12px; font-size: 11px;
background-color: #888; background-color: #888;
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;

8
src/skins/vector/css/molecules/MemberTile.css
View File

@ -25,8 +25,8 @@ limitations under the License.
display: table-cell; display: table-cell;
padding-left: 3px; padding-left: 3px;
padding-right: 12px; padding-right: 12px;
padding-top: 2px; padding-top: 4px;
padding-bottom: 0px; padding-bottom: 4px;
vertical-align: middle; vertical-align: middle;
width: 36px; width: 36px;
height: 36px; height: 36px;
@ -55,13 +55,13 @@ limitations under the License.
} }
.mx_MemberTile_userId { .mx_MemberTile_userId {
font-size: 14px; font-size: 13px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.mx_MemberTile_presence { .mx_MemberTile_presence {
font-size: 12px; font-size: 11px;
opacity: 0.5; opacity: 0.5;
} }

2
src/skins/vector/css/molecules/MessageComposer.css
View File

@ -59,7 +59,7 @@ limitations under the License.
box-shadow: none; box-shadow: none;
/* needed for FF */ /* needed for FF */
font-family: 'Myriad Pro', Arial, Helvetica, Sans-Serif; font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
} }
/* hack for FF as vertical alignment of custom placeholder text is broken */ /* hack for FF as vertical alignment of custom placeholder text is broken */

2
src/skins/vector/css/molecules/RoomDropTarget.css
View File

@ -15,7 +15,7 @@ limitations under the License.
*/ */
.mx_RoomDropTarget { .mx_RoomDropTarget {
font-size: 14px; font-size: 13px;
margin-left: 10px; margin-left: 10px;
margin-right: 15px; margin-right: 15px;
padding-top: 5px; padding-top: 5px;

6
src/skins/vector/css/molecules/RoomHeader.css
View File

@ -91,7 +91,7 @@ limitations under the License.
.mx_RoomHeader_simpleHeader { .mx_RoomHeader_simpleHeader {
line-height: 83px; line-height: 83px;
color: #454545; color: #454545;
font-size: 24px; font-size: 22px;
font-weight: bold; font-weight: bold;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -103,7 +103,7 @@ limitations under the License.
height: 28px; height: 28px;
color: #454545; color: #454545;
font-weight: bold; font-weight: bold;
font-size: 24px; font-size: 22px;
padding-left: 19px; padding-left: 19px;
padding-right: 16px; padding-right: 16px;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -141,7 +141,7 @@ limitations under the License.
width: 260px; width: 260px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
font-weight: 300; font-weight: 300;
font-size: 14px; font-size: 13px;
padding: 9px; padding: 9px;
} }

4
src/skins/vector/css/molecules/RoomSettings.css
View File

@ -39,7 +39,7 @@ limitations under the License.
border-radius: 3px; border-radius: 3px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
font-weight: 300; font-weight: 300;
font-size: 14px; font-size: 13px;
padding: 9px; padding: 9px;
margin-top: 6px; margin-top: 6px;
} }
@ -59,7 +59,7 @@ limitations under the License.
height: 36px; height: 36px;
border-radius: 36px; border-radius: 36px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 15px;
color: #fff; color: #fff;
background-color: #76cfa6; background-color: #76cfa6;
width: auto; width: auto;

8
src/skins/vector/css/molecules/RoomTile.css
View File

@ -18,19 +18,19 @@ limitations under the License.
cursor: pointer; cursor: pointer;
/* This fixes wrapping of long room names, but breaks drag & drop previews */ /* This fixes wrapping of long room names, but breaks drag & drop previews */
/* display: table-row; */ /* display: table-row; */
font-size: 14px; font-size: 13px;
} }
.mx_RoomTile_avatar { .mx_RoomTile_avatar {
display: table-cell; display: table-cell;
padding-right: 8px; padding-right: 8px;
padding-top: 4px; padding-top: 6px;
padding-bottom: 2px; padding-bottom: 6px;
padding-left: 18px; padding-left: 18px;
vertical-align: middle;
width: 24px; width: 24px;
height: 24px; height: 24px;
position: relative; position: relative;
vertical-align: middle;
} }
.mx_RoomTile_avatar img { .mx_RoomTile_avatar img {

4
src/skins/vector/css/molecules/SearchBar.css
View File

@ -25,7 +25,7 @@ limitations under the License.
display: inline block; display: inline block;
border-radius: 3px; border-radius: 3px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
font-size: 16px; font-size: 15px;
padding: 9px; padding: 9px;
padding-left: 11px; padding-left: 11px;
margin-right: 17px; margin-right: 17px;
@ -38,7 +38,7 @@ limitations under the License.
border: 0px; border: 0px;
border-radius: 36px; border-radius: 36px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 15px;
color: #fff; color: #fff;
background-color: #76cfa6; background-color: #76cfa6;
width: auto; width: auto;

2
src/skins/vector/css/molecules/ServerConfig.css
View File

@ -25,7 +25,7 @@ limitations under the License.
.mx_ServerConfig_help:link { .mx_ServerConfig_help:link {
opacity: 0.8; opacity: 0.8;
font-size: 14px; font-size: 13px;
font-weight: 300; font-weight: 300;
color: #4a4a4a; color: #4a4a4a;
} }

2
src/skins/vector/css/organisms/CreateRoom.css
View File

@ -26,7 +26,7 @@ limitations under the License.
border-radius: 3px; border-radius: 3px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
font-weight: 300; font-weight: 300;
font-size: 14px; font-size: 13px;
padding: 9px; padding: 9px;
margin-top: 6px; margin-top: 6px;
} }

3
src/skins/vector/css/organisms/LeftPanel.css
View File

@ -69,11 +69,12 @@ limitations under the License.
} }
.mx_LeftPanel .mx_BottomLeftMenu .mx_BottomLeftMenu_options { .mx_LeftPanel .mx_BottomLeftMenu .mx_BottomLeftMenu_options {
margin-top: 17px; margin-top: 15px;
width: 100%; width: 100%;
} }
.mx_LeftPanel .mx_BottomLeftMenu img { .mx_LeftPanel .mx_BottomLeftMenu img {
border-radius: 0px; border-radius: 0px;
background-color: transparent; background-color: transparent;
vertical-align: middle;
} }

6
src/skins/vector/css/organisms/MemberList.css
View File

@ -45,13 +45,13 @@ limitations under the License.
} }
.mx_MemberList_invite { .mx_MemberList_invite {
font-family: 'Myriad Pro', Arial, Helvetica, Sans-Serif; font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
border-radius: 3px; border-radius: 3px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
padding: 9px; padding: 9px;
color: #454545; color: #454545;
margin-left: 3px; margin-left: 3px;
font-size: 16px; font-size: 15px;
margin-bottom: 8px; margin-bottom: 8px;
width: 180px; width: 180px;
} }
@ -69,7 +69,7 @@ limitations under the License.
text-transform: uppercase; text-transform: uppercase;
color: #3d3b39; color: #3d3b39;
font-weight: 600; font-weight: 600;
font-size: 14px; font-size: 13px;
padding-left: 3px; padding-left: 3px;
padding-right: 12px; padding-right: 12px;
margin-top: 8px; margin-top: 8px;

2
src/skins/vector/css/organisms/RightPanel.css
View File

@ -66,7 +66,7 @@ limitations under the License.
.mx_RightPanel_headerButton_badge { .mx_RightPanel_headerButton_badge {
position: absolute; position: absolute;
top: 5px; top: 4px;
left: 28px; left: 28px;
font-size: 12px; font-size: 12px;
background-color: #76cfa6; background-color: #76cfa6;

7
src/skins/vector/css/organisms/RoomDirectory.css
View File

@ -50,7 +50,7 @@ limitations under the License.
border-radius: 3px; border-radius: 3px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
font-weight: 300; font-weight: 300;
font-size: 14px; font-size: 13px;
padding: 9px; padding: 9px;
margin-top: 12px; margin-top: 12px;
margin-bottom: 12px; margin-bottom: 12px;
@ -70,7 +70,7 @@ limitations under the License.
.mx_RoomDirectory_table th { .mx_RoomDirectory_table th {
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: 11px;
} }
.mx_RoomDirectory_table tbody { .mx_RoomDirectory_table tbody {
@ -79,7 +79,6 @@ limitations under the License.
.mx_RoomDirectory_table td { .mx_RoomDirectory_table td {
font-weight: 300; font-weight: 300;
font-size: 16px;
overflow-x: hidden; overflow-x: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
@ -90,7 +89,7 @@ limitations under the License.
.mx_RoomDirectory_table .mx_RoomDirectory_topic { .mx_RoomDirectory_table .mx_RoomDirectory_topic {
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: 11px;
} }
.mx_RoomDirectory_table td, .mx_RoomDirectory_table td,

2
src/skins/vector/css/organisms/RoomSubList.css
View File

@ -29,7 +29,7 @@ limitations under the License.
text-transform: uppercase; text-transform: uppercase;
color: #3d3b39; color: #3d3b39;
font-weight: 600; font-weight: 600;
font-size: 14px; font-size: 13px;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
margin-top: 8px; margin-top: 8px;

2
src/skins/vector/css/organisms/RoomView.css
View File

@ -204,7 +204,7 @@ limitations under the License.
.mx_RoomView_connectionLostBar_desc { .mx_RoomView_connectionLostBar_desc {
color: #454545; color: #454545;
font-size: 14px; font-size: 13px;
opacity: 0.5; opacity: 0.5;
} }

10
src/skins/vector/css/templates/Login.css
View File

@ -55,7 +55,7 @@ limitations under the License.
border-radius: 3px; border-radius: 3px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
font-weight: 300; font-weight: 300;
font-size: 14px; font-size: 13px;
padding: 9px; padding: 9px;
margin-bottom: 14px; margin-bottom: 14px;
} }
@ -68,12 +68,12 @@ limitations under the License.
height: 40px; height: 40px;
border: 0px; border: 0px;
background-color: #76cfa6; background-color: #76cfa6;
font-size: 16px; font-size: 15px;
color: #fff; color: #fff;
} }
.mx_Login_label { .mx_Login_label {
font-size: 14px; font-size: 13px;
opacity: 0.8; opacity: 0.8;
} }
@ -85,7 +85,7 @@ limitations under the License.
display: block; display: block;
text-align: center; text-align: center;
width: 100%; width: 100%;
font-size: 14px; font-size: 13px;
opacity: 0.8; opacity: 0.8;
} }
@ -97,7 +97,7 @@ limitations under the License.
display: block; display: block;
text-align: center; text-align: center;
width: 100%; width: 100%;
font-size: 14px; font-size: 13px;
opacity: 0.8; opacity: 0.8;
} }