Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign: move right panel below room/group header #2260

Merged
merged 14 commits into from
Nov 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions res/css/structures/_GroupView.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ limitations under the License.
*/

.mx_GroupView {
max-width: 960px;
width: 100%;
margin-left: auto;
margin-right: auto;
display: flex;
flex-direction: column;
overflow: hidden;
Expand All @@ -29,7 +25,6 @@ limitations under the License.
}

.mx_GroupView_header {
max-width: 960px;
min-height: 70px;
align-items: center;
display: flex;
Expand Down Expand Up @@ -162,6 +157,11 @@ limitations under the License.
line-height: 2em;
}

.mx_GroupView > .mx_MainSplit {
flex: 1;
display: flex;
}

.mx_GroupView_body {
flex-grow: 1;
}
Expand Down
5 changes: 2 additions & 3 deletions res/css/structures/_MatrixChat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ limitations under the License.
transform: translateX(-50%);
}

.mx_MatrixChat .mx_MatrixChat_middlePanel {
/* not the left panel, and not the resize handle, so the roomview/groupview/... */
.mx_MatrixChat > :not(.mx_LeftPanel_container):not(.mx_ResizeHandle) {
background-color: $primary-bg-color;

flex: 1;
Expand All @@ -81,8 +82,6 @@ limitations under the License.
*/
overflow-x: auto;

display: flex;

/* To fix https://github.com/vector-im/riot-web/issues/3298 where Safari
needed height 100% all the way down to the HomePage. Height does not
have to be auto, empirically.
Expand Down
24 changes: 7 additions & 17 deletions res/css/structures/_RoomView.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,10 @@ limitations under the License.

.mx_RoomView {
word-wrap: break-word;
position: relative;

display: flex;
width: 100%;

flex-direction: column;
}

.mx_RoomView .mx_RoomHeader {
order: 1;

flex: 0 0 52px;
}

.mx_RoomView_fileDropTarget {
min-width: 0px;
width: 100%;
Expand Down Expand Up @@ -62,15 +52,11 @@ limitations under the License.
}

.mx_RoomView_auxPanel {
order: 2;

min-width: 0px;
width: 100%;
margin: 0px auto;

overflow: auto;
border-bottom: 1px solid $primary-hairline-color;

flex: 0 0 auto;
}

Expand All @@ -79,13 +65,17 @@ limitations under the License.
}


.mx_RoomView_body {
order: 3;
.mx_RoomView .mx_MainSplit {
flex: 1 1 0;
flex-direction: column;
display: flex;
}

.mx_RoomView_body {
display: flex;
flex-direction: column;
flex: 1;
}

.mx_RoomView_body .mx_RoomView_topUnreadMessagesBar {
order: 1;
}
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_MemberList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ limitations under the License.
}

.mx_MemberList .mx_Spinner {
flex: 0 0 auto;
flex: 1 0 auto;
}

.mx_MemberList_chevron {
Expand Down
5 changes: 5 additions & 0 deletions res/css/views/rooms/_RoomHeader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_RoomHeader {
flex: 0 0 52px;
border-bottom: 1px solid $primary-hairline-color;
}

/* add 20px to the height of the header when editing */
.mx_RoomHeader_editing {
flex: 0 0 93px ! important;
Expand Down
1 change: 0 additions & 1 deletion src/PageTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export default {
HomePage: "home_page",
RoomView: "room_view",
UserSettings: "user_settings",
CreateRoom: "create_room",
RoomDirectory: "room_directory",
UserView: "user_view",
GroupView: "group_view",
Expand Down
Loading