gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tabs->spaces everywhere; sorry folks - \!blame sublime

This commit is contained in:
Matthew Hodgson 2015-07-14 12:11:01 +01:00
parent 69d1844773
commit dff9353339
11 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/trivial/index.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Matrix React SDK Example</title> <title>Matrix React SDK Example</title>
<link href='https://fonts.googleapis.com/css?family=Muli:300,400' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Muli:300,400' rel='stylesheet' type='text/css'>
</head> </head>
<body style="height: 100%;"> <body style="height: 100%;">
<section id="matrixchat" style="height: 100%;"></section> <section id="matrixchat" style="height: 100%;"></section>

8
skins/base/css/common.css
View File

@ -15,12 +15,12 @@ limitations under the License.
*/ */
body { body {
font-family: 'Muli', Helvetica, Arial, Sans-Serif; font-family: 'Muli', Helvetica, Arial, Sans-Serif;
font-weight: 300; font-weight: 300;
font-size: 15px; font-size: 15px;
color: #747474; color: #747474;
border: 0px; border: 0px;
margin: 0px; margin: 0px;
} }
div.error { div.error {

22
skins/base/css/molecules/MemberTile.css
View File

@ -20,23 +20,23 @@ limitations under the License.
} }
.mx_MemberTile_avatar { .mx_MemberTile_avatar {
display: table-cell; display: table-cell;
padding-right: 12px; padding-right: 12px;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
vertical-align: middle; vertical-align: middle;
width: 32px; width: 32px;
height: 32px; height: 32px;
} }
.mx_MemberTile_avatar img { .mx_MemberTile_avatar img {
border-radius: 16px; border-radius: 16px;
background-color: #dbdbdb; background-color: #dbdbdb;
} }
.mx_MemberTile_name { .mx_MemberTile_name {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }

32
skins/base/css/molecules/MessageComposer.css
View File

@ -25,27 +25,27 @@ limitations under the License.
} }
.mx_MessageComposer_row { .mx_MessageComposer_row {
display: table-row; display: table-row;
width: 100%; width: 100%;
height: 50px; height: 50px;
} }
.mx_MessageComposer .mx_MessageComposer_avatar { .mx_MessageComposer .mx_MessageComposer_avatar {
display: table-cell; display: table-cell;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
vertical-align: middle; vertical-align: middle;
width: 32px; width: 32px;
height: 32px; height: 32px;
} }
.mx_MessageComposer_input { .mx_MessageComposer_input {
display: table-cell; display: table-cell;
width: 100%; width: 100%;
padding-right: 1em; padding-right: 1em;
vertical-align: middle; vertical-align: middle;
} }
.mx_MessageComposer_input textarea { .mx_MessageComposer_input textarea {
@ -54,9 +54,9 @@ limitations under the License.
height: 1em; height: 1em;
border: 0px; border: 0px;
resize: none; resize: none;
outline: none; outline: none;
padding-top: 0.7em; padding-top: 0.7em;
padding-bottom: 0.7em; padding-bottom: 0.7em;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;

46
skins/base/css/molecules/MessageTile.css
View File

@ -15,52 +15,52 @@ limitations under the License.
*/ */
.mx_MessageTile { .mx_MessageTile {
max-width: 100%; max-width: 100%;
clear: both; clear: both;
margin-top: 32px; margin-top: 32px;
margin-left: 56px; margin-left: 56px;
} }
.mx_MessageTile_avatar { .mx_MessageTile_avatar {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
margin-left: -56px; margin-left: -56px;
margin-top: -7px; margin-top: -7px;
float: left; float: left;
} }
.mx_MessageTile_avatar img { .mx_MessageTile_avatar img {
background-color: #dbdbdb; background-color: #dbdbdb;
border-radius: 16px; border-radius: 16px;
border: 0px; border: 0px;
} }
.mx_MessageTile_continuation { .mx_MessageTile_continuation {
margin-top: 8px ! important; margin-top: 8px ! important;
} }
.mx_MessageTile_continuation .mx_MessageTile_avatar, .mx_MessageTile_continuation .mx_MessageTile_avatar,
.mx_MessageTile_continuation .mx_SenderProfile .mx_MessageTile_continuation .mx_SenderProfile
{ {
display: none ! important; display: none ! important;
} }
.mx_MessageTile .mx_SenderProfile { .mx_MessageTile .mx_SenderProfile {
color: #acacac; color: #acacac;
font-size: 13px; font-size: 13px;
margin-bottom: 4px; margin-bottom: 4px;
display: block; display: block;
} }
.mx_MessageTile .mx_MessageTimestamp { .mx_MessageTile .mx_MessageTimestamp {
color: #acacac; color: #acacac;
font-size: 13px; font-size: 13px;
float: right; float: right;
} }
.mx_MessageTile_content { .mx_MessageTile_content {
padding-right: 100px; padding-right: 100px;
display: block; display: block;
} }
.mx_MessageTile_sending { .mx_MessageTile_sending {

18
skins/base/css/molecules/RoomDropTarget.css
View File

@ -15,13 +15,13 @@ limitations under the License.
*/ */
.mx_RoomDropTarget { .mx_RoomDropTarget {
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
margin-left: -8px; margin-left: -8px;
margin-right: -8px; margin-right: -8px;
padding-top: 16px; padding-top: 16px;
padding-bottom: 16px; padding-bottom: 16px;
background-color: #fbfbfb; background-color: #fbfbfb;
border: 1px dashed #d7d7d7; border: 1px dashed #d7d7d7;
border-radius: 8px; border-radius: 8px;
} }

50
skins/base/css/molecules/RoomHeader.css
View File

@ -18,44 +18,44 @@ limitations under the License.
} }
.mx_RoomHeader_wrapper { .mx_RoomHeader_wrapper {
max-width: 720px; max-width: 720px;
margin: auto; margin: auto;
height: 50px; height: 50px;
} }
.mx_RoomHeader_leftRow { .mx_RoomHeader_leftRow {
display: table-row; display: table-row;
margin-left: 12px; margin-left: 12px;
height: 50px; height: 50px;
float: left; float: left;
} }
.mx_RoomHeader_rightRow { .mx_RoomHeader_rightRow {
display: table-row; display: table-row;
height: 50px; height: 50px;
margin-right: -26px; margin-right: -26px;
float: right; float: right;
} }
.mx_RoomHeader_name { .mx_RoomHeader_name {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
height: 50px; height: 50px;
font-weight: 400; font-weight: 400;
font-size: 20px; font-size: 20px;
padding-left: 16px; padding-left: 16px;
padding-right: 16px; padding-right: 16px;
} }
.mx_RoomHeader_avatar { .mx_RoomHeader_avatar {
display: table-cell; display: table-cell;
height: 50px; height: 50px;
vertical-align: middle; vertical-align: middle;
} }
.mx_RoomHeader_button { .mx_RoomHeader_button {
height: 50px; height: 50px;
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
padding-right: 16px; padding-right: 16px;
} }

44
skins/base/css/molecules/RoomTile.css
View File

@ -24,35 +24,35 @@ limitations under the License.
} }
.mx_RoomTile_avatar { .mx_RoomTile_avatar {
display: table-cell; display: table-cell;
padding-right: 12px; padding-right: 12px;
padding-top: 3px; padding-top: 3px;
padding-bottom: 3px; padding-bottom: 3px;
vertical-align: middle; vertical-align: middle;
width: 32px; width: 32px;
height: 32px; height: 32px;
border-radius: 16px; border-radius: 16px;
} }
.mx_RoomTile_name { .mx_RoomTile_name {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.mx_RoomTile_badge { .mx_RoomTile_badge {
float: right; float: right;
background-color: #d8d8d8; background-color: #d8d8d8;
color: #747474; color: #747474;
border-radius: 10px; border-radius: 10px;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;
line-height: 22px; line-height: 22px;
width: 34px; width: 34px;
height: 20px; height: 20px;
vertical-align: top; vertical-align: top;
text-align: center; text-align: center;
} }
.mx_RoomTile_unread { .mx_RoomTile_unread {

26
skins/base/css/organisms/MemberList.css
View File

@ -15,28 +15,28 @@ limitations under the License.
*/ */
.mx_MemberList { .mx_MemberList {
width: 100%; width: 100%;
height: 100%; height: 100%;
margin-bottom: 100px; margin-bottom: 100px;
} }
.mx_MemberList_chevron { .mx_MemberList_chevron {
position: absolute; position: absolute;
right: 20px; right: 20px;
margin-top: -5px; margin-top: -5px;
} }
.mx_MemberList_wrapper { .mx_MemberList_wrapper {
border: 1px solid #d8d8d8; border: 1px solid #d8d8d8;
margin: 8px; margin: 8px;
overflow-y: scroll; overflow-y: scroll;
height: auto; height: auto;
max-height: 75%; max-height: 75%;
border-radius: 8px; border-radius: 8px;
padding: 20px 24px 14px 24px; padding: 20px 24px 14px 24px;
table-layout: fixed; table-layout: fixed;
} }
.mx_MemberList h2 { .mx_MemberList h2 {
margin-top: 0px; margin-top: 0px;
} }

8
skins/base/css/organisms/RoomList.css
View File

@ -18,8 +18,8 @@ limitations under the License.
} }
.mx_RoomList_recents { .mx_RoomList_recents {
margin-top: -12px; margin-top: -12px;
display: table; display: table;
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
} }

42
src/linkify-matrix.js
View File

@ -20,11 +20,11 @@ var extend = require('./extend');
function matrixLinkify(linkify) { function matrixLinkify(linkify) {
// Text tokens // Text tokens
var TT = linkify.scanner.TOKENS; var TT = linkify.scanner.TOKENS;
var TextToken = TT.Base; var TextToken = TT.Base;
// Multi tokens // Multi tokens
var MT = linkify.parser.TOKENS; var MT = linkify.parser.TOKENS;
var MultiToken = MT.Base; var MultiToken = MT.Base;
var S_START = linkify.parser.start; var S_START = linkify.parser.start;
@ -35,12 +35,12 @@ function matrixLinkify(linkify) {
}; };
ROOMALIAS.prototype = new MultiToken(); ROOMALIAS.prototype = new MultiToken();
var S_HASH = new linkify.parser.State(); var S_HASH = new linkify.parser.State();
var S_HASH_NAME = new linkify.parser.State(); var S_HASH_NAME = new linkify.parser.State();
var S_HASH_NAME_COLON = new linkify.parser.State(); var S_HASH_NAME_COLON = new linkify.parser.State();
var S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State(); var S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
var S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); var S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
var S_ROOMALIAS = new linkify.parser.State(ROOMALIAS); var S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
var roomname_tokens = [ var roomname_tokens = [
TT.DOT, TT.DOT,
@ -50,10 +50,10 @@ function matrixLinkify(linkify) {
TT.TLD TT.TLD
]; ];
S_START.on(TT.POUND, S_HASH); S_START.on(TT.POUND, S_HASH);
S_HASH.on(roomname_tokens, S_HASH_NAME); S_HASH.on(roomname_tokens, S_HASH_NAME);
S_HASH_NAME.on(roomname_tokens, S_HASH_NAME); S_HASH_NAME.on(roomname_tokens, S_HASH_NAME);
S_HASH_NAME.on(TT.DOMAIN, S_HASH_NAME); S_HASH_NAME.on(TT.DOMAIN, S_HASH_NAME);
S_HASH_NAME.on(TT.COLON, S_HASH_NAME_COLON); S_HASH_NAME.on(TT.COLON, S_HASH_NAME_COLON);
@ -71,12 +71,12 @@ function matrixLinkify(linkify) {
}; };
USERID.prototype = new MultiToken(); USERID.prototype = new MultiToken();
var S_AT = new linkify.parser.State(); var S_AT = new linkify.parser.State();
var S_AT_NAME = new linkify.parser.State(); var S_AT_NAME = new linkify.parser.State();
var S_AT_NAME_COLON = new linkify.parser.State(); var S_AT_NAME_COLON = new linkify.parser.State();
var S_AT_NAME_COLON_DOMAIN = new linkify.parser.State(); var S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
var S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); var S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
var S_USERID = new linkify.parser.State(USERID); var S_USERID = new linkify.parser.State(USERID);
var username_tokens = [ var username_tokens = [
TT.DOT, TT.DOT,
@ -86,10 +86,10 @@ function matrixLinkify(linkify) {
TT.TLD TT.TLD
]; ];
S_START.on(TT.AT, S_AT); S_START.on(TT.AT, S_AT);
S_AT.on(username_tokens, S_AT_NAME); S_AT.on(username_tokens, S_AT_NAME);
S_AT_NAME.on(username_tokens, S_AT_NAME); S_AT_NAME.on(username_tokens, S_AT_NAME);
S_AT_NAME.on(TT.DOMAIN, S_AT_NAME); S_AT_NAME.on(TT.DOMAIN, S_AT_NAME);
S_AT_NAME.on(TT.COLON, S_AT_NAME_COLON); S_AT_NAME.on(TT.COLON, S_AT_NAME_COLON);