diff --git a/Paper/gtk-3.0/apps/calculator.css b/Paper/gtk-3.0/apps/calculator.css index 51f15ab..72f1c50 100644 --- a/Paper/gtk-3.0/apps/calculator.css +++ b/Paper/gtk-3.0/apps/calculator.css @@ -127,7 +127,7 @@ MathButtons .button GtkImage { MathButtons .button:active GtkImage, MathButtons .button:focus GtkImage, MathButtons .button:hover GtkImage { - color: @selected_foreground; + color: @selection_foreground; } MathButtons .button:backdrop GtkImage, @@ -150,7 +150,7 @@ MathButtons .button GtkLabel { MathButtons .button:active GtkLabel, MathButtons .button:focus GtkLabel, MathButtons .button:hover GtkLabel { - color: @selected_foreground; + color: @selection_foreground; } MathButtons .button:backdrop GtkLabel, diff --git a/Paper/gtk-3.0/apps/gedit.css b/Paper/gtk-3.0/apps/gedit.css index 018fb20..ab1db97 100644 --- a/Paper/gtk-3.0/apps/gedit.css +++ b/Paper/gtk-3.0/apps/gedit.css @@ -142,7 +142,7 @@ GeditViewFrame .gedit-search-slider .not-found { GeditViewFrame .gedit-search-slider .not-found:selected { background-color: @selected_background; - color: @selected_foreground; + color: @selection_foreground; } GeditFileBrowserWidget .primary-toolbar.toolbar { diff --git a/Paper/gtk-3.0/apps/gnome-clocks.css b/Paper/gtk-3.0/apps/gnome-clocks.css index 4e07a25..7492dea 100644 --- a/Paper/gtk-3.0/apps/gnome-clocks.css +++ b/Paper/gtk-3.0/apps/gnome-clocks.css @@ -85,14 +85,14 @@ ClocksWindow .clocks-digital-renderer.dark.stripe:prelight { ClocksWindow .clocks-digital-renderer.active { background-color: @selection; background-image: none; - color: @selected_foreground; + color: @selection_foreground; } ClocksWindow .clocks-digital-renderer.active:prelight { background-color: @selection; background-image: none; text-shadow: 0 2px 2px rgba(0,0,0,0.5); - color: @selected_foreground; + color: @selection_foreground; } ClocksWindow .clocks-digital-renderer.snoozing { diff --git a/Paper/gtk-3.0/apps/gnome-documents.css b/Paper/gtk-3.0/apps/gnome-documents.css index d48516d..70eabd7 100644 --- a/Paper/gtk-3.0/apps/gnome-documents.css +++ b/Paper/gtk-3.0/apps/gnome-documents.css @@ -114,7 +114,7 @@ .documents-entry-tag { background-color: @selection; - color: @selected_foreground; + color: @selection_foreground; border-radius: 4px; border-width: 0; @@ -125,7 +125,7 @@ .documents-entry-tag:hover { background-color: shade(@selection, 1.10); - color: @selected_foreground; + color: @selection_foreground; } .documents-entry-tag.button, diff --git a/Paper/gtk-3.0/apps/gnome-software.css b/Paper/gtk-3.0/apps/gnome-software.css index 0787ed7..e4cb87d 100644 --- a/Paper/gtk-3.0/apps/gnome-software.css +++ b/Paper/gtk-3.0/apps/gnome-software.css @@ -43,14 +43,14 @@ font-size: 80%; background-color: @selection; border-radius: 4px; - color: @selected_foreground; + color: @selection_foreground; } .popular-installed-overlay-box { font-size: 80%; background-color: @selection; border-radius: 0; - color: @selected_foreground; + color: @selection_foreground; } .index-title-alignment-software { @@ -190,8 +190,8 @@ GtkBox.star { } .counter-label { - color: @selected_foreground; - background-color: mix(@selection, @selected_foreground, 0.3); + color: @selection_foreground; + background-color: mix(@selection, @selection_foreground, 0.3); font-size: smaller; border-radius: 4px; padding: 0px 4px; diff --git a/Paper/gtk-3.0/apps/gnome.css b/Paper/gtk-3.0/apps/gnome.css index 3d2f38c..730c922 100644 --- a/Paper/gtk-3.0/apps/gnome.css +++ b/Paper/gtk-3.0/apps/gnome.css @@ -53,7 +53,7 @@ GucharmapChartable:active, GucharmapChartable:focus, GucharmapChartable:selected { background-color: @selected_background; - color: @selected_foreground; + color: @selection_foreground; } diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css index 9c1347c..4a0d61d 100644 --- a/Paper/gtk-3.0/apps/nautilus.css +++ b/Paper/gtk-3.0/apps/nautilus.css @@ -189,11 +189,11 @@ NautilusCanvasView:backdrop { .nautilus-canvas-item.dim-label:selected, .nautilus-list-dim-label:selected { - color: @selected_foreground; + color: @selection_foreground; } .nautilus-desktop.nautilus-canvas-item { - color: @selected_foreground; + color: @selection_foreground; text-shadow: 1px 1px black; } @@ -202,7 +202,7 @@ NautilusCanvasView:backdrop { } .nautilus-desktop.nautilus-canvas-item:selected { - color: @selected_foreground; + color: @selection_foreground; } .nautilus-desktop.nautilus-canvas-item:active, @@ -221,12 +221,12 @@ NautilusCanvasView:backdrop { .nautilus-desktop.nautilus-canvas-item:backdrop .nautilus-desktop.nautilus-canvas-item:selected { background-color: @selected_background; - color: @selected_foreground; + color: @selection_foreground; } .nautilus-desktop.nautilus-canvas-item:selected:backdrop { background-color: @backdrop_selected_background; - color: @backdrop_selected_foreground; + color: @backdrop_selection_foreground; } .nautilus-desktop.nautilus-canvas-item:active, diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css index 9c731d2..54453aa 100644 --- a/Paper/gtk-3.0/apps/pantheon.css +++ b/Paper/gtk-3.0/apps/pantheon.css @@ -206,7 +206,7 @@ NoiseWidgetsTileView { .search-item:focus { border-radius: 0; background-color: alpha(@selection, 0.7); - color: @selected_foreground; + color: @selection_foreground; } diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css index b9b49e3..1f54644 100644 --- a/Paper/gtk-3.0/gtk-common.css +++ b/Paper/gtk-3.0/gtk-common.css @@ -48,7 +48,7 @@ /* Backdrop-selected colors */ @define-color backdrop_selected_background shade(@selection, 0.9); @define-color backdrop_selection @backdrop_selected_background; -@define-color backdrop_selected_foreground shade(@selection_foreground, 0.9); +@define-color backdrop_selection_foreground shade(@selection_foreground, 0.9); /* Hover colors */ @define-color hover_base shade(@base, 1.02); @@ -64,8 +64,8 @@ /* Selected color */ @define-color selected_background @selection; @define-color selected_border shade(@selection, 0.9); -@define-color selected_foreground alpha(#000, 0.3); -@define-color selection_foreground @selected_foreground; +@define-color selection_foreground alpha(#000, 0.3); +@define-color selected_foreground @selection_foreground; /**************** * Theme colors * @@ -82,7 +82,7 @@ @define-color theme_selected_background @selected_background; @define-color selected_bg_color @selected_background; -@define-color theme_selected_foreground @selected_foreground; +@define-color theme_selection_foreground @selection_foreground; @define-color theme_text @foreground; @define-color theme_text_color @foreground; diff --git a/Paper/gtk-3.0/settings.ini b/Paper/gtk-3.0/settings.ini index 0c94012..2838384 100644 --- a/Paper/gtk-3.0/settings.ini +++ b/Paper/gtk-3.0/settings.ini @@ -1,6 +1,6 @@ [Settings] gtk-color-scheme = "background:#eeeeee\nselected_background:#A348B1\nbase:#ffffff" # Background: main, selected, base -gtk-color-scheme = "foreground:#555555\nselected_foreground:#ffffff\ntext:#555555" # Foreground: main, selected, text +gtk-color-scheme = "foreground:#555555\nselection_foreground:#ffffff\ntext:#555555" # Foreground: main, selected, text gtk-color-scheme = "tooltip_background:#444\ntooltip_foreground:#ffffff" # Tooltips gtk-color-scheme = "link:#A348B1" # Hyperlinks gtk-color-scheme = "background_dark:#444444\ntext_dark:#eeeeee" # Dark diff --git a/Paper/gtk-3.0/widgets/base-states.css b/Paper/gtk-3.0/widgets/base-states.css index a1a5f25..fd1bf1c 100644 --- a/Paper/gtk-3.0/widgets/base-states.css +++ b/Paper/gtk-3.0/widgets/base-states.css @@ -47,13 +47,13 @@ GtkClutterOffscreen { *:selected, *:selected:focus { background-color: @selection; - color: @selected_foreground; + color: @selection_foreground; } *:selected:backdrop { /* I would like to remove colors from the backdrop state, next release*/ background-color: @backdrop_selected_background; - color: @backdrop_selected_foreground; + color: @backdrop_selection_foreground; } *:insensitive { @@ -98,7 +98,7 @@ GtkClutterOffscreen { .gtkstyle-fallback:selected { background-color: @selection; - color: @selected_foreground; + color: @selection_foreground; } GtkImage, diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css index a873a94..f0266b2 100644 --- a/Paper/gtk-3.0/widgets/buttons.css +++ b/Paper/gtk-3.0/widgets/buttons.css @@ -89,7 +89,7 @@ GtkCalendar.button:backdrop:hover, shade(@selection, 1.1), shade(shade(@selection, 1.1), 0.98) ); - color: @selection; + color: @selection_foreground; } /* Hover Button */ @@ -104,6 +104,7 @@ GtkCalendar.button:backdrop:hover, shade(@selection, 1.2), shade(shade(@selection, 1.2), 0.98) ); + color: @selection_foreground; } /* Active (Pressed) Button */ @@ -117,7 +118,7 @@ GtkCalendar.button:backdrop:hover, shade(@selection, 1.1), shade(shade(@selection, 1.1), 0.95) ); - color: @selected_foreground; + color: @selection_foreground; } @@ -248,7 +249,7 @@ GtkOverlay > .button:focus:active { .button.affirmative, .content-view .button.affirmative { background-color: shade(@selected_background, 1.08); - color: @selected_foreground; + color: @selection_foreground; } .button.affirmative:hover, @@ -268,5 +269,5 @@ GtkOverlay > .button:focus:active { .button.affirmative GtkLabel, .button.affirmative Gtklabel:prelight { - color: @selected_foreground; + color: @selection_foreground; } \ No newline at end of file diff --git a/Paper/gtk-3.0/widgets/calendar.css b/Paper/gtk-3.0/widgets/calendar.css index faee223..dcd7ddd 100644 --- a/Paper/gtk-3.0/widgets/calendar.css +++ b/Paper/gtk-3.0/widgets/calendar.css @@ -54,7 +54,7 @@ GtkCalendar.button:insensitive:backdrop { .highlight, GtkCalendar.highlight { background-color: @selection; - color: @selected_foreground; + color: @selection_foreground; border-radius: 0; padding: 0; border-width: 0; diff --git a/Paper/gtk-3.0/widgets/cell-row.css b/Paper/gtk-3.0/widgets/cell-row.css index aa20166..60960f9 100644 --- a/Paper/gtk-3.0/widgets/cell-row.css +++ b/Paper/gtk-3.0/widgets/cell-row.css @@ -28,7 +28,7 @@ .cell:selected, .cell:selected:focus { background-color: @selection; - color: @selected_foreground; + color: @selection_foreground; } row:selected, @@ -36,7 +36,7 @@ row:selected:focus { border: 0 solid shade(@selection, 0.9); background-color: @selection; background-image: none; - color: @selected_foreground; + color: @selection_foreground; -GtkWidget-focus-padding: 1; -GtkWidget-focus-line-width: 0; diff --git a/Paper/gtk-3.0/widgets/check-radio.css b/Paper/gtk-3.0/widgets/check-radio.css index 849b7da..ffd8755 100644 --- a/Paper/gtk-3.0/widgets/check-radio.css +++ b/Paper/gtk-3.0/widgets/check-radio.css @@ -52,12 +52,12 @@ GtkCheckButton:selected:focus { } .check:selected { - color: @selected_foreground; + color: @selection_foreground; } .check:selected:backdrop { - color: @backdrop_selected_foreground; + color: @backdrop_selection_foreground; } /***************** @@ -73,7 +73,7 @@ GtkCheckButton:selected:focus { } .radio:selected { - color: @selected_foreground; + color: @selection_foreground; } .radio:backdrop { @@ -85,7 +85,7 @@ GtkCheckButton:selected:focus { } .radio:selected:backdrop { - color: @backdrop_selected_foreground; + color: @backdrop_selection_foreground; } /* Symbolic Radio */ diff --git a/Paper/gtk-3.0/widgets/images.css b/Paper/gtk-3.0/widgets/images.css index c4aab93..6af587f 100644 --- a/Paper/gtk-3.0/widgets/images.css +++ b/Paper/gtk-3.0/widgets/images.css @@ -23,7 +23,7 @@ *:active GtkImage, *:focus GtkImage, *:hover GtkImage { - color: @selected_foreground; + color: @selection_foreground; } *:backdrop GtkImage, @@ -57,7 +57,7 @@ .image:selected, .image:selected:hover { - color: @selected_foreground; + color: @selection_foreground; } .view.image:backdrop, @@ -76,5 +76,5 @@ .view.image:selected, .view.image:selected:hover { - color: @selected_foreground; + color: @selection_foreground; } diff --git a/Paper/gtk-3.0/widgets/infobars.css b/Paper/gtk-3.0/widgets/infobars.css index 3a9c1cd..76447b4 100644 --- a/Paper/gtk-3.0/widgets/infobars.css +++ b/Paper/gtk-3.0/widgets/infobars.css @@ -88,12 +88,12 @@ GtkInfoBar GtkLabel:insensitive { GtkInfoBar .button, GtkInfoBar .button:focus, .dynamic-notebook GtkInfoBar .button { - color: @selected_foreground; + color: @selection_foreground; } GtkInfoBar .button:active, GtkInfoBar .button:hover:active { - color: @selected_foreground; + color: @selection_foreground; } GtkInfoBar .button:insensitive { diff --git a/Paper/gtk-3.0/widgets/links.css b/Paper/gtk-3.0/widgets/links.css index 7255154..7f346eb 100644 --- a/Paper/gtk-3.0/widgets/links.css +++ b/Paper/gtk-3.0/widgets/links.css @@ -61,7 +61,7 @@ } *:selected *:link:active, *:selected .button:active:link, *:selected .button:active:visited { - color: @selected_foreground; + color: @selection_foreground; } *:link:backdrop, .button:backdrop:link, .button:backdrop:visited, *:link:backdrop:hover, .button:backdrop:hover:link, .button:backdrop:hover:visited, *:link:backdrop:hover:selected, .button:backdrop:hover:selected:link, .button:backdrop:hover:selected:visited, .titlebar.selection-mode .subtitle:backdrop:hover:link, diff --git a/Paper/gtk-3.0/widgets/list-rows.css b/Paper/gtk-3.0/widgets/list-rows.css index c75f7dc..a3fae6b 100644 --- a/Paper/gtk-3.0/widgets/list-rows.css +++ b/Paper/gtk-3.0/widgets/list-rows.css @@ -21,121 +21,13 @@ ***********/ .list-row { - padding-top: 6px; - padding-bottom: 6px; - border-radius: 0px; - border:none; - background-image: none; - background-color: @base; + padding: 5px 8px; + border-width: 0px; + background: none; color: @text; } -/* Focus */ -.list-row:focus, -.list-row:active:focus { - border:none; - background-image: none; - background-color: @background; - color: @text; -} - -/* Hover */ -.list-row:hover, -.list-row:active:hover { - border:none; - background-image: none; - background-color: alpha(@selection, 0.3); - color: @selected_foreground; -} - -/* Active (Pressed) */ -.list-row:active { - border:none; - background-image: none; - background-color: @selection; - color: @selected_foreground; -} - -/* Selected */ .list-row:selected { - border:none; - background-image: none; - background-color: shade(@selection, 1.1); - color: @selected_foreground; + background-color: @selection; + color: @selection_foreground; } - -/* Selected:Hover; */ -.list-row:selected:hover { - border:none; - background-image: none; - background-color: shade(shade(@selection, 1.1), 1.1); - color: @selected_foreground; -} - -/* Insensitive */ -.list-row:insensitive { - border:none; - background-color: @insensitive_background; - background-image: none; - color: @insensitive_text; -} - -/* Backdrop */ -.list-row:backdrop { - border:none; - background-image: none; - background-color: @backdrop_background; - color: @backdrop_text; -} - -/* Active:Backdrop */ -.list-row:active:backdrop { - border:none; - background-image: none; - background-color: shade(@selection, 0.9); - color: @backdrop_text; -} - -/* Backdrop:Hover; */ -.list-row:backdrop:hover { - background-image: none; - background-color: shade(@base, 0.96); - color: @backdrop_text; -} - -/* Insensitive:Backdrop */ -.list-row:insensitive:backdrop { - border:none; - background-color: @insensitive_background; - background-image: none; - color: @insensitive_text; -} - -/* Images */ -.list-row GtkImage, -.list-row:focus GtkImage, -.list-row:hover GtkImage { - color: @text; -} - -.list-row:selected GtkImage, -.list-row:active GtkImage { - color: @selected_foreground; -} - -.list-row:backdrop GtkImage, -.list-row:backdrop:hover GtkImage, -.list-row:active:backdrop GtkImage { - color: @backdrop_text; - -gtk-image-effect: dim; -} - -.list-row:insensitive GtkImage { - color: @insensitive_text; - -gtk-image-effect: dim; -} - -.list-row:insensitive:backdrop GtkImage { - color: mix(@backdrop_text, @insensitive_text, 0.5); - -gtk-image-effect: dim; -} \ No newline at end of file diff --git a/Paper/gtk-3.0/widgets/menubars.css b/Paper/gtk-3.0/widgets/menubars.css index 8ba7beb..3517c7e 100644 --- a/Paper/gtk-3.0/widgets/menubars.css +++ b/Paper/gtk-3.0/widgets/menubars.css @@ -69,7 +69,7 @@ .menubar .menuitem:active GtkImage, .menubar .menuitem:focus GtkImage, .menubar .menuitem:hover GtkImage { - color: @selected_foreground; + color: @selection_foreground; } .menubar .menuitem:backdrop GtkImage, @@ -97,7 +97,7 @@ .menubar .menuitem:active GtkLabel, .menubar .menuitem:focus GtkLabel, .menubar .menuitem:hover GtkLabel { - color: @selected_foreground; + color: @selection_foreground; } @@ -127,7 +127,7 @@ .menubar .menu .menuitem:active GtkImage, .menubar .menu .menuitem:focus GtkImage, .menubar .menu .menuitem:hover GtkImage { - color: @selected_foreground; + color: @selection_foreground; } .menubar .menu .menuitem:backdrop GtkImage, @@ -155,7 +155,7 @@ .menubar .menu .menuitem:active GtkLabel, .menubar .menu .menuitem:focus GtkLabel, .menubar .menu .menuitem:hover GtkLabel { - color: @selected_foreground; + color: @selection_foreground; } .menubar .menu .menuitem:backdrop GtkLabel, diff --git a/Paper/gtk-3.0/widgets/miscellaneous.css b/Paper/gtk-3.0/widgets/miscellaneous.css index 472fc12..482191c 100644 --- a/Paper/gtk-3.0/widgets/miscellaneous.css +++ b/Paper/gtk-3.0/widgets/miscellaneous.css @@ -69,7 +69,7 @@ GtkBubbleWindow .toolbar { .dim-label:selected, .dim-label:selected:focus { - color: mix(@selected_foreground, @selection, 0.5); + color: mix(@selection_foreground, @selection, 0.5); } .dnd { diff --git a/Paper/gtk-3.0/widgets/spinbutton.css b/Paper/gtk-3.0/widgets/spinbutton.css index 0afe4de..0423929 100644 --- a/Paper/gtk-3.0/widgets/spinbutton.css +++ b/Paper/gtk-3.0/widgets/spinbutton.css @@ -100,7 +100,7 @@ .spinbutton:active GtkLabel, .spinbutton:focus GtkLabel, .spinbutton:hover GtkLabel { - color: @selected_foreground; + color: @selection_foreground; } .spinbutton:backdrop GtkLabel, diff --git a/Paper/gtk-3.0/widgets/tiles.css b/Paper/gtk-3.0/widgets/tiles.css index 79fa632..4784957 100644 --- a/Paper/gtk-3.0/widgets/tiles.css +++ b/Paper/gtk-3.0/widgets/tiles.css @@ -49,14 +49,14 @@ .tile:active:hover { border: 1px solid shade(@selection, 1.1); background-color: shade(@selection, 1.2); - color: @selected_foreground; + color: @selection_foreground; } /* Active (Pressed) Button */ .tile:active { border: 1px solid @selection; background-color: shade(@selection, 1.1); - color: @selected_foreground; + color: @selection_foreground; } @@ -95,7 +95,7 @@ .tile:active GtkImage, .tile:focus GtkImage, .tile:hover GtkImage { - color: @selected_foreground; + color: @selection_foreground; } .tile:backdrop GtkImage, @@ -123,7 +123,7 @@ .tile:active GtkLabel, .tile:focus GtkLabel, .tile:hover GtkLabel { - color: @selected_foreground; + color: @selection_foreground; } .tile:backdrop GtkLabel, diff --git a/Paper/gtk-3.0/widgets/views.css b/Paper/gtk-3.0/widgets/views.css index 795ac6c..8bbcb24 100644 --- a/Paper/gtk-3.0/widgets/views.css +++ b/Paper/gtk-3.0/widgets/views.css @@ -23,7 +23,7 @@ .frame { background: none; - border: 1px solid @border; + border: 0px solid @border; color: @foreground; } @@ -87,7 +87,7 @@ GtkEventBox:backdrop { .view:selected:focus { background-color: @selection; border-color: shade(@selection, 0.8); - color: @selected_foreground; + color: @selection_foreground; } .view:selected:backdrop, @@ -196,7 +196,7 @@ GtkIconView.view.cell:selected:focus { border: 1px solid shade(@selection, 0.8); border-radius: 6px; background-color: @selection; - color: @selected_foreground; + color: @selection_foreground; } GtkIconView.content-view.check {