Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Colour, contrast & legibility improvements #2378

Merged
merged 6 commits into from
Dec 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions res/css/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ h2 {
a:hover,
a:link,
a:visited {
color: $accent-color;
color: $accent-color-alt;
}

input[type=text], input[type=password], textarea {
Expand Down Expand Up @@ -301,7 +301,7 @@ textarea {
}

.mx_textButton {
@mixin mx_DialogButton_small;
@mixin mx_DialogButton_small;
}

.mx_textButton:hover {
Expand Down
2 changes: 1 addition & 1 deletion res/css/structures/_RoomSubList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ limitations under the License.
font-weight: 600;
font-size: 12px;
padding: 0 5px;
background-color: $accent-color;
background-color: $roomtile-name-color;
}

.mx_RoomSubList_addRoom, .mx_RoomSubList_badge {
Expand Down
4 changes: 2 additions & 2 deletions res/css/structures/_TagPanel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ limitations under the License.

.mx_TagPanel_groupsButton > .mx_GroupsButton:before {
mask: url('../../img/feather-icons/users.svg');
mask-position: center 10px;
mask-position: center 11px;
}

.mx_TagPanel_groupsButton > .mx_TagPanel_report:before {
mask: url('../../img/feather-icons/life-buoy.svg');
mask-position: center 10px;
mask-position: center 9px;
}

.mx_TagPanel_groupsButton > .mx_AccessibleButton {
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_EventTile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ limitations under the License.
}

.mx_EventTile_content .markdown-body a {
color: $accent-color;
color: $accent-color-alt;
}

.mx_EventTile_content .markdown-body .hljs {
Expand Down
7 changes: 1 addition & 6 deletions res/css/views/rooms/_RoomTile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ limitations under the License.
}

.mx_RoomTile_unreadNotify .mx_RoomTile_badge {
background-color: $accent-color;
background-color: $roomtile-name-color;
}

.mx_RoomTile_highlight .mx_RoomTile_badge {
Expand All @@ -130,10 +130,6 @@ limitations under the License.
.mx_RoomTile_selected {
border-radius: 4px;
background-color: $roomtile-selected-bg-color;

.mx_RoomTile_name {
color: $roomtile-selected-color;
}
}

.mx_DNDRoomTile {
Expand Down Expand Up @@ -162,4 +158,3 @@ limitations under the License.
.mx_RoomTile.mx_RoomTile_transparent:focus {
background-color: $roomtile-transparent-focused-color;
}

7 changes: 2 additions & 5 deletions res/img/feather-icons/life-buoy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions res/img/feather-icons/search-input.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions res/img/icons-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion res/img/topleft-chevron.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 15 additions & 9 deletions res/themes/dharma/css/_dharma.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,20 @@ $focus-bg-color: #dddddd;

// button UI (white-on-green in light skin)
$accent-fg-color: #ffffff;
$accent-color: #f56679;
$accent-color-50pct: #f56679;
$accent-color: #7ac9a1;
$accent-color-50pct: #92caad;
$accent-color-alt: #238CF5;

$selection-fg-color: $primary-bg-color;

$focus-brightness: 125%;
$focus-brightness: 105%;

// red warning colour
$warning-color: #ff0064;
$warning-color: #f56679;
// background colour for warnings
$warning-bg-color: #DF2A8B;
$info-bg-color: #2A9EDF;
$mention-user-pill-bg-color: #ff0064;
$mention-user-pill-bg-color: $warning-color;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);

// pinned events indicator
Expand Down Expand Up @@ -121,13 +122,13 @@ $rte-group-pill-color: #aaa;

$topleftmenu-color: #212121;
$roomheader-color: #45474a;
$roomheader-addroom-color: #929eb4;
$roomheader-addroom-color: #91A1C0;
$roomtopic-color: #9fa9ba;
$eventtile-meta-color: $roomtopic-color;

// ********************

$roomtile-name-color: #929eb4;
$roomtile-name-color: #61708b;
$roomtile-selected-color: #212121;
$roomtile-notified-color: #212121;
$roomtile-selected-bg-color: #fff;
Expand Down Expand Up @@ -215,7 +216,10 @@ $progressbar-color: #000;
> input[type=search] {
border: none;
flex: 1;
color: inherit; //from .mx_textinput
color: $primary-fg-color;
},
input::placeholder {
color: $roomsublist-label-fg-color;
}
}
}
Expand Down Expand Up @@ -262,9 +266,11 @@ input[type=search].mx_textinput_icon {
background-position: 10px center;
}


// FIXME THEME - Tint by CSS rather than referencing a duplicate asset
input[type=text].mx_textinput_icon.mx_textinput_search,
input[type=search].mx_textinput_icon.mx_textinput_search {
background-image: url('../../img/feather-icons/search.svg');
background-image: url('../../img/feather-icons/search-input.svg');
}

// dont search UI as not all browsers support it,
Expand Down