From 9b3ab2c9b20b0ca6e2bffe3e472ddff63e0e9b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 4 Apr 2017 17:51:04 +0200 Subject: [PATCH] build: Switch to sassc for generating style GTK+ switched from ruby-based sass to c-based sassc for performance reasons. It makes sense to follow suit, if not to not require two tools for the same job ... https://bugzilla.gnome.org/show_bug.cgi?id=783210 --- configure.ac | 2 +- data/HACKING | 2 +- data/Makefile.am | 4 ++-- data/gnome-classic.css | 41 ++++++++++++++++++++++++++++++++--------- 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 224644b1..396b5058 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ done AC_SUBST(ENABLED_EXTENSIONS, [$ENABLED_EXTENSIONS]) -AC_PATH_PROG([SASS],[sass],[]) +AC_PATH_PROG([SASSC],[sassc],[]) dnl Please keep this sorted alphabetically AC_CONFIG_FILES([ diff --git a/data/HACKING b/data/HACKING index eae41cb9..9b87ee29 100644 --- a/data/HACKING +++ b/data/HACKING @@ -1,6 +1,6 @@ To generate the css files, from the project directory: -sass --sourcemap=none --update . +sassc -a gnome-classic.scss gnome-classic.css To update the gnome-shell-sass submodule to latest upstream commit: git submodule update --rebase diff --git a/data/Makefile.am b/data/Makefile.am index 11cc6f06..fd24eff4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -33,9 +33,9 @@ theme_sources = \ $(NULL) %.css: %.scss $(theme_sources) - @if test -n "$(SASS)"; then \ + @if test -n "$(SASSC)"; then \ if $(AM_V_P); then PS4= set -x; else echo " GEN $@"; fi; \ - $(SASS) --sourcemap=none --update -f -q $<; \ + $(SASSC) -a $< $@; \ fi gsettings_SCHEMAS = org.gnome.shell.extensions.classic-overrides.gschema.xml diff --git a/data/gnome-classic.css b/data/gnome-classic.css index 994619d8..f564032a 100644 --- a/data/gnome-classic.css +++ b/data/gnome-classic.css @@ -119,6 +119,7 @@ StEntry { /* Scrollbars */ StScrollView.vfade { -st-vfade-offset: 68px; } + StScrollView.hfade { -st-hfade-offset: 68px; } @@ -153,14 +154,18 @@ StScrollBar { /* Check Boxes */ .check-box StBoxLayout { spacing: .8em; } + .check-box StBin { width: 24px; height: 22px; background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg"); } + .check-box:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); } + .check-box:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); } + .check-box:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); } @@ -338,6 +343,7 @@ StScrollBar { .show-processes-dialog-app-list-item-icon:ltr { padding-right: 17px; } + .show-processes-dialog-app-list-item-icon:rtl { padding-left: 17px; } @@ -709,9 +715,17 @@ StScrollBar { #panel .panel-button .system-status-icon { icon-size: 1.09em; padding: 0 5px; } - .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: #454f52; } - .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: #454f52; } #panel .panel-status-indicators-box, #panel .panel-status-menu-box { @@ -770,6 +784,7 @@ StScrollBar { .events-section-title:hover, .events-section-title:focus { background-color: #fafafa; } + .datemenu-today-button:active, .world-clocks-button:active, .weather-button:active, @@ -911,7 +926,7 @@ StScrollBar { color: black; font-size: 0.7em; /* HACK: the label should be baseline-aligned with a 1em label, - fake this with some bottom padding */ + fake this with some bottom padding */ padding-bottom: 0.13em; } .message-secondary-bin > StIcon { @@ -1216,6 +1231,7 @@ StScrollBar { .list-search-result:active, .list-search-result:checked { background-color: rgba(23, 25, 26, 0.9); } + .search-provider-icon:focus, .search-provider-icon:selected, .search-provider-icon:hover, .list-search-result:focus, .list-search-result:selected, @@ -1223,7 +1239,8 @@ StScrollBar { background-color: rgba(238, 238, 236, 0.1); 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, .show-apps:active .overview-icon, @@ -1232,7 +1249,10 @@ StScrollBar { .grid-search-result:checked .overview-icon { background-color: rgba(23, 25, 26, 0.9); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.7); } -.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, @@ -1660,7 +1680,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: #eeeeec; } .login-dialog-not-listed-label { @@ -1710,6 +1731,7 @@ StScrollBar { .user-widget-label:ltr { padding-left: 18px; } + .user-widget-label:rtl { padding-right: 18px; } @@ -1837,6 +1859,7 @@ StScrollBar { .lg-dialog StEntry { selection-background-color: #bbbbbb; selected-color: #333333; } + .lg-dialog .shell-link { color: #999999; } .lg-dialog .shell-link:hover { @@ -1888,9 +1911,9 @@ StScrollBar { background-gradient-end: #e0e0e0; border-top-color: #666; /* we don't support non-uniform border-colors and - use the top border color for any border, so we - need to set it even if all we want is a bottom - border */ + use the top border color for any border, so we + need to set it even if all we want is a bottom + border */ border-bottom: 1px solid #666; app-icon-bottom-clip: 0px; } #panel:overview {