use libsass and update build system

.gitignore

@@ -0,0 +1 @@
+node_modules

common/Makefile.am

@@ -25,54 +25,61 @@ endif # ENABLE_DARK
 
 
 if ENABLE_GNOME_SHELL
-	$(MKDIR_P) $(ithemedir)
+	$(MKDIR_P) $(ithemedir)/gnome-shell
-	cp -rH --no-preserve=mode,ownership $(srcdir)/gnome-shell/$(GNOME_VERSION) $(ithemedir)/gnome-shell
+
+	cd $(srcdir)/gnome-shell/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
+		checkbox \
+		dash \
+		menu \
+		misc \
+		switch \
+		gnome-shell.css \
+		$(ithemedir)/gnome-shell
 endif # ENABLE_GNOME_SHELL
 
 
 if ENABLE_GTK2
 
 if ENABLE_LIGHT
-	cp -r --no-preserve=mode,ownership $(srcdir)/gtk-2.0 $(ithemedir)
+	$(MKDIR_P) $(ithemedir)/gtk-2.0
 
-	cd $(ithemedir)/gtk-2.0 && rm -rf \
+	cd $(srcdir)/gtk-2.0 && cp -r --no-preserve=mode,ownership \
-		assets-dark \
+		assets \
-		gtkrc-darker \
+		menubar-toolbar \
-		gtkrc-dark \
+		*.rc \
-		*.sh \
+		gtkrc \
-		assets.svg \
+		$(ithemedir)/gtk-2.0
-		assets-dark.svg \
-		assets.txt
 endif # ENABLE_LIGHT
 
 if ENABLE_DARKER
-	cp -r --no-preserve=mode,ownership $(srcdir)/gtk-2.0 $(ithemedarkerdir)
+	$(MKDIR_P) $(ithemedarkerdir)/gtk-2.0
 
-	cd $(ithemedarkerdir)/gtk-2.0 && mv gtkrc-darker gtkrc
+	cd $(srcdir)/gtk-2.0 && cp -r --no-preserve=mode,ownership \
+		assets \
+		menubar-toolbar \
+		*.rc \
+		$(ithemedarkerdir)/gtk-2.0
 
-	cd $(ithemedarkerdir)/gtk-2.0 && rm -rf \
+	cd $(srcdir)/gtk-2.0 && cp -r --no-preserve=mode,ownership \
-		assets-dark \
+		gtkrc-darker \
-		gtkrc-dark \
+		$(ithemedarkerdir)/gtk-2.0/gtkrc
-		*.sh \
-		assets.svg \
-		assets-dark.svg \
-		assets.txt
 endif # ENABLE_DARKER
 
 if ENABLE_DARK
-	cp -r --no-preserve=mode,ownership $(srcdir)/gtk-2.0 $(ithemedarkdir)
+	$(MKDIR_P) $(ithemedarkdir)/gtk-2.0
 
-	cd $(ithemedarkdir)/gtk-2.0 && \
+	cd $(srcdir)/gtk-2.0 && cp -r --no-preserve=mode,ownership \
-		mv gtkrc-dark gtkrc && \
+		menubar-toolbar \
-		rm -rf assets && \
+		*.rc \
-		mv assets-dark assets
+		$(ithemedarkdir)/gtk-2.0
 
-	cd $(ithemedarkdir)/gtk-2.0 && rm -rf \
+	cd $(srcdir)/gtk-2.0 && cp -r --no-preserve=mode,ownership \
-		gtkrc-darker \
+		assets-dark \
-		*.sh \
+		$(ithemedarkdir)/gtk-2.0/assets
-		assets.svg \
+
-		assets-dark.svg \
+	cd $(srcdir)/gtk-2.0 && cp -r --no-preserve=mode,ownership \
-		assets.txt
+		gtkrc-dark \
+		$(ithemedarkdir)/gtk-2.0/gtkrc
 endif # ENABLE_DARK
 
 endif # ENABLE_GTK2
@@ -81,87 +88,71 @@ endif # ENABLE_GTK2
 if ENABLE_GTK3
 
 if ENABLE_LIGHT
-	cp -rH --no-preserve=mode,ownership $(srcdir)/gtk-3.0/$(GNOME_VERSION) $(ithemedir)/gtk-3.0
+	$(MKDIR_P) $(ithemedir)/gtk-3.0
-
-	cd $(ithemedir)/gtk-3.0 && rm -f \
-		assets.svg \
-		README \
-		*.scss \
-		*.sh \
-		*.txt \
-		Gemfile* \
-		gtk-contained-darker.css \
-		gtk-contained-solid-darker.css
-
-if ENABLE_TRANSPARENCY
-	cd $(ithemedir)/gtk-3.0 && rm \
-		gtk-contained-solid.css \
-		gtk-contained-solid-dark.css
-endif # ENABLE_TRANSPARENCY
 
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
+		assets \
+		gtk.css \
+		gtk-contained.css \
+		gtk-dark.css \
+		gtk-contained-dark.css \
+		$(ithemedir)/gtk-3.0
 endif # ENABLE_LIGHT
 
 if ENABLE_DARKER
-	cp -rH --no-preserve=mode,ownership $(srcdir)/gtk-3.0/$(GNOME_VERSION) $(ithemedarkerdir)/gtk-3.0
+	$(MKDIR_P) $(ithemedarkerdir)/gtk-3.0
 
-	cd $(ithemedarkerdir)/gtk-3.0 && rm -f \
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
-		assets.svg \
+		assets \
-		README \
+		gtk.css \
-		*.scss \
+		gtk-dark.css \
-		*.sh \
+		gtk-contained-dark.css \
-		*.txt \
+		$(ithemedarkerdir)/gtk-3.0
-		Gemfile* \
-		gtk-contained-solid.css
 
-if ENABLE_TRANSPARENCY
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
-	cd $(ithemedarkerdir)/gtk-3.0 && rm \
+		gtk-contained-darker.css \
-		gtk-contained-solid-darker.css \
+		$(ithemedarkerdir)/gtk-3.0/gtk-contained.css
-		gtk-contained-solid-dark.css
-endif # ENABLE_TRANSPARENCY
-
-	cd $(ithemedarkerdir)/gtk-3.0 && mv gtk-contained-darker.css gtk-contained.css
 endif # ENABLE_DARKER
 
 if ENABLE_DARK
-	cp -rH --no-preserve=mode,ownership $(srcdir)/gtk-3.0/$(GNOME_VERSION) $(ithemedarkdir)/gtk-3.0
+	$(MKDIR_P) $(ithemedarkdir)/gtk-3.0
 
-	cd $(ithemedarkdir)/gtk-3.0 && rm -f \
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
-		assets.svg \
+		assets \
-		README \
+		gtk.css \
-		*.scss \
+		$(ithemedarkdir)/gtk-3.0
-		*.sh \
-		*.txt \
-		Gemfile* \
-		gtk-dark.css \
-		gtk-contained-solid.css \
-		gtk-contained-darker.css \
-		gtk-contained-solid-darker.css
 
-if ENABLE_TRANSPARENCY
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
-	cd $(ithemedarkdir)/gtk-3.0 && rm \
+		gtk-contained-dark.css \
-		gtk-contained-solid-dark.css
+		$(ithemedarkdir)/gtk-3.0/gtk-contained.css
-endif # ENABLE_TRANSPARENCY
-
-	cd $(ithemedarkdir)/gtk-3.0 && mv gtk-contained-dark.css gtk-contained.css
 endif # ENABLE_DARK
 
 if !ENABLE_TRANSPARENCY
 
 if ENABLE_LIGHT
-	cd $(ithemedir)/gtk-3.0 && \
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
-		mv gtk-contained-solid.css gtk-contained.css && \
+		gtk-contained-solid.css \
-		mv gtk-contained-solid-dark.css gtk-contained-dark.css
+		$(ithemedir)/gtk-3.0/gtk-contained.css
+
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
+		gtk-contained-solid-dark.css \
+		$(ithemedir)/gtk-3.0/gtk-contained-dark.css
 endif # ENABLE_LIGHT
 
 if ENABLE_DARKER
-	cd $(ithemedarkerdir)/gtk-3.0 && \
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
-		mv gtk-contained-solid-darker.css gtk-contained.css && \
+		gtk-contained-solid-darker.css \
-		mv gtk-contained-solid-dark.css gtk-contained-dark.css
+		$(ithemedarkerdir)/gtk-3.0/gtk-contained.css
+
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
+		gtk-contained-solid-dark.css \
+		$(ithemedarkerdir)/gtk-3.0/gtk-contained-dark.css
 endif # ENABLE_DARKER
 
 if ENABLE_DARK
-	cd $(ithemedarkdir)/gtk-3.0 && \
+	cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -r --no-preserve=mode,ownership \
-		mv gtk-contained-solid-dark.css gtk-contained.css
+		gtk-contained-solid-dark.css \
+		$(ithemedarkdir)/gtk-3.0/gtk-contained.css
 endif # ENABLE_DARK
 
 endif #!ENABLE_TRANSPARENCY

common/gnome-shell/3.14/gnome-shell.css

@@ -1034,7 +1034,7 @@ StScrollBar StButton#vhandle:active {
 }
 
 .placeholder {
-    background-image: url("misc/dash-placeholder.svg");
+    background-image: url("dash/dash-placeholder.svg");
     background-size: contain;
     height: 24px;
 }

common/gnome-shell/3.16/.nvmrc

@@ -0,0 +1 @@
+0.12.5

common/gnome-shell/3.16/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem "sass", "~> 3.4.0"

common/gnome-shell/3.16/Gemfile.lock

@@ -1,10 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    sass (3.4.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  sass (~> 3.4.0)

common/gnome-shell/3.16/gnome-shell.css

@@ -51,7 +51,8 @@ stage {
     color: #5294E2;
     background-color: #fcfdfd;
     border: 1px solid #5294E2; }
-  .button:active, .notification-banner .notification-button:active, .button:active:focus, .notification-banner .notification-button:active:focus {
+  .button:active, .notification-banner .notification-button:active,
+  .button:active:focus, .notification-banner .notification-button:active:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #ffffff;
@@ -83,8 +84,8 @@ StEntry {
   StEntry:insensitive {
     box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: rgba(92, 97, 108, 0.55);
-    background-color: #fcfcfd;
+    background-color: #fcfdfd;
-    border-color: 1px solid #e1e6ef; }
+    border-color: 1px solid #e2e6ef; }
   StEntry StIcon.capslock-warning {
     icon-size: 16px;
     warning-color: #F27835;
@@ -92,6 +93,7 @@ StEntry {
 
 StScrollView.vfade {
   -st-vfade-offset: 0px; }
+
 StScrollView.hfade {
   -st-hfade-offset: 0px; }
 
@@ -105,11 +107,11 @@ StScrollBar {
     border-radius: 8px; }
   StScrollBar StButton#vhandle, StScrollBar StButton#hhandle {
     border-radius: 4px;
-    background-color: #babcc1;
+    background-color: #babdc2;
     border: 0px solid;
     margin: 0px; }
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
-      background-color: #c9ccd0; }
+      background-color: #caccd0; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
       background-color: #5294E2; }
 
@@ -129,14 +131,18 @@ StScrollBar {
 
 .check-box StBoxLayout {
   spacing: .8em; }
+
 .check-box StBin {
   width: 16px;
   height: 16px;
   background-image: url("checkbox/checkbox-unchecked.svg"); }
+
 .check-box:focus StBin {
   background-image: url("checkbox/checkbox-unchecked-focused.svg"); }
+
 .check-box:checked StBin {
   background-image: url("checkbox/checkbox-checked.svg"); }
+
 .check-box:focus:checked StBin {
   background-image: url("checkbox/checkbox-checked-focused.svg"); }
 
@@ -204,7 +210,7 @@ StScrollBar {
       .modal-dialog-button-box .button:insensitive, .modal-dialog-button-box .notification-banner .notification-button:insensitive, .notification-banner .modal-dialog-button-box .notification-button:insensitive {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
         box-shadow: inset 0 0 rgba(255, 255, 255, 0);
-        color: #5c6069;
+        color: #5c6169;
         border-color: rgba(168, 173, 181, 0.2);
         background-image: rgba(53, 57, 65, 0.95); }
   .modal-dialog .run-dialog-entry {
@@ -334,6 +340,7 @@ StScrollBar {
 
 .show-processes-dialog-app-list-item-icon:ltr {
   padding-right: 17px; }
+
 .show-processes-dialog-app-list-item-icon:rtl {
   padding-left: 17px; }
 
@@ -376,8 +383,10 @@ StScrollBar {
   .polkit-dialog-user-layout:rtl {
     padding-left: 0px;
     padding-right: 10px; }
+
 .polkit-dialog-user-root-label {
   color: #F27835; }
+
 .polkit-dialog-user-user-icon {
   border-radius: 2px;
   background-size: contain;
@@ -405,9 +414,9 @@ StScrollBar {
   .popup-menu .popup-menu-item {
     spacing: 12px; }
     .popup-menu .popup-menu-item:ltr {
-      padding: .4em 3em .4em 0em; }
+      padding: 0.4em 3em 0.4em 0em; }
     .popup-menu .popup-menu-item:rtl {
-      padding: .4em 0em .4em 3em; }
+      padding: 0.4em 0em 0.4em 3em; }
     .popup-menu .popup-menu-item:checked {
       background: none;
       box-shadow: none;
@@ -582,7 +591,9 @@ StScrollBar {
   font-weight: bold;
   height: 2.1em;
   min-height: 26px; }
-  #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
+  #panel.unlock-screen,
+  #panel.login-screen,
+  #panel.lock-screen {
     background-color: transparent;
     border-image: none; }
   #panel:overview {
@@ -623,9 +634,17 @@ StScrollBar {
     #panel .panel-button .system-status-icon {
       icon-size: 16px;
       padding: 0 8px; }
-    .unlock-screen #panel .panel-button, .login-screen #panel .panel-button, .lock-screen #panel .panel-button {
+    .unlock-screen #panel .panel-button,
+    .login-screen #panel .panel-button,
+    .lock-screen #panel .panel-button {
       color: #737a88; }
-      .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active, .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active {
+      .unlock-screen #panel .panel-button:focus,
+      .unlock-screen #panel .panel-button:hover,
+      .unlock-screen #panel .panel-button:active,
+      .login-screen #panel .panel-button:focus,
+      .login-screen #panel .panel-button:hover,
+      .login-screen #panel .panel-button:active,
+      .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active {
         color: #737a88; }
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
@@ -687,7 +706,7 @@ StScrollBar {
     icon-size: 16px; }
 
 #calendarArea {
-  padding: 0.75em 1.0em; }
+  padding: 0.75em 1em; }
 
 .calendar {
   margin-bottom: 1em; }
@@ -721,11 +740,11 @@ StScrollBar {
 .message-list-section-title {
   padding: 7px 10px 7px 10px;
   border: 1px solid rgba(255, 255, 255, 0); }
-  .datemenu-today-button:hover, .datemenu-today-button:focus,
+  .datemenu-today-button:hover,
+  .datemenu-today-button:focus,
   .world-clocks-button:hover,
   .world-clocks-button:focus,
-  .message-list-section-title:hover,
+  .message-list-section-title:hover, .message-list-section-title:focus {
-  .message-list-section-title:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     box-shadow: inset 0 0 rgba(255, 255, 255, 0);
     color: #5c616c;
@@ -1082,7 +1101,8 @@ StScrollBar {
   padding: 6px 0px 6px 0px;
   border-color: rgba(16, 17, 20, 0.87);
   border-radius: 0px 3px 3px 0px; }
-  .right #dash, #dash:rtl {
+  .right #dash,
+  #dash:rtl {
     padding: 6px 0px 6px 0px;
     border-radius: 3px 0 0 3px; }
   .bottom #dash {
@@ -1092,7 +1112,7 @@ StScrollBar {
     padding: 0px 6px 0px 6px;
     border-radius: 0 0 3px 3px; }
   #dash .placeholder {
-    background-image: url("misc/dash-placeholder.svg");
+    background-image: url("dash/dash-placeholder.svg");
     background-size: contain;
     height: 24px; }
   #dash .empty-dash-drop-target {
@@ -1119,13 +1139,25 @@ StScrollBar {
     -y-offset: 3px;
     -x-offset: 0; }
 
-#dash .app-well-app .overview-icon, .right #dash .app-well-app .overview-icon, .bottom #dash .app-well-app .overview-icon, .top #dash .app-well-app .overview-icon {
+#dash .app-well-app .overview-icon,
+.right #dash .app-well-app .overview-icon,
+.bottom #dash .app-well-app .overview-icon,
+.top #dash .app-well-app .overview-icon {
   padding: 10px; }
-#dash .app-well-app:hover .overview-icon, .right #dash .app-well-app:hover .overview-icon, .bottom #dash .app-well-app:hover .overview-icon, .top #dash .app-well-app:hover .overview-icon {
+
+#dash .app-well-app:hover .overview-icon,
+.right #dash .app-well-app:hover .overview-icon,
+.bottom #dash .app-well-app:hover .overview-icon,
+.top #dash .app-well-app:hover .overview-icon {
   background-color: #5294E2; }
-#dash .app-well-app:active .overview-icon, .right #dash .app-well-app:active .overview-icon, .bottom #dash .app-well-app:active .overview-icon, .top #dash .app-well-app:active .overview-icon {
+
+#dash .app-well-app:active .overview-icon,
+.right #dash .app-well-app:active .overview-icon,
+.bottom #dash .app-well-app:active .overview-icon,
+.top #dash .app-well-app:active .overview-icon {
   box-shadow: none;
   background-color: #2679db; }
+
 #dash .app-well-app-running-dot {
   width: 11px;
   height: 2px;
@@ -1137,10 +1169,15 @@ StScrollBar {
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 2px;
   border: 0px solid; }
+
 .show-apps:hover .overview-icon {
   background-color: rgba(0, 0, 0, 0.7);
   color: #5294E2; }
-.show-apps:active .overview-icon, .show-apps:active .show-apps-icon, .show-apps:checked .overview-icon, .show-apps:checked .show-apps-icon {
+
+.show-apps:active .overview-icon,
+.show-apps:active .show-apps-icon,
+.show-apps:checked .overview-icon,
+.show-apps:checked .show-apps-icon {
   color: #ffffff;
   background-color: #5294E2;
   box-shadow: none;
@@ -1176,25 +1213,30 @@ StScrollBar {
   .app-view-control:last-child:ltr, .app-view-control:first-child:rtl {
     border-radius: 0 2px 2px 0; }
 
-.search-provider-icon:active, .search-provider-icon:checked,
+.search-provider-icon:active,
-.list-search-result:active,
+.search-provider-icon:checked,
-.list-search-result:checked {
+.list-search-result:active, .list-search-result:checked {
   background-color: rgba(37, 39, 45, 0.85); }
-.search-provider-icon:focus, .search-provider-icon:selected, .search-provider-icon:hover,
+
-.list-search-result:focus,
+.search-provider-icon:focus,
-.list-search-result:selected,
+.search-provider-icon:selected,
-.list-search-result:hover {
+.search-provider-icon:hover,
+.list-search-result:focus, .list-search-result:selected, .list-search-result:hover {
   background-color: rgba(168, 173, 181, 0.4);
   transition-duration: 200ms; }
 
-.app-well-app:active .overview-icon, .app-well-app:checked .overview-icon,
+.app-well-app:active .overview-icon,
+.app-well-app:checked .overview-icon,
 .app-well-app.app-folder:active .overview-icon,
 .app-well-app.app-folder:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(37, 39, 45, 0.85);
   box-shadow: inset 0 0 #5294E2; }
-.app-well-app:hover .overview-icon, .app-well-app:focus .overview-icon, .app-well-app:selected .overview-icon,
+
+.app-well-app:hover .overview-icon,
+.app-well-app:focus .overview-icon,
+.app-well-app:selected .overview-icon,
 .app-well-app.app-folder:hover .overview-icon,
 .app-well-app.app-folder:focus .overview-icon,
 .app-well-app.app-folder:selected .overview-icon,
@@ -1226,11 +1268,14 @@ StScrollBar {
 .app-well-app.app-folder > .overview-icon {
   background-color: rgba(14, 15, 17, 0.8);
   border: 1px solid rgba(168, 173, 181, 0.3); }
+
 .app-well-app.app-folder:hover > .overview-icon {
   background-color: rgba(60, 64, 73, 0.95); }
+
 .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon {
   background-color: #5294E2;
   box-shadow: none; }
+
 .app-well-app.app-folder:focus > .overview-icon {
   background-color: #5294E2; }
 
@@ -1260,7 +1305,8 @@ StScrollBar {
     background-image: url(misc/page-indicator-hover.svg); }
   .page-indicator:active .page-indicator-icon {
     background-image: url(misc/page-indicator-active.svg); }
-  .page-indicator:checked .page-indicator-icon, .page-indicator:checked:active {
+  .page-indicator:checked .page-indicator-icon,
+  .page-indicator:checked:active {
     background-image: url(misc/page-indicator-checked.svg); }
 
 .app-well-app > .overview-icon.overview-icon-with-label,
@@ -1334,11 +1380,11 @@ StScrollBar {
   .notification-banner:hover .notification-button,
   .notification-banner:focus .notification-button {
     padding: 4px 4px 5px; }
-    .notification-banner .notification-button:first-child, .notification-banner .notification-button:last-child,
+    .notification-banner .notification-button:first-child,
+    .notification-banner .notification-button:last-child,
     .notification-banner:hover .notification-button:first-child,
     .notification-banner:hover .notification-button:last-child,
-    .notification-banner:focus .notification-button:first-child,
+    .notification-banner:focus .notification-button:first-child, .notification-banner:focus .notification-button:last-child {
-    .notification-banner:focus .notification-button:last-child {
       border-radius: 2px; }
 
 .secondary-icon {
@@ -1435,9 +1481,9 @@ StScrollBar {
   .legacy-tray-handle StIcon,
   .legacy-tray-icon StIcon {
     icon-size: 24px; }
-  .legacy-tray-handle:hover, .legacy-tray-handle:focus,
+  .legacy-tray-handle:hover,
-  .legacy-tray-icon:hover,
+  .legacy-tray-handle:focus,
-  .legacy-tray-icon:focus {
+  .legacy-tray-icon:hover, .legacy-tray-icon:focus {
     background-color: rgba(92, 97, 108, 0.1); }
 
 .legacy-tray-icon-box {
@@ -1614,7 +1660,8 @@ StScrollBar {
   padding: 100px 0px; }
   .login-dialog-user-selection-box .login-dialog-not-listed-label {
     padding-left: 2px; }
-    .login-dialog-not-listed-button:focus .login-dialog-user-selection-box .login-dialog-not-listed-label, .login-dialog-not-listed-button:hover .login-dialog-user-selection-box .login-dialog-not-listed-label {
+    .login-dialog-not-listed-button:focus .login-dialog-user-selection-box .login-dialog-not-listed-label,
+    .login-dialog-not-listed-button:hover .login-dialog-user-selection-box .login-dialog-not-listed-label {
       color: #A8ADB5; }
 
 .login-dialog-not-listed-label {
@@ -1664,6 +1711,7 @@ StScrollBar {
 
 .user-widget-label:ltr {
   padding-left: 18px; }
+
 .user-widget-label:rtl {
   padding-right: 18px; }
 
@@ -1799,6 +1847,7 @@ StScrollBar {
   border-color: rgba(168, 173, 181, 0.3); }
   .lg-dialog StEntry:focus {
     border-color: #5294E2; }
+
 .lg-dialog .shell-link {
   color: #2679db; }
   .lg-dialog .shell-link:hover {

common/gnome-shell/3.16/gulpfile.js

@@ -0,0 +1,18 @@
+var gulp        = require("gulp");
+var sass        = require("gulp-sass");
+var filter      = require('gulp-filter');
+
+gulp.task('sass', function () {
+    return gulp.src('sass/*.scss')
+        .pipe(sass({
+            outputStyle: 'nested',
+            precision: 5,
+            onError: function (err) {
+                notify().write(err);
+            }
+        }))
+        .pipe(gulp.dest('.'))
+});
+
+
+gulp.task('default', ['sass']);

common/gnome-shell/3.16/package.json

@@ -0,0 +1,7 @@
+{
+  "devDependencies": {
+    "gulp": "~3.9.0",
+    "gulp-filter": "~2.0.2",
+    "gulp-sass": "~2.0.4"
+  }
+}

common/gnome-shell/3.16/parse-sass.sh

@@ -1,3 +0,0 @@
-#! /bin/bash
-
-bundle exec sass --update --style=nested --sourcemap=none .

common/gnome-shell/3.16/sass/_common.scss

@@ -1408,7 +1408,7 @@ StScrollBar {
   }
 
   .placeholder {
-    background-image: url("misc/dash-placeholder.svg");
+    background-image: url("dash/dash-placeholder.svg");
     background-size: contain;
     height: 24px;
   }

common/gtk-3.0/3.14/.nvmrc

@@ -0,0 +1 @@
+0.12.5

common/gtk-3.0/3.14/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem "sass", "~> 3.4.0"

common/gtk-3.0/3.14/Gemfile.lock

@@ -1,10 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    sass (3.4.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  sass (~> 3.4.0)

common/gtk-3.0/3.14/gulpfile.js

@@ -0,0 +1,18 @@
+var gulp        = require("gulp");
+var sass        = require("gulp-sass");
+var filter      = require('gulp-filter');
+
+gulp.task('sass', function () {
+    return gulp.src('sass/*.scss')
+        .pipe(sass({
+            outputStyle: 'nested',
+            precision: 5,
+            onError: function (err) {
+                notify().write(err);
+            }
+        }))
+        .pipe(gulp.dest('.'))
+});
+
+
+gulp.task('default', ['sass']);

common/gtk-3.0/3.14/package.json

@@ -0,0 +1,7 @@
+{
+  "devDependencies": {
+    "gulp": "~3.9.0",
+    "gulp-filter": "~2.0.2",
+    "gulp-sass": "~2.0.4"
+  }
+}

common/gtk-3.0/3.14/parse-sass.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-
-bundle exec sass --update --sourcemap=none .

common/gtk-3.0/3.14/sass/_colors-public.scss

@@ -16,7 +16,7 @@
 @define-color selected_bg_color #{"" + $selected_bg_color};
 @define-color selected_fg_color #{"" + $selected_fg_color};
 @define-color insensitive_bg_color #{"" + $insensitive_bg_color};
-@define-color insensitive_fg_color #{"" + $insensitive_fg_color};
+@define-color insensitive_fg_color alpha(#{"" + opacify($insensitive_fg_color, 1)}, 0.5);
 @define-color insensitive_base_color #{"" + $base_color};
 @define-color theme_unfocused_fg_color #{"" + $fg_color};
 @define-color theme_unfocused_text_color #{"" + $text_color};
@@ -34,8 +34,8 @@
 $wm_highlight: lighten(opacify($header_bg, 1), 3%);
 $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 
-@define-color wm_title #{"" + $header_fg};
+@define-color wm_title alpha(#{"" + opacify($header_fg, 1)}, 0.8);
-@define-color wm_unfocused_title alpha(#{"" + $header_fg}, 0.7);
+@define-color wm_unfocused_title alpha(#{"" + opacify($header_fg, 1)}, 0.5);
 
 @define-color wm_bg #{"" + opacify($header_bg, 1)};
 @define-color wm_bg_unfocused #{"" + $wm_bg_unfocused};

common/gtk-3.0/3.16/.nvmrc

@@ -0,0 +1 @@
+0.12.5

common/gtk-3.0/3.16/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem "sass", "~> 3.4.0"

common/gtk-3.0/3.16/Gemfile.lock

@@ -1,10 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    sass (3.4.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  sass (~> 3.4.0)

common/gtk-3.0/3.16/gulpfile.js

@@ -0,0 +1,18 @@
+var gulp        = require("gulp");
+var sass        = require("gulp-sass");
+var filter      = require('gulp-filter');
+
+gulp.task('sass', function () {
+    return gulp.src('sass/*.scss')
+        .pipe(sass({
+            outputStyle: 'nested',
+            precision: 5,
+            onError: function (err) {
+                notify().write(err);
+            }
+        }))
+        .pipe(gulp.dest('.'))
+});
+
+
+gulp.task('default', ['sass']);

common/gtk-3.0/3.16/package.json

@@ -0,0 +1,7 @@
+{
+  "devDependencies": {
+    "gulp": "~3.9.0",
+    "gulp-filter": "~2.0.2",
+    "gulp-sass": "~2.0.4"
+  }
+}

common/gtk-3.0/3.16/parse-sass.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-
-bundle exec sass --update --sourcemap=none .

common/gtk-3.0/3.16/sass/_colors-public.scss

@@ -16,7 +16,7 @@
 @define-color selected_bg_color #{"" + $selected_bg_color};
 @define-color selected_fg_color #{"" + $selected_fg_color};
 @define-color insensitive_bg_color #{"" + $insensitive_bg_color};
-@define-color insensitive_fg_color #{"" + $insensitive_fg_color};
+@define-color insensitive_fg_color alpha(#{"" + opacify($insensitive_fg_color, 1)}, 0.5);
 @define-color insensitive_base_color #{"" + $base_color};
 @define-color theme_unfocused_fg_color #{"" + $fg_color};
 @define-color theme_unfocused_text_color #{"" + $text_color};
@@ -34,8 +34,8 @@
 $wm_highlight: lighten(opacify($header_bg, 1), 3%);
 $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 
-@define-color wm_title #{"" + $header_fg};
+@define-color wm_title alpha(#{"" + opacify($header_fg, 1)}, 0.8);
-@define-color wm_unfocused_title alpha(#{"" + $header_fg}, 0.7);
+@define-color wm_unfocused_title alpha(#{"" + opacify($header_fg, 1)}, 0.5);
 
 @define-color wm_bg #{"" + opacify($header_bg, 1)};
 @define-color wm_bg_unfocused #{"" + $wm_bg_unfocused};