Merge remote-tracking branch 'upstream/master'

peterychuang · Dec 13, 2017 · 16648e9 · 16648e9
2 parents 0e2b1ef + 7e0009f
commit 16648e9
Show file tree

Hide file tree

Showing 22 changed files with 304 additions and 34 deletions.
diff --git a/change_color.sh b/change_color.sh
@@ -99,20 +99,12 @@ ROUNDNESS_GTK2_HIDPI=$(( ${ROUNDNESS} * 2 ))
 INACTIVE_FG=$(mix ${FG} ${BG} 0.75)
 INACTIVE_MENU_FG=$(mix ${MENU_FG} ${MENU_BG} 0.75)
 INACTIVE_TXT_FG=$(mix ${TXT_FG} ${TXT_BG} 0.75)
+INACTIVE_TXT_BG=$(mix ${TXT_BG} ${BG} 0.60)
 
 light_folder_base_fallback="$(darker ${SEL_BG} -10)"
 medium_base_fallback="$(darker ${SEL_BG} 37)"
 dark_stroke_fallback="$(darker ${SEL_BG} 50)"
 
-ICONS_LIGHT_FOLDER="${ICONS_LIGHT_FOLDER-$light_folder_base_fallback}"
-ICONS_LIGHT="${ICONS_LIGHT-$SEL_BG}"
-ICONS_MEDIUM="${ICONS_MEDIUM-$medium_base_fallback}"
-ICONS_DARK="${ICONS_DARK-$dark_stroke_fallback}"
-
-CARET1_FG="${CARET1_FG-$TXT_FG}"
-CARET2_FG="${CARET2_FG-$TXT_FG}"
-CARET_SIZE="${CARET_SIZE-0.04}"
-
 OUTPUT_THEME_NAME="${OUTPUT_THEME_NAME-oomox-$THEME}"
 DEST_PATH="$HOME/.themes/${OUTPUT_THEME_NAME/\//-}"
 
@@ -161,11 +153,11 @@ for FILEPATH in "${PATHLIST[@]}"; do
 		\
 		-e 's/^\(\$bg_color:.*\$variant.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%BG%\2%MENU_BG%\3/g' \
 		-e 's/^\(\$base_color:.*\$variant.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%TXT_BG%\2%MENU_BG%\3/g' \
-		-e 's/^\(\$alt_base_color:.*\$variant.*\)\$\w\+\(.*\)$/\1%BTN_BG%\2/g' \
+		-e 's/^\(\$alt_base_color:.*\$variant.*\)\$\w\+\(.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%INACTIVE_TXT_BG%\2%INACTIVE_TXT_BG%\3%MENU_BG%\4/g' \
 		-e 's/^\(\$lighter_bg_color:.*\$variant.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%BTN_BG%\2%BTN_BG%\3/g' \
 		-e 's/^\(\$darker_bg_color:.*\$variant.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%BG%\2%MENU_BG%\3/g' \
 		\
-		-e 's/^\(\$titlebar_bg_color:.*\$variant.*\)\$\w\+\(.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%MENU_BG%\2%MENU_BG%\3%MENU_BG%\4/g' \
+		-e 's/^\(\$titlebar_bg_color:\).*;.*$/\1 %MENU_BG%;/g' \
 		-e 's/^\(\$alt_titlebar_bg_color:.*\$titlebar.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%MENU_BG%\2%MENU_BG%\3/g' \
 		-e 's/^\(\$panel_bg_color:.*\)$black\(.*\)$/\1%MENU_BG%\2/g' \
 		-e 's/^\(\$solid_panel_bg_color:.*\$titlebar.*\)\$\w\+\(.*\)\$\w\+\(.*\)$/\1%MENU_BG%\2%MENU_BG%\3/g' \
@@ -176,6 +168,8 @@ for FILEPATH in "${PATHLIST[@]}"; do
 		-e 's/^\(\$alt_primary_color:\).*;.*$/\1 %SEL_BG2%;/g' \
 		-e 's/^\(\$accent_color:\).*;.*$/\1 %ACCENT_BG%;/g' \
 		\
+		-e 's/^\(\$titlebar_highlight_color:\).*;.*$/\1 %MENU_BG%;/g' \
+		\
 		-e 's/$black/%FG%/g' \
 		-e 's/#000000/%FG%/g' \
 		-e 's/$grey_900/%FG%/g' \
@@ -219,12 +213,10 @@ done
 		#-e 's/%INACTIVE_FG%/'"$INACTIVE_FG"'/g' \
 		#-e 's/%INACTIVE_TXT_FG%/'"$INACTIVE_TXT_FG"'/g' \
 		#-e 's/%INACTIVE_MENU_FG%/'"$INACTIVE_MENU_FG"'/g' \
-		#-e 's/%ICONS_DARK%/'"$ICONS_DARK"'/g' \
-		#-e 's/%ICONS_MEDIUM%/'"$ICONS_MEDIUM"'/g' \
-		#-e 's/%ICONS_LIGHT%/'"$ICONS_LIGHT"'/g' \
-		#-e 's/%ICONS_LIGHT_FOLDER%/'"$ICONS_LIGHT_FOLDER"'/g' \
 
-#echo "You can debug TEMP DIR: ${tempdir}, press [Enter] when finish" && read
+if [[ ! -z "${DEBUG:-}" ]] ; then
+	echo "You can debug TEMP DIR: ${tempdir}, press [Enter] when finish" && read
+fi
 
 echo "== Filling the template with the new colorscheme..."
 for FILEPATH in "${PATHLIST[@]}"; do
@@ -252,11 +244,8 @@ for FILEPATH in "${PATHLIST[@]}"; do
 		-e 's/%SPACING%/'"$SPACING"'/g' \
 		-e 's/%INACTIVE_FG%/#'"$INACTIVE_FG"'/g' \
 		-e 's/%INACTIVE_TXT_FG%/#'"$INACTIVE_TXT_FG"'/g' \
+		-e 's/%INACTIVE_TXT_BG%/#'"$INACTIVE_TXT_BG"'/g' \
 		-e 's/%INACTIVE_MENU_FG%/#'"$INACTIVE_MENU_FG"'/g' \
-		-e 's/%ICONS_DARK%/#'"$ICONS_DARK"'/g' \
-		-e 's/%ICONS_MEDIUM%/#'"$ICONS_MEDIUM"'/g' \
-		-e 's/%ICONS_LIGHT%/#'"$ICONS_LIGHT"'/g' \
-		-e 's/%ICONS_LIGHT_FOLDER%/#'"$ICONS_LIGHT_FOLDER"'/g' \
 		-e 's/%OUTPUT_THEME_NAME%/'"$OUTPUT_THEME_NAME"'/g' \
 		{} \; ;
 done

diff --git a/src/gnome-shell/3.18/gnome-shell-compact.css b/src/gnome-shell/3.18/gnome-shell-compact.css
@@ -1476,6 +1476,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.23077em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.23077em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.18/gnome-shell-dark-compact.css b/src/gnome-shell/3.18/gnome-shell-dark-compact.css
@@ -1476,6 +1476,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.23077em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.23077em;
+}
+
 .system-menu-action {
   color: rgba(255, 255, 255, 0.7);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.18/gnome-shell-dark.css b/src/gnome-shell/3.18/gnome-shell-dark.css
@@ -1476,6 +1476,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.14286em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.14286em;
+}
+
 .system-menu-action {
   color: rgba(255, 255, 255, 0.7);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.18/gnome-shell-light-compact.css b/src/gnome-shell/3.18/gnome-shell-light-compact.css
@@ -1476,6 +1476,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.23077em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.23077em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.18/gnome-shell-light.css b/src/gnome-shell/3.18/gnome-shell-light.css
@@ -1476,6 +1476,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.14286em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.14286em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.18/gnome-shell.css b/src/gnome-shell/3.18/gnome-shell.css
@@ -1476,6 +1476,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.14286em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.14286em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.18/sass/_common.scss b/src/gnome-shell/3.18/sass/_common.scss
@@ -1225,6 +1225,12 @@ StScrollBar {
   .aggregate-menu {
     min-width: 280px;
     .popup-menu-icon { padding: 0 4px; }
+    .popup-sub-menu .popup-menu-item :first-child {
+      &:ltr { /* 8px spacing + 2*4px padding */
+              padding-left: 16px; margin-left: em(16px); }
+      &:rtl { /* 8px spacing + 2*4px padding */
+              padding-right: 16px; margin-right: em(16px); }
+    }
   }
 
   .system-menu-action {

diff --git a/src/gnome-shell/3.24/gnome-shell-compact.css b/src/gnome-shell/3.24/gnome-shell-compact.css
@@ -1518,6 +1518,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.23077em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.23077em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.24/gnome-shell-dark-compact.css b/src/gnome-shell/3.24/gnome-shell-dark-compact.css
@@ -1518,6 +1518,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.23077em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.23077em;
+}
+
 .system-menu-action {
   color: rgba(255, 255, 255, 0.7);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.24/gnome-shell-dark.css b/src/gnome-shell/3.24/gnome-shell-dark.css
@@ -1518,6 +1518,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.14286em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.14286em;
+}
+
 .system-menu-action {
   color: rgba(255, 255, 255, 0.7);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.24/gnome-shell-light-compact.css b/src/gnome-shell/3.24/gnome-shell-light-compact.css
@@ -1518,6 +1518,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.23077em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.23077em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.24/gnome-shell-light.css b/src/gnome-shell/3.24/gnome-shell-light.css
@@ -1518,6 +1518,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.14286em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.14286em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.24/gnome-shell.css b/src/gnome-shell/3.24/gnome-shell.css
@@ -1518,6 +1518,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.14286em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.14286em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;

diff --git a/src/gnome-shell/3.24/sass/_common.scss b/src/gnome-shell/3.24/sass/_common.scss
@@ -1240,6 +1240,12 @@ StScrollBar {
   .aggregate-menu {
     min-width: 280px;
     .popup-menu-icon { padding: 0 4px; }
+    .popup-sub-menu .popup-menu-item :first-child {
+      &:ltr { /* 8px spacing + 2*4px padding */
+              padding-left: 16px; margin-left: em(16px); }
+      &:rtl { /* 8px spacing + 2*4px padding */
+              padding-right: 16px; margin-right: em(16px); }
+    }
   }
 
   .system-menu-action {

diff --git a/src/gnome-shell/3.26/gnome-shell-compact.css b/src/gnome-shell/3.26/gnome-shell-compact.css
@@ -891,6 +891,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
   border: none;
   background-color: rgba(0, 0, 0, 0.12);
+  color: rgba(0, 0, 0, 0.87);
 }
 
 .switcher-list .item-box:selected {
@@ -1112,6 +1113,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: #424242;
   /* transition from transparent to solid */
   transition-duration: 250ms;
+  background-gradient-direction: none;
+  text-shadow: none;
+}
+
+#panel.solid:overview {
+  background-color: transparent;
 }
 
 #panel.solid .panel-corner {
@@ -1123,7 +1130,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   text-shadow: none;
 }
 
-#panel.solid .panel-button:hover {
+#panel.solid .panel-button:hover, #panel.solid .panel-button:active, #panel.solid .panel-button:overview, #panel.solid .panel-button:focus, #panel.solid .panel-button:checked {
   color: #FFFFFF;
 }
 
@@ -1554,6 +1561,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 0 4px;
 }
 
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:ltr {
+  /* 8px spacing + 2*4px padding */
+  padding-left: 16px;
+  margin-left: 1.23077em;
+}
+
+.aggregate-menu .popup-sub-menu .popup-menu-item :first-child:rtl {
+  /* 8px spacing + 2*4px padding */
+  padding-right: 16px;
+  margin-right: 1.23077em;
+}
+
 .system-menu-action {
   color: rgba(0, 0, 0, 0.54);
   border-radius: 100px;
@@ -1719,7 +1738,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .window-picker {
   -horizontal-spacing: 16px;
   -vertical-spacing: 16px;
-  padding: 0 16px 16px;
+  padding: 0 16px 32px;
 }
 
 .window-picker.external-monitor {