Skip to content

Commit

Permalink
Merge pull request #5501 from vector-im/luke/groups-fix-my-groups-layout
Browse files Browse the repository at this point in the history
CSS for Your Communities scrollbar
  • Loading branch information
lukebarnard1 authored Nov 3, 2017
2 parents 69a82f7 + 4d11e73 commit 2c4c6e8
Showing 1 changed file with 34 additions and 6 deletions.
40 changes: 34 additions & 6 deletions src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ limitations under the License.
max-width: 960px;
margin-left: auto;
margin-right: auto;

display: flex;
flex-direction: column;
}

.mx_MyGroups .mx_RoomHeader_simpleHeader {
Expand Down Expand Up @@ -61,10 +64,26 @@ limitations under the License.
/* Until the button is wired up */
.mx_MyGroups_joinBox {
visibility: hidden;

/* When joinBox wraps onto its own row, it should take up zero height so
that there isn't an awkward gap between MyGroups_createBox and
MyGroups_content.
*/
height: 0px;
margin: 0px;
}

.mx_MyGroups_content {
margin-left: 2px;

flex: 1 0 0;

display: flex;
flex-direction: column;
}

.mx_MyGroups_content h3 {
margin-bottom: 10px;
}

.mx_MyGroups_placeholder {
Expand All @@ -75,19 +94,22 @@ limitations under the License.
text-align: center;
}

.mx_MyGroups_joinedGroups {
.mx_MyGroups_joinedGroups .gm-scroll-view {
border-top: 1px solid $primary-hairline-color;
overflow-x: hidden;

display: flex;
flex-direction: row;
flex-flow: wrap;
justify-content: space-around;
align-content: flex-start;
}

.mx_MyGroups_joinedGroups .mx_GroupTile {
.mx_MyGroups_joinedGroups .gm-scroll-view .mx_GroupTile {
min-width: 300px;
flex: 1 0 25%;
max-width: 33%;
flex: 1 0 300px;
height: 75px;
margin-bottom: 15px;
margin-right: 10px;
margin: 10px 0px;
display: flex;
align-items: flex-start;
cursor: pointer;
Expand All @@ -100,6 +122,12 @@ limitations under the License.
justify-content: center;
}

.mx_GroupTile_profile h3.mx_GroupTile_name,
.mx_GroupTile_profile .mx_GroupTile_groupId,
.mx_GroupTile_profile .mx_GroupTile_desc {
padding-right: 10px;
}

.mx_GroupTile_profile h3.mx_GroupTile_name {
margin: 0px;
font-size: 15px;
Expand Down

0 comments on commit 2c4c6e8

Please sign in to comment.