From 17e8fc689c94baa83a839b0930b9e88cb082a9a4 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Mon, 14 Nov 2016 16:31:24 -0600 Subject: [PATCH] update makefile. cherry-pick commit from main repo. --- Makefile | 6 +++--- src/toolkits/gtk-3.20/scss/_widgets.scss | 1 + src/toolkits/gtk-3.20/scss/apps/_gnome-terminal.scss | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 659d85104..2dde9cce7 100644 --- a/Makefile +++ b/Makefile @@ -82,9 +82,9 @@ uninstall: zip: all - mkdir $(ROOT_DIR)/dist - $(UTILS) install $(ROOT_DIR)/dist/$$(basename $(INSTALL_DIR)) - cd $(ROOT_DIR)/dist && zip --symlinks -rq $$(basename $(INSTALL_DIR)) $$(basename $(INSTALL_DIR)) + mkdir $(REPO_ROOT_DIR)/dist + $(UTILS) install $(REPO_ROOT_DIR)/dist/$$(basename $(INSTALL_DIR)) + cd $(REPO_ROOT_DIR)/dist && zip --symlinks -rq $$(basename $(INSTALL_DIR)) $$(basename $(INSTALL_DIR)) diff --git a/src/toolkits/gtk-3.20/scss/_widgets.scss b/src/toolkits/gtk-3.20/scss/_widgets.scss index f53ca005c..719463b53 100644 --- a/src/toolkits/gtk-3.20/scss/_widgets.scss +++ b/src/toolkits/gtk-3.20/scss/_widgets.scss @@ -37,4 +37,5 @@ @import "apps/xfce"; @import "apps/unity"; @import "apps/lightdm"; +@import "apps/gnome-terminal"; @import "apps/budgie"; diff --git a/src/toolkits/gtk-3.20/scss/apps/_gnome-terminal.scss b/src/toolkits/gtk-3.20/scss/apps/_gnome-terminal.scss index ee3e4cbd7..b389ec6a1 100644 --- a/src/toolkits/gtk-3.20/scss/apps/_gnome-terminal.scss +++ b/src/toolkits/gtk-3.20/scss/apps/_gnome-terminal.scss @@ -14,10 +14,10 @@ background-color: $osd_base; border-color: border_normal($osd_base); - &:backdrop { - background-color: shade($backdrop_osd_bg, .9); - border-color: border_normal(shade($backdrop_osd_bg, .9)); - } + //&:backdrop { + // background-color: shade($backdrop_osd_bg, .9); + // border-color: border_normal(shade($backdrop_osd_bg, .9)); + //} } scrollbar.vertical { @@ -28,7 +28,7 @@ &:hover:active { background-color: $selected_bg_color; } - &:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); } + //&:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); } &:disabled { background-color: transparent; } }