Skip to content

Commit

Permalink
Dark theme tweaks
Browse files Browse the repository at this point in the history
* Fixes hourglasses
* Fix delivered status icon
* Other changes aiming for more consistency of visual structure
  between light and dark themes.
* Restores left pane header focus/transition effect.
  • Loading branch information
liliakai committed Dec 2, 2016
1 parent 53cd3af commit ee334d3
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 39 deletions.
1 change: 1 addition & 0 deletions images/x_white.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 30 additions & 17 deletions stylesheets/android-dark.scss
Expand Up @@ -10,18 +10,21 @@ $text-dark: #CCCCCC;
border-color: $grey-dark;
}
#header {
background-color: $grey-dark;
color: $text-dark;
background-color: $blue;
color: white;
transition: background-color 0.5s;
&.inactive {
background-color: $grey-dark;
color: $text-dark;
}
}
.message-detail, .message-container, .conversation, .modal .content,
.discussion-container, .attachment-previews {
.message-detail, .message-container, .conversation,
.discussion-container {
background-color: $grey-dark_l3;
}
.modal .content {
background-color: $grey-dark;
}
.lightbox .content {
background-color: rgba(0, 0, 0, 0);
}
Expand All @@ -37,9 +40,9 @@ $text-dark: #CCCCCC;
}
}
.flex {
background-color: $grey-dark_l2;
background-color: $grey-dark_l3;
.send-message {
background-color: $grey-dark_l2;
background-color: $grey-dark_l3;
color: $text-dark;
}
}
Expand Down Expand Up @@ -73,6 +76,10 @@ $text-dark: #CCCCCC;
display: inline-block;
@include color-svg('/images/check.svg', white);
}
.delivered .status {
display: inline-block;
@include color-svg('/images/double-check.svg', white);
}
.paperclip:before {
content: '';
display: inline-block;
Expand All @@ -82,7 +89,7 @@ $text-dark: #CCCCCC;
transform: rotateZ(-45deg);
}
.scrollable {
background-color: $grey-dark_l3;
background-color: $grey-dark_l2;
.conversation-list-item {
background-color: $grey-dark_l3;
color: $text-dark;
Expand All @@ -91,11 +98,18 @@ $text-dark: #CCCCCC;
.bottom-bar {
min-height: 10px;
background-color: $grey-dark_l2;
form.send {
background: $grey-dark_l3;
}
}
.search {
background-color: $grey-dark_l2;
background-color: $grey-dark_l3;
border-color: $grey-dark_l2;
@include invert-text-color;
&::-webkit-search-cancel-button {
background: url('/images/x_white.svg') no-repeat center;
background-size: cover;
}
}
.bubble {
padding: 9px 12px;
Expand All @@ -106,9 +120,13 @@ $text-dark: #CCCCCC;
.outgoing .bubble {
background-color: $grey-dark;
@include invert-text-color;
color: $text-dark;
}
.outgoing .hourglass, .incoming .hourglass {
@include hourglass(#000);
.outgoing .hourglass {
@include hourglass(#999);
}
.incoming .hourglass {
@include hourglass(#fff);
}

.incoming .bubble {
Expand All @@ -130,17 +148,12 @@ $text-dark: #CCCCCC;
button.back {
@include header-icon-white('/images/back.svg');
}
button.grey {
background-color: $grey-dark;
color: $text-dark;
border-color: $grey-dark_l2;
}

::-webkit-scrollbar-thumb {
background: rgba(120,120,120,0.15);
background: rgba(255,255,255,0.15);

&:hover {
background: rgba(120,120,120,0.25);
background: rgba(255,255,255,0.25);
}
}
::-webkit-scrollbar-track {
Expand Down
75 changes: 53 additions & 22 deletions stylesheets/manifest.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ee334d3

Please sign in to comment.