[gtk+] Revert "Adwaita: theme active-menu buttons"
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "Adwaita: theme active-menu buttons"
- Date: Fri, 12 Sep 2014 17:12:41 +0000 (UTC)
commit 8c6b2fb94b4095818fb075990f81daaf4e2fd39a
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Fri Sep 12 19:09:53 2014 +0200
Revert "Adwaita: theme active-menu buttons"
This is app specific, doesn't belongs here.
gtk/resources/theme/Adwaita/_common.scss | 2 +-
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 6 +++---
gtk/resources/theme/Adwaita/gtk-contained.css | 6 +++---
gtk/resources/theme/Adwaita/parse-sass.sh | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 4a307bd..9bc7656 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -338,7 +338,7 @@ $_dot_color: if($variant=='light', $selected_bg_color,
@include button(hover);
-gtk-image-effect: highlight;
}
- &:active, &:checked, &.active-menu {
+ &:active, &:checked {
@include button(active);
transition-duration: 50ms;
}
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index a6696b1..05748a5 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -307,9 +307,7 @@ GtkCalendar.header .button.titlebutton {
.titlebar .button.titlebutton:active,
GtkCalendar.header .button.titlebutton:active, .button:checked, .header-bar .button.titlebutton:checked,
.titlebar .button.titlebutton:checked,
- GtkCalendar.header .button.titlebutton:checked, .button.active-menu, .header-bar
.active-menu.button.titlebutton,
- .titlebar .active-menu.button.titlebutton,
- GtkCalendar.header .active-menu.button.titlebutton {
+ GtkCalendar.header .button.titlebutton:checked {
color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3);
border-color: #1c1f1f;
@@ -4169,3 +4167,5 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
@define-color wm_button_active_color_b shade(#393f3f, 0.89);
@define-color wm_button_active_color_c shade(#393f3f, 0.9);
@define-color content_view_bg #292929;
+
+/*# sourceMappingURL=gtk-contained-dark.css.map */
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index d9224ae..75dec98 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -299,9 +299,7 @@ GtkCalendar.header .button.titlebutton {
.titlebar .button.titlebutton:active,
GtkCalendar.header .button.titlebutton:active, .button:checked, .header-bar .button.titlebutton:checked,
.titlebar .button.titlebutton:checked,
- GtkCalendar.header .button.titlebutton:checked, .button.active-menu, .header-bar
.active-menu.button.titlebutton,
- .titlebar .active-menu.button.titlebutton,
- GtkCalendar.header .active-menu.button.titlebutton {
+ GtkCalendar.header .button.titlebutton:checked {
color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3);
border-color: #a1a1a1;
@@ -4328,3 +4326,5 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
@define-color wm_button_active_color_b shade(#ededed, 0.89);
@define-color wm_button_active_color_c shade(#ededed, 0.9);
@define-color content_view_bg #ffffff;
+
+/*# sourceMappingURL=gtk-contained.css.map */
diff --git a/gtk/resources/theme/Adwaita/parse-sass.sh b/gtk/resources/theme/Adwaita/parse-sass.sh
index 333bbc5..2486480 100755
--- a/gtk/resources/theme/Adwaita/parse-sass.sh
+++ b/gtk/resources/theme/Adwaita/parse-sass.sh
@@ -1,3 +1,3 @@
#!/usr/bin/bash
-sass --update --sourcemap=none .
+sass --update .
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]