[epiphany/wip/exalm/bookmarks: 1/3] theme: Redo bookmark tag styling
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/exalm/bookmarks: 1/3] theme: Redo bookmark tag styling
- Date: Sun, 6 Oct 2019 11:35:50 +0000 (UTC)
commit 8cd7d1a9bde276bbf7d9d153b35c05824b63d54c
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Sun Oct 6 16:02:24 2019 +0500
theme: Redo bookmark tag styling
Instead of trying to use darkened bg color for background, just use
transparent black. Since it also matches the previous Adwaita look, remove
the override.
Add an override for elementary to have selected tags follow color accent,
and remove the unwanted icon shadow.
Some themes, incl. HighContrast, add border-radius on flowbox children.
Add a border-radius explicitly, matching the previous value for generic
style, and matching buttons for Adwaita.
src/resources/themes/_Adwaita-base.scss | 20 +++-----------------
src/resources/themes/_shared-base.scss | 13 ++++++-------
src/resources/themes/elementary.scss | 7 +++++++
3 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/src/resources/themes/_Adwaita-base.scss b/src/resources/themes/_Adwaita-base.scss
index 6c48bb344..9b028cfcb 100644
--- a/src/resources/themes/_Adwaita-base.scss
+++ b/src/resources/themes/_Adwaita-base.scss
@@ -229,29 +229,15 @@ $close_button_fg_color: if($variant == 'light', lighten($fg_color, 10%), darken(
}
.bookmark-tag-widget {
- background-color: darken($bg_color, 10%);
-
- image,
- label {
- color: $fg_color;
- }
+ border-radius: 5px;
button {
@include close_button();
}
}
-.bookmark-tag-widget-selected {
- background-color: themecolor(theme_selected_bg_color);
-
- image,
- label {
- color: themecolor(theme_selected_fg_color);
- }
-
- button {
- @include close_button($selected_bg_color, $selected_fg_color);
- }
+.bookmark-tag-widget-selected button {
+ @include close_button($selected_bg_color, $selected_fg_color);
}
.page-row-close-button {
diff --git a/src/resources/themes/_shared-base.scss b/src/resources/themes/_shared-base.scss
index 00fa9bf5c..42c33fed2 100644
--- a/src/resources/themes/_shared-base.scss
+++ b/src/resources/themes/_shared-base.scss
@@ -95,7 +95,8 @@
.bookmark-tag-widget {
padding-left: 8px;
- background-color: #{"darker(" + themecolor(theme_bg_color) + ")"};
+ background-color: rgba(0, 0, 0, .1);
+ border-radius: 3px;
label {
padding-left: 8px;
@@ -103,12 +104,9 @@
}
image,
- label {
- // FIXME: This should be theme_text_color, but HighContrast doesn't export it
- color: themecolor(theme_fg_color);
- }
-
+ label,
button:hover image {
+ // FIXME: This should be theme_text_color, but HighContrast doesn't export it
color: themecolor(theme_fg_color);
}
}
@@ -117,7 +115,8 @@
background-color: themecolor(theme_selected_bg_color);
image,
- label {
+ label,
+ button:hover image {
color: themecolor(theme_selected_fg_color);
}
}
diff --git a/src/resources/themes/elementary.scss b/src/resources/themes/elementary.scss
index cf0b06277..582c2ef68 100644
--- a/src/resources/themes/elementary.scss
+++ b/src/resources/themes/elementary.scss
@@ -116,3 +116,10 @@ dzlsuggestionpopover > revealer > box {
}
}
+.bookmark-tag-widget image {
+ -gtk-icon-shadow: none;
+}
+
+.bookmark-tag-widget-selected {
+ background-color: themecolor(colorAccent);
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]