gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

statusify main chat

This commit is contained in:
Matthew Hodgson 2017-10-25 22:48:13 +01:00
parent 79a9f2168b
commit 953398b486
12 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/skins/vector/css/matrix-react-sdk/structures/_SearchBox.scss
View File

@ -38,7 +38,7 @@ limitations under the License.
.mx_SearchBox_search { .mx_SearchBox_search {
flex: 1 1 auto; flex: 1 1 auto;
width: 0px; width: 0px;
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
font-size: 12px; font-size: 12px;
margin-top: -2px; margin-top: -2px;
height: 24px; height: 24px;

2
src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss
View File

@ -28,7 +28,7 @@ limitations under the License.
{ {
height: 26px; height: 26px;
font-size: 14px; font-size: 14px;
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
margin: 0 !important; margin: 0 !important;

2
src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss
View File

@ -34,7 +34,7 @@ limitations under the License.
} }
.mx_ConfirmUserActionDialog_reasonField { .mx_ConfirmUserActionDialog_reasonField {
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
font-size: 14px; font-size: 14px;
color: $primary-fg-color; color: $primary-fg-color;
background-color: $primary-bg-color; background-color: $primary-bg-color;

2
src/skins/vector/css/matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss
View File

@ -27,7 +27,7 @@ limitations under the License.
border: solid 1px $accent-color; border: solid 1px $accent-color;
font-weight: 600; font-weight: 600;
font-size: 14px; font-size: 14px;
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
margin-left: 0px; margin-left: 0px;
margin-right: 8px; margin-right: 8px;
padding-left: 1.5em; padding-left: 1.5em;

2
src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
View File

@ -49,7 +49,7 @@ limitations under the License.
border: solid 1px $accent-color; border: solid 1px $accent-color;
font-weight: 600; font-weight: 600;
font-size: 13px; font-size: 13px;
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
margin-left: 0px; margin-left: 0px;
margin-right: 8px; margin-right: 8px;
padding-left: 0.5em; padding-left: 0.5em;

2
src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss
View File

@ -49,7 +49,7 @@ limitations under the License.
.mx_MemberList_query, .mx_MemberList_query,
.mx_GroupMemberList_query, .mx_GroupMemberList_query,
.mx_GroupRoomList_query { .mx_GroupRoomList_query {
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
border-radius: 3px; border-radius: 3px;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
padding: 9px; padding: 9px;

4
src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
View File

@ -138,7 +138,7 @@ limitations under the License.
max-height: 120px; max-height: 120px;
overflow: auto; overflow: auto;
/* needed for FF */ /* needed for FF */
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
} }
/* hack for FF as vertical alignment of custom placeholder text is broken */ /* hack for FF as vertical alignment of custom placeholder text is broken */
@ -175,6 +175,8 @@ limitations under the License.
.mx_MessageComposer_formatting { .mx_MessageComposer_formatting {
cursor: pointer; cursor: pointer;
margin: 0 11px; margin: 0 11px;
width: 24px;
height: 18px;
} }
.mx_MessageComposer_formatbar_wrapper { .mx_MessageComposer_formatbar_wrapper {

2
src/skins/vector/css/matrix-react-sdk/views/rooms/_SearchableEntityList.scss
View File

@ -21,7 +21,7 @@ limitations under the License.
} }
.mx_SearchableEntityList_query { .mx_SearchableEntityList_query {
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif; font-family: $font-family;
border-radius: 3px; border-radius: 3px;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
padding: 9px; padding: 9px;

2
src/skins/vector/css/themes/_base.scss
View File

@ -95,9 +95,9 @@ $rte-room-pill-color: #aaa;
$roomtile-name-color: rgba(69, 69, 69, 0.8); $roomtile-name-color: rgba(69, 69, 69, 0.8);
$roomtile-selected-bg-color: rgba(255, 255, 255, 0.8); $roomtile-selected-bg-color: rgba(255, 255, 255, 0.8);
$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9); $roomtile-focused-bg-color: rgba(255, 255, 255, 0.9);
$roomsublist-label-fg-color: $h3-color; $roomsublist-label-fg-color: $h3-color;
$roomsublist-label-bg-color: #d3efe1; $roomsublist-label-bg-color: #d3efe1;
$roomsublist-chevron-color: $accent-color;
// ******************** // ********************

1
src/skins/vector/css/themes/_dark.scss
View File

@ -89,6 +89,7 @@ $roomtile-focused-bg-color: rgba(255, 255, 255, 0.2);
$roomsublist-label-fg-color: $h3-color; $roomsublist-label-fg-color: $h3-color;
$roomsublist-label-bg-color: #454545; $roomsublist-label-bg-color: #454545;
$roomsublist-chevron-color: $accent-color;
// ******************** // ********************

6
src/skins/vector/css/vector-web/structures/_RoomSubList.scss
View File

@ -129,7 +129,7 @@ limitations under the License.
height: 0; height: 0;
border-left: 5px solid transparent; border-left: 5px solid transparent;
border-right: 5px solid transparent; border-right: 5px solid transparent;
border-top: 6px solid $accent-color; border-top: 6px solid $roomsublist-chevron-color;
} }
.mx_RoomSubList_chevronUp { .mx_RoomSubList_chevronUp {
@ -137,14 +137,14 @@ limitations under the License.
height: 0; height: 0;
border-left: 5px solid transparent; border-left: 5px solid transparent;
border-right: 5px solid transparent; border-right: 5px solid transparent;
border-bottom: 6px solid $accent-color; border-bottom: 6px solid $roomsublist-chevron-color;
} }
.mx_RoomSubList_chevronRight { .mx_RoomSubList_chevronRight {
width: 0; width: 0;
height: 0; height: 0;
border-top: 5px solid transparent; border-top: 5px solid transparent;
border-left: 6px solid $accent-color; border-left: 6px solid $roomsublist-chevron-color;
border-bottom: 5px solid transparent; border-bottom: 5px solid transparent;
} }

46
src/skins/vector/themes/status/css/_status.scss
View File

@ -78,7 +78,7 @@ $group-alert-color: #774f7e;
$preview-bar-bg-color: #f7f7f7; $preview-bar-bg-color: #f7f7f7;
// left-panel style muted accent color // left-panel style muted accent color
$secondary-accent-color: #eaf5f0; $secondary-accent-color: #586C7B;
// used by RoomDirectory permissions // used by RoomDirectory permissions
$plinth-bg-color: $secondary-accent-color; $plinth-bg-color: $secondary-accent-color;
@ -137,12 +137,13 @@ $rte-room-pill-color: #aaa;
// ******************** // ********************
$roomtile-name-color: rgba(69, 69, 69, 0.8); $roomtile-name-color: #ffffff;
$roomtile-selected-bg-color: rgba(255, 255, 255, 0.8); $roomtile-selected-bg-color: #465561;
$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9); $roomtile-focused-bg-color: #6d8597;
$roomsublist-label-fg-color: $h3-color; $roomsublist-label-fg-color: #ffffff;
$roomsublist-label-bg-color: #d3efe1; $roomsublist-label-bg-color: $secondary-accent-color;
$roomsublist-chevron-color: #ffffff;
// ******************** // ********************
@ -184,3 +185,36 @@ $progressbar-color: #000;
letter-spacing: 1px; letter-spacing: 1px;
color: $accent-fg-color; color: $accent-fg-color;
} }
.mx_RoomSubList_label {
font-size: 13px;
font-family: $header-font-family;
letter-spacing: 1px;
}
// FIXME: all these ! importants are horrid - we should instead go and define
// variables or something.
.mx_SearchBox_search {
color: #fff ! important;
}
.mx_SearchBox_search::-webkit-input-placeholder {
color: rgba(255, 255, 255, 0.6) ! important;
}
.mx_SearchBox_search::-moz-placeholder {
color: rgba(255, 255, 255, 0.6) ! important;
}
.mx_RoomList_emptySubListTip {
font-size: 14px ! important;
border: 1.5px dashed rgba(0,0,0,0.2) ! important;
color: #fff ! important;
background-color: transparent ! important;
border-radius: 6px ! important;
margin-left: 6px ! important;
margin-right: 6px ! important;
margin-top: 8px ! important;
margin-bottom: 7px ! important;
padding: 8px ! important;
}