From 359a8d8c2c0551655cf8ce72d0562d9c2c0e401e Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 14 Aug 2015 00:05:57 +0200 Subject: update build system --- common/Makefile.am | 19 ++++++++++++++----- common/gnome-shell/3.16/gnome-shell.css | 14 +------------- common/gnome-shell/3.16/sass/_common.scss | 18 ++---------------- 3 files changed, 17 insertions(+), 34 deletions(-) (limited to 'common') diff --git a/common/Makefile.am b/common/Makefile.am index 154d634..19b2c8a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -24,15 +24,23 @@ if ENABLE_DARK endif # ENABLE_DARK +if ENABLE_CINNAMON + $(MKDIR_P) $(ithemedir)/cinnamon + + cd $(srcdir)/cinnamon && cp -r --no-preserve=mode,ownership \ + common-assets \ + light-assets \ + cinnamon.css \ + $(ithemedir)/cinnamon +endif # ENABLE_GNOME_SHELL + + if ENABLE_GNOME_SHELL $(MKDIR_P) $(ithemedir)/gnome-shell cd $(srcdir)/gnome-shell/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \ - checkbox \ - dash \ - menu \ - misc \ - switch \ + common-assets \ + light-assets \ gnome-shell.css \ $(ithemedir)/gnome-shell endif # ENABLE_GNOME_SHELL @@ -245,6 +253,7 @@ uninstall-local: dist-hook: cp -r \ + cinnamon \ gnome-shell \ gtk-2.0 \ gtk-3.0 \ diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 17db047..70ab7da 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -961,7 +961,7 @@ StScrollBar { height: 26px; width: 26px; } .window-close:active { - background-image: url("misc/close-active.svg"); + background-image: url("common-assets/misc/close-active.svg"); background-size: 26px; height: 26px; width: 26px; } @@ -1939,15 +1939,3 @@ StEntry.chat-response { border: 1px solid grey; border-radius: 2px; padding: 6px; } - -/*tweaks*/ -.panel-button:active, -.panel-button:overview, -.panel-button:focus, -.panel-button:hover, -#appMenu, -#panel { - text-shadow: 0px 0px white; } - -stage { - font-weight: bold; } diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 4f72cbe..2b8dddb 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -609,7 +609,7 @@ StScrollBar { background: none; border: none; border-radius: 5px; - border-image: url("common-assets/misc/osd.svg") 9 9 9 9; + border-image: url("common-assets/misc/osd.svg") 9 9 9 9; .osd-monitor-label { font-size: 3em; } @@ -1214,7 +1214,7 @@ StScrollBar { } &:active { - background-image: url("misc/close-active.svg"); + background-image: url("common-assets/misc/close-active.svg"); background-size: 26px; height: 26px; width: 26px; @@ -2256,17 +2256,3 @@ $legacy_icon_size: 24px; border-radius: 2px; padding: 6px; } - -/*tweaks*/ -.panel-button:active, -.panel-button:overview, -.panel-button:focus, -.panel-button:hover, -#appMenu, - #panel { - text-shadow: 0px 0px white; -} - -stage { - font-weight: bold; -} -- cgit v1.2.3