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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-03 12:03:16 +00:00
parent 61287b5f08 2c4c6e82bb
commit a3d15e05b1
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
View File

@ -18,6 +18,9 @@ limitations under the License.
max-width: 960px; max-width: 960px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
display: flex;
flex-direction: column;
} }
.mx_MyGroups .mx_RoomHeader_simpleHeader { .mx_MyGroups .mx_RoomHeader_simpleHeader {
@ -61,10 +64,26 @@ limitations under the License.
/* Until the button is wired up */ /* Until the button is wired up */
.mx_MyGroups_joinBox { .mx_MyGroups_joinBox {
visibility: hidden; 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 { .mx_MyGroups_content {
margin-left: 2px; margin-left: 2px;
flex: 1 0 0;
display: flex;
flex-direction: column;
}
.mx_MyGroups_content h3 {
margin-bottom: 10px;
} }
.mx_MyGroups_placeholder { .mx_MyGroups_placeholder {
@ -75,19 +94,22 @@ limitations under the License.
text-align: center; text-align: center;
} }
.mx_MyGroups_joinedGroups { .mx_MyGroups_joinedGroups .gm-scroll-view {
border-top: 1px solid $primary-hairline-color;
overflow-x: hidden;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-flow: wrap; 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; min-width: 300px;
flex: 1 0 25%; max-width: 33%;
flex: 1 0 300px;
height: 75px; height: 75px;
margin-bottom: 15px; margin: 10px 0px;
margin-right: 10px;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
cursor: pointer; cursor: pointer;
@ -100,6 +122,12 @@ limitations under the License.
justify-content: center; 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 { .mx_GroupTile_profile h3.mx_GroupTile_name {
margin: 0px; margin: 0px;
font-size: 15px; font-size: 15px;