imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David Baker 2017-08-22 11:08:58 +01:00
commit bbe00b2f54
37 changed files with 2222 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View file

@ -76,6 +76,10 @@ limitations under the License.
flex: 0 0 auto;
}
.mx_RoomView_auxPanel_apps {
max-width: 1920px ! important;
}
.mx_RoomView_topUnreadMessagesBar {
order: 3;
}

5
src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
View file

@ -11,6 +11,11 @@
padding-left: 5px;
}
.mx_EventTile_body .mx_UserPill,
.mx_EventTile_body .mx_RoomPill {
cursor: pointer;
}
/* More specific to override `.markdown-body a` color */
.mx_EventTile_content .markdown-body a.mx_UserPill,
.mx_UserPill {

13
src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
View file

@ -15,12 +15,14 @@ limitations under the License.
*/
.mx_AppsDrawer {
margin-bottom: 3px;
}
.mx_AppsContainer {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.mx_AddWidget_button {
@ -28,11 +30,15 @@ limitations under the License.
cursor: pointer;
padding-right: 12px;
padding: 0;
margin: 0 0 5px 0;
margin: 5px auto 5px auto;
color: $accent-color;
font-size: 12px;
}
.mx_AddWidget_button_full_width {
max-width: 960px;
}
.mx_SetAppURLDialog_input {
border-radius: 3px;
border: 1px solid $input-border-color;
@ -43,6 +49,7 @@ limitations under the License.
}
.mx_AppTile {
max-width: 960px;
width: 50%;
margin: 0 5px 2px 0;
border: 1px solid $primary-hairline-color;
@ -52,6 +59,7 @@ limitations under the License.
}
.mx_AppTileFullWidth {
max-width: 960px;
width: 100%;
margin: 0;
padding: 0;
@ -66,7 +74,7 @@ limitations under the License.
margin: 0;
padding: 2px 10px;
// background-color: $e2e-verified-color;
border-bottom: 1px solid $primary-hairline-color;
// border-bottom: 1px solid $primary-hairline-color;
font-size: 10px;
}
@ -94,6 +102,7 @@ limitations under the License.
.mx_AppTileBody{
height: 350px;
width: 100%;
overflow: hidden;
}

34
src/skins/vector/img/icons-hide-apps.svg Normal file
View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 35 35" style="enable-background:new 0 0 35 35;" xml:space="preserve">
<style type="text/css">
.st1{opacity:0.85;}
.st2{fill:none;stroke:#FFFFFF;stroke-width:1;stroke-linecap:round;stroke-miterlimit:10;}
.st3{fill:#FFFFFF;}
.st4{fill:none;stroke:#FFFFFF;stroke-linejoin:round;stroke-miterlimit:10;}
</style>
<g id="Layer_1_1_">
<path id="Oval-109-Copy" fill="#76CFA6" d="M17.5,35C27.2,35,35,27.2,35,17.5S27.2,0,17.5,0S0,7.8,0,17.5S7.8,35,17.5,35z"/>
</g>
<g id="frame" class="st1">
<g id="Layer_3">
<g>
<g>
<line class="st2" x1="17.5" y1="21" x2="17.5" y2="26"/>
<g>
<polygon class="st3" points="15.5,21.8 17.5,18.3 19.5,21.8 "/>
</g>
</g>
</g>
</g>
<rect x="6.7" y="6.7" class="st4" width="21.6" height="21.6"/>
<line class="st4" x1="6.7" y1="16.7" x2="28.2" y2="16.7"/>
<path class="st3" d="M13.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3H9.9c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H13
C13.2,13.5,13.3,13.4,13.3,13.3z"/>
<path class="st3" d="M19.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H19
C19.2,13.5,19.3,13.4,19.3,13.3z"/>
<path class="st3" d="M25.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H25
C25.2,13.5,25.3,13.4,25.3,13.3z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

33
src/skins/vector/img/icons-show-apps.svg Normal file
View file

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 35 35" style="enable-background:new 0 0 35 35;" xml:space="preserve">
<style type="text/css">
.st0{opacity:0.15;}
.st2{fill:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:10;}
.st3{fill:none;stroke-linejoin:round;stroke-miterlimit:10;}
</style>
<g id="Layer_1_1_" class="st0">
<path id="Oval-109-Copy" fill="#76CFA6" d="M17.5,35C27.2,35,35,27.2,35,17.5S27.2,0,17.5,0S0,7.8,0,17.5S7.8,35,17.5,35z"/>
</g>
<g id="frame">
<g id="Layer_3">
<g>
<g>
<line class="st2" stroke="#76CFA6" x1="17.5" y1="23.9" x2="17.5" y2="18.9"/>
<g>
<polygon fill="#76CFA6" points="19.5,23.1 17.5,26.6 15.5,23.1 "/>
</g>
</g>
</g>
</g>
<rect x="6.7" y="6.7" class="st3" stroke="#76CFA6" width="21.6" height="21.6"/>
<line class="st3" stroke="#76CFA6" x1="6.7" y1="16.7" x2="28.2" y2="16.7"/>
<path fill="#76CFA6" d="M13.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3H9.9c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H13
C13.2,13.5,13.3,13.4,13.3,13.3z"/>
<path fill="#76CFA6" d="M19.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H19
C19.2,13.5,19.3,13.4,19.3,13.3z"/>
<path fill="#76CFA6" d="M25.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H25
C25.2,13.5,25.3,13.4,25.3,13.3z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB