Skip to content

Fix theme parser errors #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 11 additions & 0 deletions src/sass/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ THEMES_DIR=../../themes/

build: clean
$(MAKE) $(TARGETS)

# Replace conditional stuff. For example, see the definition
# for "flowboxchild:selected image" in nautilus/Adwaita.css.
# The way this works is we have an existing commented line
# which ends with the embedded comment "* Make: GTK3 only */"
# for GTK 3 (and 4 for GTK4). Note the missing starting slash,
# that's because we can't have nested comments in CSS for some
# reason. We need to add it ourselves when uncommenting line.
ls gtk3-*.css | xargs sed -i 's|^\(\s*\)\(/\*\)\(.*\)\(\* Make: GTK3 only \*/\)$$|\1\3/\4|'
ls gtk4-*.css | xargs sed -i 's|^\(\s*\)\(/\*\)\(.*\)\(\* Make: GTK4 only \*/\)$$|\1\3/\4|'

for COLOR in $(COLOR_VARIANTS); \
do \
mkdir -p $(foreach VARIANT,Light Dark Darkest,$(THEMES_DIR)Flat-Remix-GTK-$$COLOR-$(VARIANT)/gtk-3.0/); \
Expand Down
4 changes: 2 additions & 2 deletions src/sass/gtk-applications-css/gedit/Adwaita.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/* Only normal state is handle */
.open-document-selector-match {
color: shade (@theme_fg_color, 0.6);
color: shade(@theme_fg_color, 0.6);
background-color: alpha(@warning_color, 0.4);
}

Expand Down Expand Up @@ -79,7 +79,7 @@ statusbar {
.gedit-search-entry-occurrences-tag {
background-color: @theme_base_color;
background-image: none;
color: shade (@theme_unfocused_fg_color, 0.8);
color: shade(@theme_unfocused_fg_color, 0.8);
border: 0px;
margin: 2px;
padding: 2px;
Expand Down
13 changes: 6 additions & 7 deletions src/sass/gtk-applications-css/nautilus/Adwaita.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
}

.nautilus-canvas-item.dim-label {
color: mix (@theme_fg_color, @theme_bg_color, 0.50);
color: mix(@theme_fg_color, @theme_bg_color, 0.50);
}

.nautilus-canvas-item.dim-label:selected {
color: mix (@theme_selected_fg_color, @theme_selected_bg_color, 0.20);
color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.20);
}

/* Toolbar */
Expand Down Expand Up @@ -225,7 +225,7 @@ entry.search > * {

/* Icon view */
flowbox {
padding: 18px
padding: 18px;
}

flowboxchild {
Expand Down Expand Up @@ -256,9 +256,8 @@ flowboxchild:selected .icon-ui-labels-box {
}

flowboxchild:selected image {
-gtk-icon-effect: dim; /* GTK 3 only */
/* GTK 4 TODO: Replace previous line with the following one:
-gtk-icon-filter: opacity(0.5);
*/
-gtk-icon-shadow: 0px 0px @theme_selected_bg_color;
/* In the Makefile, we will uncomment the following appropriately. */
/* -gtk-icon-effect: dim; * Make: GTK3 only */
/* -gtk-icon-filter: opacity(0.5); * Make: GTK4 only */
}
2 changes: 1 addition & 1 deletion src/templates/static/gtk-2.0/main.rc
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ style "default" {
text[ACTIVE] = @selected_fg_color

base[NORMAL] = @base_color
base[PRELIGHT] = shade (0.95, @bg_color)
base[PRELIGHT] = shade(0.95, @bg_color)
base[SELECTED] = @selected_bg_color
base[INSENSITIVE] = @insensitive_bg_color
base[ACTIVE] = @selected_bg_color
Expand Down
33 changes: 17 additions & 16 deletions themes/Flat-Remix-Dark-Metacity/metacity-1/close-active.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 17 additions & 16 deletions themes/Flat-Remix-Dark-Metacity/metacity-1/close-inactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 18 additions & 17 deletions themes/Flat-Remix-Dark-Metacity/metacity-1/close-prelight.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading