From 93c4fc8785792129bade7301113204683f1f963a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 10 Jan 2016 13:04:15 +0000 Subject: [PATCH 01/18] switch EditableText to contentEditable; fix auxPanel layout bug in the general case (not just for video) --- .../views/rooms/RoomHeader.css | 52 +++++++++++++++---- .../views/rooms/RoomSettings.css | 5 -- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index cf483e8e88..1b84abac8a 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -47,12 +47,13 @@ limitations under the License. } .mx_RoomHeader_textButton { - height: 48px; + height: 36px; background-color: #76cfa6; - border-radius: 48px; + border-radius: 36px; margin-right: 8px; color: #fff; - line-height: 48px; + line-height: 34px; + margin-top: -2px; text-align: center; -webkit-box-ordinal-group: 2; @@ -69,7 +70,20 @@ limitations under the License. */ padding-left: 12px; padding-right: 12px; - } +} + +.mx_RoomHeader_cancelButton { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; + + cursor: pointer; + + padding-left: 12px; + padding-right: 12px; +} .mx_RoomHeader_rightRow { margin-top: 4px; @@ -107,9 +121,8 @@ limitations under the License. } .mx_RoomHeader_name { - cursor: pointer; vertical-align: middle; - height: 30px; + height: 31px; overflow: hidden; color: #454545; font-weight: bold; @@ -142,7 +155,11 @@ limitations under the License. pointer-events: none; } -.mx_RoomHeader_leftRow:hover .mx_RoomHeader_name { +.mx_RoomHeader_leftRow:hover { + cursor: pointer; +} + +.mx_RoomHeader_leftRow:hover .mx_RoomHeader_name div:not(.mx_RoomHeader_editable) { color: #76cfa6; } @@ -159,7 +176,23 @@ limitations under the License. visibility: visible; } +.mx_RoomHeader_placeholder { + color: #a2a2a2 ! important; +} +.mx_RoomHeader_editable { + border-bottom: 1px solid #c7c7c7; + min-width: 70px; + cursor: text; +} + +.mx_RoomHeader_editable:focus { + border-bottom: 1px solid #76CFA6; + outline: none; + box-shadow: none; +} + +/* .mx_RoomHeader_nameEditing { padding-left: 8px; padding-right: 16px; @@ -178,6 +211,7 @@ limitations under the License. .mx_RoomHeader_nameInput { margin-top: 6px; } +*/ .mx_RoomHeader_topic { vertical-align: bottom; @@ -185,8 +219,8 @@ limitations under the License. max-height: 42px; color: #454545; font-weight: 300; - padding-left: 19px; - padding-right: 16px; + margin-left: 19px; + margin-right: 16px; overflow: hidden; text-overflow: ellipsis; } diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 2b2411287f..1b504982bf 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -15,7 +15,6 @@ limitations under the License. */ .mx_RoomSettings { - max-height: 250px; padding-top: 12px; } @@ -83,10 +82,6 @@ limitations under the License. border: none; } -.mx_RoomSettings_description { - width: 330px; -} - .mx_RoomSettings_buttons { text-align: right; margin-bottom: 16px; From fc3f356dc0eb809448699e9fb636dcd88df7cfbe Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 12 Jan 2016 01:23:39 +0000 Subject: [PATCH 02/18] GA --- src/vector/index.js | 1 + vector/index.html | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/vector/index.js b/src/vector/index.js index 4c79f11dd3..0ab5054b31 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -117,6 +117,7 @@ var onNewScreen = function(screen) { var hash = '#/' + screen; lastLocationHashSet = hash; window.location.hash = hash; + if (ga) ga('send', 'pageview', window.location.pathname + window.location.search + window.location.hash); } } diff --git a/vector/index.html b/vector/index.html index f81974729a..f27b01d1e8 100644 --- a/vector/index.html +++ b/vector/index.html @@ -48,5 +48,16 @@ + From f2171c11f0a3bac55fd1e929dad4bdc0beb4713d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:33:03 +0000 Subject: [PATCH 03/18] uncommitted WIP roomsetting CSS --- .../views/rooms/RoomSettings.css | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 1b504982bf..48845e28f2 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -74,6 +74,50 @@ limitations under the License. width: 100%; } +.mx_RoomSettings .mx_RoomSettings_aliasesTable { + margin-top: 12px; + margin-bottom: 12px; + margin-left: 56px; + display: table; +} + +.mx_RoomSettings .mx_RoomSettings_aliasesRow { + display: table-row; +} + +.mx_RoomSettings .mx_RoomSettings_alias { + display: table-cell; + margin-bottom: 20px; +} + +.mx_RoomSettings_editable { + border: 0px; + border-bottom: 1px solid #c7c7c7; + padding: 0px; + min-width: 240px; +} + +.mx_RoomSettings_editable:focus { + border-bottom: 1px solid #76CFA6; + outline: none; + box-shadow: none; +} + +.mx_RoomSettings_deleteAlias, +.mx_RoomSettings_addAlias { + display: table-cell; + visibility: visible; +} + +.mx_RoomSettings_deleteAlias:hover, +.mx_RoomSettings_addAlias:hover { + visibility: visible; +} + +.mx_RoomSettings_aliasPlaceholder { + color: #a2a2a2; +} + .mx_RoomSettings .mx_RoomAvatar { border-radius: 120px; } From ad434cb82e55e0f92c43384da8971dfb799633fb Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:33:06 +0000 Subject: [PATCH 04/18] GA bugfix --- vector/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vector/index.html b/vector/index.html index f27b01d1e8..8fb479951e 100644 --- a/vector/index.html +++ b/vector/index.html @@ -58,6 +58,9 @@ ga('create', 'UA-54779209-2', 'auto'); ga('send', 'pageview', window.location.pathname + window.location.search + window.location.hash); } + else { + var ga = null; + } From e3eef4568471464608d3206eda767601b6601857 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 13 Jan 2016 17:39:49 +0000 Subject: [PATCH 05/18] fix comedy double-margin caused by killing off MessageTiles --- .../vector/css/matrix-react-sdk/views/rooms/EventTile.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css index 8ea76364b3..bc9105ab9e 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css @@ -58,11 +58,6 @@ limitations under the License. position: relative; } -.mx_EventTile_content { - padding-right: 100px; - display: block; -} - .mx_EventTile_content { display: block; margin-right: 100px; From 17e540d372e8d6d5e06a22ac4bfc6a30a5106107 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 11:57:07 +0000 Subject: [PATCH 06/18] fix line wrapping of code blocks in multiline msgs --- src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css index bc9105ab9e..3efff51d75 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css @@ -89,7 +89,7 @@ limitations under the License. } .mx_EventTile_content .markdown-body .hljs { - display: inherit ! important; + display: inline ! important; } /* end of overrides */ From c1aac1aacad2db1d6cb47fe6c0db77aeb9016e5c Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 17:25:21 +0000 Subject: [PATCH 07/18] roomsetting icons --- src/skins/vector/img/cancel-small.svg | 10 ++++++++++ src/skins/vector/img/plus.svg | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 src/skins/vector/img/cancel-small.svg create mode 100644 src/skins/vector/img/plus.svg diff --git a/src/skins/vector/img/cancel-small.svg b/src/skins/vector/img/cancel-small.svg new file mode 100644 index 0000000000..f538017f55 --- /dev/null +++ b/src/skins/vector/img/cancel-small.svg @@ -0,0 +1,10 @@ + + + + Line + Created with Sketch. + + + + + diff --git a/src/skins/vector/img/plus.svg b/src/skins/vector/img/plus.svg new file mode 100644 index 0000000000..e1d59ec6f4 --- /dev/null +++ b/src/skins/vector/img/plus.svg @@ -0,0 +1,13 @@ + + + + Line + Line + Created with Sketch. + + + + + + + + From d1f26e3911d3cc03d08bb0eff6b36f105cbd3a3c Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 14 Jan 2016 17:26:16 +0000 Subject: [PATCH 08/18] camera icon --- src/skins/vector/img/camera.svg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/skins/vector/img/camera.svg diff --git a/src/skins/vector/img/camera.svg b/src/skins/vector/img/camera.svg new file mode 100644 index 0000000000..6519496f78 --- /dev/null +++ b/src/skins/vector/img/camera.svg @@ -0,0 +1,12 @@ + + + + icon_camera + Created with Sketch. + + + + + + + From 41ae851df4c1102d033f6c536fbb099f6534eac2 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 12:34:01 +0000 Subject: [PATCH 09/18] fix up user settings CSS somewhat --- .../structures/UserSettings.css | 39 +++++++------------ 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css index a0e9052c87..11d266b4d7 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css @@ -33,7 +33,6 @@ limitations under the License. display: inline; vertical-align: middle; border: 0px; - height: 36px; border-radius: 36px; font-weight: 400; font-size: 16px; @@ -121,37 +120,27 @@ limitations under the License. } .mx_UserSettings_logout { - margin-right: 24px; - margin-bottom: 24px; - margin-left: 63px; + float: right; + margin-right: 32px; + margin-left: 32px; } .mx_UserSettings_avatarPicker { - width: 320px; + margin-left: 32px; + margin-right: 32px; float: right; -} - -.mx_UserSettings_avatarPicker_edit { - position: relative; - left: 50%; - display: inline-block; - margin-top: 10px; -} - -.mx_UserSettings_avatarPicker_edit > input{ - display: none; -} - -.mx_UserSettings_avatarPicker_edit > label { cursor: pointer; } -.mx_UserSettings_avatarPicker_img { - margin: 0 auto; - width: 75%; +.mx_UserSettings_avatarPicker .mx_RoomAvatar { + border-radius: 40px; } -.mx_UserSettings_avatarPicker_img > img { - display: block; - margin: 0 auto; +.mx_UserSettings_avatarPicker_edit { + text-align: center; + margin-top: 10px; +} + +.mx_UserSettings_avatarPicker_edit > input { + display: none; } From 1fcb4ba94fbf019581b6af48e67b52280f4ba042 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 15:26:00 +0000 Subject: [PATCH 10/18] droptarget and usersettings and roomsettings layout tweaks --- src/components/structures/BottomLeftMenu.js | 2 +- .../matrix-react-sdk/structures/RoomView.css | 2 +- .../structures/UserSettings.css | 38 +++++++++++- .../views/rooms/RoomHeader.css | 58 +++++++++---------- .../views/rooms/RoomSettings.css | 1 - 5 files changed, 68 insertions(+), 33 deletions(-) diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js index 911d1013ce..a4d89fcfed 100644 --- a/src/components/structures/BottomLeftMenu.js +++ b/src/components/structures/BottomLeftMenu.js @@ -50,7 +50,7 @@ module.exports = React.createClass({ return (
- +
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css index b4cd2c0c30..b1581d4725 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css @@ -44,7 +44,7 @@ limitations under the License. min-width: 0px; max-width: 960px; width: 100%; - font-size: 20px; + font-size: 18px; text-align: center; pointer-events: none; diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css index 11d266b4d7..949ebf09de 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css @@ -18,7 +18,38 @@ limitations under the License. width: 960px; margin-left: auto; margin-right: auto; - overflow-y: auto; + + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + flex-direction: column; + -webkit-flex-direction: column; +} + +.mx_UserSettings .mx_RoomHeader { + -webkit-box-ordinal-group: 1; + -moz-box-ordinal-group: 1; + -ms-flex-order: 1; + -webkit-order: 1; + order: 1; + + -webkit-flex: 0 0 83px; + flex: 0 0 83px; +} + +.mx_UserSettings_body { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; + + -webkit-flex: 1 1 0; + flex: 1 1 0; + + overflow-y: auto; } .mx_UserSettings_spinner { @@ -96,6 +127,7 @@ limitations under the License. .mx_UserSettings_profileInputCell input, .mx_UserSettings_profileInputCell .mx_EditableText { + display: inline-block; border: 0px; border-bottom: 1px solid rgba(151, 151, 151, 0.5); padding: 0px; @@ -105,6 +137,10 @@ limitations under the License. font-size: 16px; } +.mx_UserSettings_profileInputCell .mx_EditableText_placeholder { + color: rgba(74, 74, 74, 0.5); +} + .mx_UserSettings_notifInputCell { display: table-cell; padding-bottom: 21px; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 1b84abac8a..4e53903c0f 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_RoomHeader { +/* add 12px to the height of the header when editing */ +.mx_RoomHeader_editing { + -webit-flex: 0 0 95px ! important; + flex: 0 0 95px ! important; } .mx_RoomHeader_wrapper { @@ -33,6 +36,10 @@ limitations under the License. display: flex; } +.mx_RoomHeader_editing .mx_RoomHeader_wrapper { + border-bottom: 1px solid transparent; +} + .mx_RoomHeader_leftRow { margin-left: -2px; @@ -98,7 +105,7 @@ limitations under the License. .mx_RoomHeader_info { display: table-cell; - /* height: 48px; */ + width: 100%; vertical-align: middle; } @@ -122,6 +129,7 @@ limitations under the License. .mx_RoomHeader_name { vertical-align: middle; + width: 100%; height: 31px; overflow: hidden; color: #454545; @@ -131,6 +139,7 @@ limitations under the License. padding-right: 16px; /* why isn't text-overflow working? */ text-overflow: ellipsis; + border-bottom: 1px solid transparent; } .mx_RoomHeader_nametext { @@ -155,15 +164,16 @@ limitations under the License. pointer-events: none; } -.mx_RoomHeader_leftRow:hover { +.mx_RoomHeader_name, +.mx_RoomHeader_avatar { cursor: pointer; } -.mx_RoomHeader_leftRow:hover .mx_RoomHeader_name div:not(.mx_RoomHeader_editable) { +.mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) { color: #76cfa6; } -.mx_RoomHeader_leftRow:hover .mx_RoomHeader_settingsButton { +.mx_RoomHeader_name:hover .mx_RoomHeader_settingsButton { visibility: visible; } @@ -181,38 +191,17 @@ limitations under the License. } .mx_RoomHeader_editable { - border-bottom: 1px solid #c7c7c7; + border-bottom: 1px solid #c7c7c7 ! important; min-width: 70px; cursor: text; } .mx_RoomHeader_editable:focus { - border-bottom: 1px solid #76CFA6; + border-bottom: 1px solid #76CFA6 ! important; outline: none; box-shadow: none; } -/* -.mx_RoomHeader_nameEditing { - padding-left: 8px; - padding-right: 16px; - margin-top: -5px; -} - -.mx_RoomHeader_name input, .mx_RoomHeader_nameInput { - border-radius: 3px; - width: 260px; - border: 1px solid #c7c7c7; - font-weight: 300; - font-size: 13px; - padding: 9px; -} - -.mx_RoomHeader_nameInput { - margin-top: 6px; -} -*/ - .mx_RoomHeader_topic { vertical-align: bottom; float: left; @@ -223,6 +212,7 @@ limitations under the License. margin-right: 16px; overflow: hidden; text-overflow: ellipsis; + border-bottom: 1px solid transparent; } .mx_RoomHeader_avatar { @@ -232,10 +222,20 @@ limitations under the License. vertical-align: middle; } -.mx_RoomHeader_avatar img { +.mx_RoomHeader_avatar .mx_RoomAvatar { border-radius: 24px; } +.mx_RoomHeader_avatarPicker_edit { + position: absolute; + margin-left: 16px; + margin-top: 4px; +} + +.mx_RoomHeader_avatarPicker_edit > input { + display: none; +} + .mx_RoomHeader_button { display: table-cell; vertical-align: top; diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 48845e28f2..f352e57f4c 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -15,7 +15,6 @@ limitations under the License. */ .mx_RoomSettings { - padding-top: 12px; } .mx_RoomSettings_settings { From 762dd69f0a3b746479a1d92a6a12dd83c18c4704 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 15:48:29 +0000 Subject: [PATCH 11/18] more bottom margin on editable roomheader --- .../vector/css/matrix-react-sdk/views/rooms/RoomHeader.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 4e53903c0f..9b34e190b9 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* add 12px to the height of the header when editing */ +/* add 20px to the height of the header when editing */ .mx_RoomHeader_editing { - -webit-flex: 0 0 95px ! important; - flex: 0 0 95px ! important; + -webit-flex: 0 0 113px ! important; + flex: 0 0 113px ! important; } .mx_RoomHeader_wrapper { From 531aa153bb69c223c6f35ba08471f55a395e7457 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 16:32:23 +0000 Subject: [PATCH 12/18] no more textarea in roomsettings --- src/skins/vector/css/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css index 50ffe7bb61..fbe92874ad 100644 --- a/src/skins/vector/css/common.css +++ b/src/skins/vector/css/common.css @@ -52,7 +52,7 @@ a:visited { color: #76cfa6; } -input[type=text]:focus, textarea:focus, .mx_RoomSettings textarea:focus { +input[type=text]:focus, textarea:focus { border: 1px solid #76CFA6; outline: none; box-shadow: none; From eb8064f961f482fcb139a9dfc3aaae78eaff5e77 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 16:32:39 +0000 Subject: [PATCH 13/18] fix cursors for changeavatar --- .../css/matrix-react-sdk/views/rooms/RoomHeader.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 9b34e190b9..151f7520d0 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -165,7 +165,9 @@ limitations under the License. } .mx_RoomHeader_name, -.mx_RoomHeader_avatar { +.mx_RoomHeader_avatar, +.mx_RoomHeader_avatarPicker, +.mx_RoomHeader_avatarPicker_edit { cursor: pointer; } @@ -232,6 +234,10 @@ limitations under the License. margin-top: 4px; } +.mx_RoomHeader_avatarPicker_edit > label { + cursor: pointer; +} + .mx_RoomHeader_avatarPicker_edit > input { display: none; } From 394fb2373b907ea26f718e07443fdb14141c9a65 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 16:50:12 +0000 Subject: [PATCH 14/18] more layout tweaks for RoomSettings --- .../matrix-react-sdk/views/rooms/RoomHeader.css | 4 ++-- .../views/rooms/RoomSettings.css | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css index 151f7520d0..c405a903fd 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css @@ -16,8 +16,8 @@ limitations under the License. /* add 20px to the height of the header when editing */ .mx_RoomHeader_editing { - -webit-flex: 0 0 113px ! important; - flex: 0 0 113px ! important; + -webit-flex: 0 0 103px ! important; + flex: 0 0 103px ! important; } .mx_RoomHeader_wrapper { diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index f352e57f4c..dd833a654f 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -15,21 +15,27 @@ limitations under the License. */ .mx_RoomSettings { + margin-left: 65px; + margin-bottom: 20px; } -.mx_RoomSettings_settings { +.mx_RoomSettings_powerLevels { display: table; - margin: 5px 0; } -.mx_RoomSettings_settings > div { +.mx_RoomSettings_powerLevel { display: table-row; } -.mx_RoomSettings_settings > div > * { +.mx_RoomSettings_powerLevelKey, +.mx_RoomSettings_powerLevel .mx_PowerSelector { display: table-cell; + padding-bottom: 5px; +} - margin: 0 10px; +.mx_RoomSettings_powerLevelKey { + text-align: right; + padding-right: 0.3em; } .mx_RoomSettings h3 { From 877136993772eaf6c3c10879a7206bf864f1198e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 15 Jan 2016 20:29:44 +0000 Subject: [PATCH 15/18] more layout --- .../css/matrix-react-sdk/views/rooms/RoomSettings.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index dd833a654f..53921fb945 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -95,6 +95,13 @@ limitations under the License. margin-bottom: 20px; } +.mx_RoomSettings .mx_RoomSettings_addAlias, +.mx_RoomSettings .mx_RoomSettings_deleteAlias { + display: table-cell; + padding-left: 0.5em; + pointer: cursor; +} + .mx_RoomSettings_editable { border: 0px; border-bottom: 1px solid #c7c7c7; From 4e7c58e2427d77c253940f1adaf73150cf3ddefc Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 17 Jan 2016 02:46:15 +0000 Subject: [PATCH 16/18] fix broken icon --- src/skins/vector/img/cancel-small.svg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/skins/vector/img/cancel-small.svg b/src/skins/vector/img/cancel-small.svg index f538017f55..e4c8cafc10 100644 --- a/src/skins/vector/img/cancel-small.svg +++ b/src/skins/vector/img/cancel-small.svg @@ -1,10 +1,13 @@ - Line + Line + Line Created with Sketch. - + + + + - + \ No newline at end of file From a61afa0f319d624b8d8bd4a34a96f400e1db4581 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 17 Jan 2016 02:46:22 +0000 Subject: [PATCH 17/18] fix css thinko --- .../vector/css/matrix-react-sdk/views/rooms/RoomSettings.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index 53921fb945..ab9a514843 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -99,7 +99,7 @@ limitations under the License. .mx_RoomSettings .mx_RoomSettings_deleteAlias { display: table-cell; padding-left: 0.5em; - pointer: cursor; + cursor: pointer; } .mx_RoomSettings_editable { From 40d2018c1705fd57e58a53bd7bc058dc67bf944b Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 17 Jan 2016 12:26:54 +0000 Subject: [PATCH 18/18] fix checkbox css --- .../css/matrix-react-sdk/views/rooms/RoomSettings.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css index ab9a514843..3e5f0a0293 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css @@ -47,6 +47,7 @@ limitations under the License. margin-bottom: 10px; } +/* .mx_RoomSettings input, .mx_RoomSettings textarea { border-radius: 3px; @@ -56,6 +57,11 @@ limitations under the License. padding: 9px; margin-top: 6px; } +*/ + +.mx_RoomSettings .mx_RoomSettings_tags input[type="checkbox"] { + margin-left: 1em; +} .mx_RoomSettings .mx_RoomSettings_roomColor { display: inline-block; @@ -134,10 +140,6 @@ limitations under the License. border-radius: 120px; } -.mx_RoomSettings input[type="file"] { - border: none; -} - .mx_RoomSettings_buttons { text-align: right; margin-bottom: 16px;