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

Merge branch 'develop' into wmwragg/direct-chat-sublist

Browse source
This commit is contained in:
wmwragg 2016-08-30 11:22:31 +01:00
commit 7b7a77bad0
19 changed files with 334 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/skins/vector/css/common.css
View file

@ -251,7 +251,7 @@ input[type=text]:focus, textarea:focus {
background-color: #fff;
}
.emojione {
.mx_emojione {
height: 1em;
vertical-align: middle;
}
@ -267,7 +267,7 @@ input[type=text]:focus, textarea:focus {
}
/** green button with rounded corners */
.textButton {
.mx_textButton {
color: #fff;
background-color: #76cfa6;
border-radius: 17px;

76
src/skins/vector/css/matrix-react-sdk/views/rooms/Autocomplete.css
View file

@ -4,7 +4,7 @@
z-index: 1000;
width: 100%;
border: 1px solid #e5e5e5;
background: rgba(255, 255, 255, 0.9);
background: white;
border-bottom: none;
border-radius: 4px 4px 0 0;
max-height: 50vh;
@ -12,56 +12,68 @@
}
.mx_Autocomplete_ProviderSection {
padding: 12px;
border-bottom: 1px solid #e5e5e5;
}
.mx_Autocomplete_ProviderSection * {
padding: 2px;
border-radius: 4px;
.mx_Autocomplete_Completion_container_pill {
margin: 12px;
display: flex;
}
.mx_Autocomplete_Completion {
/* a "block" completion takes up a whole line */
.mx_Autocomplete_Completion_block {
height: 34px;
display: flex;
padding: 0 12px;
user-select: none;
cursor: pointer;
transition: 0.3s all ease;
display: flex;
align-items: center;
color: #4a4a4a;
}
.mx_Autocomplete_Completion.selected * {
transition: 0.3s all ease;
.mx_Autocomplete_Completion_block * {
margin: 0 3px;
}
.mx_Autocomplete_Completion_pill {
border-radius: 17px;
height: 34px;
display: flex;
user-select: none;
cursor: pointer;
align-items: center;
color: #4a4a4a;
}
.mx_Autocomplete_Completion_pill * {
margin: 0 3px;
}
/* container for pill-style completions */
.mx_Autocomplete_Completion_container_pill {
margin: 12px;
display: flex;
flex-flow: wrap;
}
.mx_Autocomplete_Completion.selected {
background: #76cfa6;
color: white;
background: #f6f6f6;
outline: none;
}
.mx_Autocomplete_Completion.selected * {
color: white !important;
}
.mx_Autocomplete_provider_name {
color: #76cfa6;
font-weight: 600;
margin: 12px;
color: #454545;
font-weight: 400;
opacity: 0.4;
}
.autocomplete-enter {
opacity: 0.01;
/* styling for common completion elements */
.mx_Autocomplete_Completion_subtitle {
font-style: italic;
flex: 1;
}
.autocomplete-enter.autocomplete-enter-active {
opacity: 1;
transition: opacity 300ms ease-in;
}
.autocomplete-leave {
opacity: 1;
}
.autocomplete-leave.autocomplete-leave-active {
opacity: 0.01;
transition: opacity 300ms ease-in;
.mx_Autocomplete_Completion_description {
color: gray;
}

5
src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
View file

@ -34,6 +34,11 @@ limitations under the License.
z-index: 2;
}
.mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
top: 8px;
left: 44px;
}
.mx_EventTile_continuation {
padding-top: 0px ! important;
}

1
src/skins/vector/css/matrix-react-sdk/views/rooms/MessageComposer.css
View file

@ -63,6 +63,7 @@ limitations under the License.
align-items: center;
overflow: auto;
font-size: 14px;
margin-right: 6px;
}
.mx_MessageComposer_input_rte {
border-top: 2px solid #76cfa6; /* placeholder RTE indicator */

15
src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
View file

@ -19,6 +19,21 @@ limitations under the License.
margin-bottom: 20px;
}
.mx_RoomSettings_leaveButton {
height: 36px;
background-color: #76cfa6;
border-radius: 36px;
margin-right: 8px;
color: #fff;
line-height: 34px;
text-align: center;
float: right;
cursor: pointer;
padding-left: 12px;
padding-right: 12px;
margin-right: 32px;
}
.mx_RoomSettings_powerLevels {
display: table;
}

20
src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css Normal file
View file

@ -0,0 +1,20 @@
/*
Copyright 2016 Aviral Dasgupta
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_ChangelogDialog_content {
max-height: 300px;
overflow: auto;
}

4
src/skins/vector/css/vector-web/views/globals/MatrixToolbar.css
View file

@ -54,3 +54,7 @@ limitations under the License.
float: right;
margin-right: 10px;
}
.mx_MatrixToolbar_action {
margin-right: 16px;
}