From dff93533399bd05251b30571c06c1e35169f8790 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 14 Jul 2015 12:11:01 +0100 Subject: [PATCH] tabs->spaces everywhere; sorry folks - \!blame sublime --- examples/trivial/index.html | 2 +- skins/base/css/common.css | 8 ++-- skins/base/css/molecules/MemberTile.css | 22 ++++----- skins/base/css/molecules/MessageComposer.css | 32 ++++++------- skins/base/css/molecules/MessageTile.css | 46 +++++++++--------- skins/base/css/molecules/RoomDropTarget.css | 18 +++---- skins/base/css/molecules/RoomHeader.css | 50 ++++++++++---------- skins/base/css/molecules/RoomTile.css | 44 ++++++++--------- skins/base/css/organisms/MemberList.css | 26 +++++----- skins/base/css/organisms/RoomList.css | 8 ++-- src/linkify-matrix.js | 42 ++++++++-------- 11 files changed, 149 insertions(+), 149 deletions(-) diff --git a/examples/trivial/index.html b/examples/trivial/index.html index e30a978ada..502c8605a6 100644 --- a/examples/trivial/index.html +++ b/examples/trivial/index.html @@ -3,7 +3,7 @@ Matrix React SDK Example - +
diff --git a/skins/base/css/common.css b/skins/base/css/common.css index 7fe0bca6c9..ba2f4eab61 100644 --- a/skins/base/css/common.css +++ b/skins/base/css/common.css @@ -15,12 +15,12 @@ limitations under the License. */ body { - font-family: 'Muli', Helvetica, Arial, Sans-Serif; + font-family: 'Muli', Helvetica, Arial, Sans-Serif; font-weight: 300; font-size: 15px; - color: #747474; - border: 0px; - margin: 0px; + color: #747474; + border: 0px; + margin: 0px; } div.error { diff --git a/skins/base/css/molecules/MemberTile.css b/skins/base/css/molecules/MemberTile.css index efe59984c6..6c58444864 100644 --- a/skins/base/css/molecules/MemberTile.css +++ b/skins/base/css/molecules/MemberTile.css @@ -20,23 +20,23 @@ limitations under the License. } .mx_MemberTile_avatar { - display: table-cell; - padding-right: 12px; - padding-top: 3px; - padding-bottom: 3px; - vertical-align: middle; - width: 32px; - height: 32px; + display: table-cell; + padding-right: 12px; + padding-top: 3px; + padding-bottom: 3px; + vertical-align: middle; + width: 32px; + height: 32px; } .mx_MemberTile_avatar img { - border-radius: 16px; - background-color: #dbdbdb; + border-radius: 16px; + background-color: #dbdbdb; } .mx_MemberTile_name { - display: table-cell; - vertical-align: middle; + display: table-cell; + vertical-align: middle; overflow: hidden; text-overflow: ellipsis; } diff --git a/skins/base/css/molecules/MessageComposer.css b/skins/base/css/molecules/MessageComposer.css index 9ef77ba5e7..1b0e4d7508 100644 --- a/skins/base/css/molecules/MessageComposer.css +++ b/skins/base/css/molecules/MessageComposer.css @@ -25,27 +25,27 @@ limitations under the License. } .mx_MessageComposer_row { - display: table-row; - width: 100%; - height: 50px; + display: table-row; + width: 100%; + height: 50px; } .mx_MessageComposer .mx_MessageComposer_avatar { - display: table-cell; - padding-left: 12px; - padding-right: 12px; - padding-top: 3px; - padding-bottom: 3px; - vertical-align: middle; - width: 32px; - height: 32px; + display: table-cell; + padding-left: 12px; + padding-right: 12px; + padding-top: 3px; + padding-bottom: 3px; + vertical-align: middle; + width: 32px; + height: 32px; } .mx_MessageComposer_input { - display: table-cell; + display: table-cell; width: 100%; padding-right: 1em; - vertical-align: middle; + vertical-align: middle; } .mx_MessageComposer_input textarea { @@ -54,9 +54,9 @@ limitations under the License. height: 1em; border: 0px; resize: none; - outline: none; - padding-top: 0.7em; - padding-bottom: 0.7em; + outline: none; + padding-top: 0.7em; + padding-bottom: 0.7em; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; diff --git a/skins/base/css/molecules/MessageTile.css b/skins/base/css/molecules/MessageTile.css index 6fccd49315..82bfad0598 100644 --- a/skins/base/css/molecules/MessageTile.css +++ b/skins/base/css/molecules/MessageTile.css @@ -15,52 +15,52 @@ limitations under the License. */ .mx_MessageTile { - max-width: 100%; - clear: both; - margin-top: 32px; - margin-left: 56px; + max-width: 100%; + clear: both; + margin-top: 32px; + margin-left: 56px; } .mx_MessageTile_avatar { - padding-left: 12px; - padding-right: 12px; - margin-left: -56px; - margin-top: -7px; - float: left; + padding-left: 12px; + padding-right: 12px; + margin-left: -56px; + margin-top: -7px; + float: left; } .mx_MessageTile_avatar img { - background-color: #dbdbdb; - border-radius: 16px; - border: 0px; + background-color: #dbdbdb; + border-radius: 16px; + border: 0px; } .mx_MessageTile_continuation { - margin-top: 8px ! important; + margin-top: 8px ! important; } .mx_MessageTile_continuation .mx_MessageTile_avatar, .mx_MessageTile_continuation .mx_SenderProfile { - display: none ! important; + display: none ! important; } .mx_MessageTile .mx_SenderProfile { - color: #acacac; - font-size: 13px; - margin-bottom: 4px; - display: block; + color: #acacac; + font-size: 13px; + margin-bottom: 4px; + display: block; } .mx_MessageTile .mx_MessageTimestamp { - color: #acacac; - font-size: 13px; - float: right; + color: #acacac; + font-size: 13px; + float: right; } .mx_MessageTile_content { - padding-right: 100px; - display: block; + padding-right: 100px; + display: block; } .mx_MessageTile_sending { diff --git a/skins/base/css/molecules/RoomDropTarget.css b/skins/base/css/molecules/RoomDropTarget.css index 946b409120..a30d7b4659 100644 --- a/skins/base/css/molecules/RoomDropTarget.css +++ b/skins/base/css/molecules/RoomDropTarget.css @@ -15,13 +15,13 @@ limitations under the License. */ .mx_RoomDropTarget { - font-size: 14px; - text-align: center; - margin-left: -8px; - margin-right: -8px; - padding-top: 16px; - padding-bottom: 16px; - background-color: #fbfbfb; - border: 1px dashed #d7d7d7; - border-radius: 8px; + font-size: 14px; + text-align: center; + margin-left: -8px; + margin-right: -8px; + padding-top: 16px; + padding-bottom: 16px; + background-color: #fbfbfb; + border: 1px dashed #d7d7d7; + border-radius: 8px; } diff --git a/skins/base/css/molecules/RoomHeader.css b/skins/base/css/molecules/RoomHeader.css index 6dc9d1e600..a2f107f04f 100644 --- a/skins/base/css/molecules/RoomHeader.css +++ b/skins/base/css/molecules/RoomHeader.css @@ -18,44 +18,44 @@ limitations under the License. } .mx_RoomHeader_wrapper { - max-width: 720px; - margin: auto; - height: 50px; + max-width: 720px; + margin: auto; + height: 50px; } .mx_RoomHeader_leftRow { - display: table-row; - margin-left: 12px; - height: 50px; - float: left; + display: table-row; + margin-left: 12px; + height: 50px; + float: left; } .mx_RoomHeader_rightRow { - display: table-row; - height: 50px; - margin-right: -26px; - float: right; + display: table-row; + height: 50px; + margin-right: -26px; + float: right; } .mx_RoomHeader_name { - display: table-cell; - vertical-align: middle; - height: 50px; - font-weight: 400; - font-size: 20px; - padding-left: 16px; - padding-right: 16px; + display: table-cell; + vertical-align: middle; + height: 50px; + font-weight: 400; + font-size: 20px; + padding-left: 16px; + padding-right: 16px; } .mx_RoomHeader_avatar { - display: table-cell; - height: 50px; - vertical-align: middle; + display: table-cell; + height: 50px; + vertical-align: middle; } .mx_RoomHeader_button { - height: 50px; - display: table-cell; - vertical-align: middle; - padding-right: 16px; + height: 50px; + display: table-cell; + vertical-align: middle; + padding-right: 16px; } \ No newline at end of file diff --git a/skins/base/css/molecules/RoomTile.css b/skins/base/css/molecules/RoomTile.css index b700775601..16199736cf 100644 --- a/skins/base/css/molecules/RoomTile.css +++ b/skins/base/css/molecules/RoomTile.css @@ -24,35 +24,35 @@ limitations under the License. } .mx_RoomTile_avatar { - display: table-cell; - padding-right: 12px; - padding-top: 3px; - padding-bottom: 3px; - vertical-align: middle; - width: 32px; - height: 32px; - border-radius: 16px; + display: table-cell; + padding-right: 12px; + padding-top: 3px; + padding-bottom: 3px; + vertical-align: middle; + width: 32px; + height: 32px; + border-radius: 16px; } .mx_RoomTile_name { - display: table-cell; - vertical-align: middle; + display: table-cell; + vertical-align: middle; overflow: hidden; text-overflow: ellipsis; } -.mx_RoomTile_badge { - float: right; - background-color: #d8d8d8; - color: #747474; - border-radius: 10px; - font-weight: 400; - font-size: 14px; - line-height: 22px; - width: 34px; - height: 20px; - vertical-align: top; - text-align: center; +.mx_RoomTile_badge { + float: right; + background-color: #d8d8d8; + color: #747474; + border-radius: 10px; + font-weight: 400; + font-size: 14px; + line-height: 22px; + width: 34px; + height: 20px; + vertical-align: top; + text-align: center; } .mx_RoomTile_unread { diff --git a/skins/base/css/organisms/MemberList.css b/skins/base/css/organisms/MemberList.css index 4831b86f93..20fd9474e1 100644 --- a/skins/base/css/organisms/MemberList.css +++ b/skins/base/css/organisms/MemberList.css @@ -15,28 +15,28 @@ limitations under the License. */ .mx_MemberList { - width: 100%; - height: 100%; - margin-bottom: 100px; + width: 100%; + height: 100%; + margin-bottom: 100px; } .mx_MemberList_chevron { - position: absolute; - right: 20px; - margin-top: -5px; + position: absolute; + right: 20px; + margin-top: -5px; } .mx_MemberList_wrapper { - border: 1px solid #d8d8d8; - margin: 8px; + border: 1px solid #d8d8d8; + margin: 8px; overflow-y: scroll; - height: auto; + height: auto; max-height: 75%; - border-radius: 8px; - padding: 20px 24px 14px 24px; - table-layout: fixed; + border-radius: 8px; + padding: 20px 24px 14px 24px; + table-layout: fixed; } .mx_MemberList h2 { - margin-top: 0px; + margin-top: 0px; } diff --git a/skins/base/css/organisms/RoomList.css b/skins/base/css/organisms/RoomList.css index 31962824ca..f73eab686e 100644 --- a/skins/base/css/organisms/RoomList.css +++ b/skins/base/css/organisms/RoomList.css @@ -18,8 +18,8 @@ limitations under the License. } .mx_RoomList_recents { - margin-top: -12px; - display: table; - table-layout: fixed; - width: 100%; + margin-top: -12px; + display: table; + table-layout: fixed; + width: 100%; } \ No newline at end of file diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js index 73a6296cc3..273fe123a9 100644 --- a/src/linkify-matrix.js +++ b/src/linkify-matrix.js @@ -20,11 +20,11 @@ var extend = require('./extend'); function matrixLinkify(linkify) { // Text tokens - var TT = linkify.scanner.TOKENS; + var TT = linkify.scanner.TOKENS; var TextToken = TT.Base; // Multi tokens - var MT = linkify.parser.TOKENS; - var MultiToken = MT.Base; + var MT = linkify.parser.TOKENS; + var MultiToken = MT.Base; var S_START = linkify.parser.start; @@ -35,12 +35,12 @@ function matrixLinkify(linkify) { }; ROOMALIAS.prototype = new MultiToken(); - var S_HASH = 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_DOMAIN = 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_HASH = 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_DOMAIN = new linkify.parser.State(); + var S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); + var S_ROOMALIAS = new linkify.parser.State(ROOMALIAS); var roomname_tokens = [ TT.DOT, @@ -50,10 +50,10 @@ function matrixLinkify(linkify) { 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_NAME.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(TT.DOMAIN, S_HASH_NAME); S_HASH_NAME.on(TT.COLON, S_HASH_NAME_COLON); @@ -71,12 +71,12 @@ function matrixLinkify(linkify) { }; USERID.prototype = new MultiToken(); - var S_AT = 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_DOMAIN = 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_AT = 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_DOMAIN = new linkify.parser.State(); + var S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); + var S_USERID = new linkify.parser.State(USERID); var username_tokens = [ TT.DOT, @@ -86,10 +86,10 @@ function matrixLinkify(linkify) { 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_NAME.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(TT.DOMAIN, S_AT_NAME); S_AT_NAME.on(TT.COLON, S_AT_NAME_COLON);