From 6eff3bdc1fd4a09c5510cd0d036258ed1f8b32c4 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 6 Jul 2014 01:24:53 +0530 Subject: [PATCH 01/73] SASS port started --- .gitignore | 3 + gtk-3.0/apps/gnome-applications.css | 400 --- gtk-3.0/apps/granite-widgets.css | 670 ----- gtk-3.0/apps/lightdm-gtk-greeter.css | 250 -- gtk-3.0/apps/nemo.css | 76 - gtk-3.0/apps/synaptic.css | 11 - gtk-3.0/apps/unity.css | 79 - gtk-3.0/apps/xfce.css | 38 - gtk-3.0/gtk-dark.css | 85 - gtk-3.0/gtk-widgets-assets.css | 379 --- gtk-3.0/gtk-widgets.css | 3682 -------------------------- gtk-3.0/gtk.css | 85 +- gtk-3.0/scss/_base.scss | 119 + gtk-3.0/scss/_button.scss | 105 + gtk-3.0/scss/_entry.scss | 72 + gtk-3.0/scss/_functions.scss | 64 + gtk-3.0/scss/_global.scss | 43 + gtk-3.0/scss/_menu.scss | 152 ++ gtk-3.0/scss/_toolbar.scss | 120 + gtk-3.0/scss/widgets.scss | 5 + gtk-3.0/settings.ini | 3 - 21 files changed, 684 insertions(+), 5757 deletions(-) delete mode 100644 gtk-3.0/apps/gnome-applications.css delete mode 100644 gtk-3.0/apps/granite-widgets.css delete mode 100644 gtk-3.0/apps/lightdm-gtk-greeter.css delete mode 100644 gtk-3.0/apps/nemo.css delete mode 100644 gtk-3.0/apps/synaptic.css delete mode 100644 gtk-3.0/apps/unity.css delete mode 100644 gtk-3.0/apps/xfce.css delete mode 100644 gtk-3.0/gtk-dark.css delete mode 100644 gtk-3.0/gtk-widgets-assets.css delete mode 100644 gtk-3.0/gtk-widgets.css create mode 100644 gtk-3.0/scss/_base.scss create mode 100644 gtk-3.0/scss/_button.scss create mode 100644 gtk-3.0/scss/_entry.scss create mode 100644 gtk-3.0/scss/_functions.scss create mode 100644 gtk-3.0/scss/_global.scss create mode 100644 gtk-3.0/scss/_menu.scss create mode 100644 gtk-3.0/scss/_toolbar.scss create mode 100644 gtk-3.0/scss/widgets.scss delete mode 100644 gtk-3.0/settings.ini diff --git a/.gitignore b/.gitignore index be9493f..29d5568 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # Ignore Backup Copies from Text Editor *~ +# Ignore SASS files +.sass-cache +gen diff --git a/gtk-3.0/apps/gnome-applications.css b/gtk-3.0/apps/gnome-applications.css deleted file mode 100644 index 9158689..0000000 --- a/gtk-3.0/apps/gnome-applications.css +++ /dev/null @@ -1,400 +0,0 @@ -/*********************** - * fallback mode panel * - ***********************/ -PanelWidget, -PanelApplet, -PanelToplevel { - padding: 0; - background-color: @panel_bg_color; - background-image: none; - color: @panel_fg_color; -} - -PanelApplet { - border-width: 0; -} - -PanelSeparator { - border-width: 0; - background-color: @panel_bg_color; - background-image: none; - color: @panel_fg_color; -} - -.gnome-panel-menu-bar, -PanelApplet > GtkMenuBar.menubar, -PanelApplet > GtkMenuBar.menubar.menuitem, -PanelMenuBar.menubar, -PanelMenuBar.menubar.menuitem { - -PanelMenuBar-icon-visible: true; - - border-width: 0; - background-color: @panel_bg_color; - background-image: none; -} - -PanelAppletFrame { - border-width: 0; - background-color: @panel_bg_color; - background-image: none; -} - -PanelApplet .button { - -GtkButton-inner-border: 2; - - border-width: 0 1px; - border-radius: 0; - border-color: transparent; - background-color: @panel_bg_color; - background-image: none; - color: @panel_fg_color; -} - -PanelApplet .button:active { - border-width: 0 1px; - border-radius: 0; - border-color: mix(@panel_bg_color, @panel_fg_color, 0.21); - background-color: mix(@panel_bg_color, @panel_fg_color, 0.21); - background-image: none; - color: shade(@panel_fg_color, 1.08); -} - -PanelApplet .button:prelight { - border-color: mix(@panel_bg_color, @panel_fg_color, 0.11); - background-color: mix(@panel_bg_color, @panel_fg_color, 0.11); - background-image: none; - color: shade(@panel_fg_color, 1.08); -} - -PanelApplet .button:active:prelight { - border-color: mix(@panel_bg_color, @panel_fg_color, 0.31); - background-color: mix(@panel_bg_color, @panel_fg_color, 0.31); - background-image: none; - color: shade(@panel_fg_color, 1.08); -} - -WnckPager, WnckTasklist { - background-color: @panel_bg_color; -} - -/************ - * nautilus * - ************/ -.nautilus-canvas-item { - border-radius: 2px; -} - -.nautilus-desktop.nautilus-canvas-item { - color: white; - text-shadow: 1px 1px black; -} - -.nautilus-desktop.nautilus-canvas-item:active { - color: @theme_fg_color; -} - -.nautilus-desktop.nautilus-canvas-item:selected { - color: @theme_selected_fg_color; -} - -.nautilus-desktop.nautilus-canvas-item:active, -.nautilus-desktop.nautilus-canvas-item:prelight, -.nautilus-desktop.nautilus-canvas-item:selected { - text-shadow: none; -} - -NautilusWindow .toolbar { - border-width: 0 0 1px; - border-style: solid; - border-color: shade(@toolbar_bg_color, 0.8); -} - -NautilusWindow .sidebar .frame { - border-style: none; -} - -NautilusWindow > GtkGrid > .pane-separator, -NautilusWindow > GtkGrid > .pane-separator:hover { - border-width: 0 1px 0 0; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: @theme_bg_color; -} - -NautilusNotebook.notebook { - border-right-width: 0; - border-left-width: 0; - border-bottom-width: 0; -} - -NautilusNotebook .frame { - border-width: 0; -} - -NautilusQueryEditor .search-bar.toolbar { - border-top-width: 0; - border-bottom-width: 0; -} - -NautilusQueryEditor .toolbar { - padding-top: 3px; - padding-bottom: 2px; - border-width: 1px 0 0 0; - border-style: solid; - border-color: @toolbar_bg_color; - background-color: shade(@toolbar_bg_color, 0.9); -} - -NautilusQueryEditor .toolbar:nth-child(2) { - border-color: shade(@toolbar_bg_color, 0.8); -} - -NautilusQueryEditor .toolbar:last-child, -NautilusQueryEditor .search-bar.toolbar:only-child { - border-bottom-width: 1px; - border-bottom-color: shade(@toolbar_bg_color, 0.8); -} - -/****************** - * gnome terminal * - ******************/ -VteTerminal { - background-color: @osd_base; - color: @osd_fg; -} - -TerminalWindow GtkNotebook.notebook { - border-right-width: 0; - border-bottom-width: 0; - border-left-width: 0; -} - -TerminalWindow .scrollbars-junction, -TerminalWindow .scrollbar.trough { - background-color: @osd_base; -} - -TerminalWindow .scrollbar.button, -TerminalWindow .scrollbar.button:active, -TerminalWindow .scrollbar.button:active:hover { - color: shade(@osd_base, 0.6); -} - -TerminalWindow .scrollbar.slider { - border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.21); - background-color: mix(@osd_base, @osd_fg, 0.21); -} - -TerminalWindow .scrollbar.slider:hover, -TerminalWindow .scrollbar.slider.vertical:hover { - border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.31); - background-color: mix(@osd_base, @osd_fg, 0.31); -} - -TerminalWindow .scrollbar.slider:active, -TerminalWindow .scrollbar.slider.vertical:active { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; -} - -/********* - * gedit * - *********/ -GeditWindow .pane-separator, -GeditWindow .pane-separator:hover { - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: @theme_bg_color; - color: shade(@theme_bg_color, 0.8); -} - -.gedit-document-panel { - background-color: @theme_bg_color; - color: mix(@theme_fg_color, @theme_bg_color, 0.1); -} - -.gedit-document-panel-group-row, -.gedit-document-panel-group-row:hover { - border-top: 1px solid shade(@theme_bg_color, 0.9); - background-color: @theme_bg_color; -} - -.gedit-document-panel-document-row:hover { - background-color: shade(@theme_bg_color, 1.05); -} - -.gedit-document-panel-document-row:selected, -.gedit-document-panel-document-row:selected:hover { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -.gedit-document-panel .list-row { - padding: 4px; -} - -.gedit-document-panel .list-row .button { - padding: 1px; - border-image: none; - border-radius: 2px; - border-style: solid; - border-color: transparent; - border-width: 1px; - background-color: transparent; - background-image: none; - color: transparent; - icon-shadow: none; -} - -.gedit-document-panel .prelight-row .button { - border-color: alpha(black, 0.1); - color: alpha(white, 0.8); -} - -.gedit-document-panel .list-row .button:hover, -.gedit-document-panel .prelight-row .button:hover { - border-color: alpha(black, 0.1); - color: white; -} - -.gedit-document-panel .prelight-row .button:active { - border-color: alpha(black, 0.2); - background-color: alpha(black, 0.08); - color: white; -} - -.gedit-document-panel-dragged-row { - border: 1px solid alpha(black, 0.1); - background-color: alpha(black, 0.5); - color: white; -} - -.gedit-document-panel-placeholder-row { - border: none; - background-color: alpha(black, 0.08); - transition: all 200ms ease-in; -} - -GeditStatusbar { - border-top: 1px solid shade(@theme_bg_color, 0.8); -} - -GeditStatusbar GeditSmallButton, -GeditStatusMenuButton { - text-shadow: none; -} - -GeditStatusbar GeditSmallButton.button, -GeditStatusbar GeditSmallButton.button:hover, -GeditStatusbar GeditSmallButton.button:active, -GeditStatusbar GeditSmallButton.button:active:hover, -GeditStatusMenuButton.button, -GeditStatusMenuButton.button:hover, -GeditStatusMenuButton.button:active, -GeditStatusMenuButton.button:active:hover { - border-image: none; - border-style: solid; - border-width: 0 1px; - border-radius: 0; - padding: 1px 6px 2px 4px; -} - -GeditStatusbar GeditSmallButton.button:hover, -GeditStatusbar GeditSmallButton.button:active, -GeditStatusbar GeditSmallButton.button:active:hover, -GeditStatusMenuButton.button:hover, -GeditStatusMenuButton.button:active, -GeditStatusMenuButton.button:active:hover { - border-color: shade(@theme_bg_color, 0.8); -} - -GeditStatusbar GeditSmallButton.button:active, -GeditStatusMenuButton.button:active { - background-color: shade(@theme_bg_color, 0.95); - color: @theme_fg_color; -} - -GeditViewFrame .gedit-search-slider { - padding: 4px; - border-radius: 0 0 2px 2px; - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - background-color: @theme_base_color; -} - -GeditViewFrame .gedit-search-slider .not-found { - background-color: @error_bg_color; - background-image: none; - color: @error_fg_color; -} - -GeditViewFrame .gedit-search-slider .not-found:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -GeditFileBrowserWidget .toolbar { - padding: 2px; - border-top: none; - background-color: @theme_bg_color; - background-image: none; -} - -.gedit-search-entry-occurrences-tag { - margin: 2px; - padding: 2px; - color: mix(@theme_text_color, @theme_base_color, 0.5); -} - -/*************** - * font-viewer * - ***************/ -SushiFontWidget { - padding: 6px 12px; -} - -/************* - * gucharmap * - *************/ -GucharmapChartable { - background-color: @theme_base_color; - color: @theme_text_color; -} - -GucharmapChartable:active, -GucharmapChartable:focus, -GucharmapChartable:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -/************* - * evolution * - *************/ -EPreviewPane .entry { - background-color: @theme_base_color; - color: @theme_text_color; -} - -/****************** - * gnome calendar * - ******************/ -.calendar-view { - background-color: shade(@theme_base_color, 0.95); - color: @theme_text_color; -} - -/******************* - * gnome-bluetooth * - *******************/ -GtkEntry.entry.pin-entry { - font: regular 50; - padding-left: 25px; - padding-right: 25px; -} - -GtkLabel.pin-label { - font: regular 50; -} diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css deleted file mode 100644 index 777a30a..0000000 --- a/gtk-3.0/apps/granite-widgets.css +++ /dev/null @@ -1,670 +0,0 @@ -/******************** - * dynamic notebook * - ********************/ -.dynamic-notebook { - background-color: shade(@theme_bg_color, 1.08); - background-image: none; -} - -.dynamic-notebook GtkLabel, -.dynamic-notebook GtkImage { - color: alpha(@theme_fg_color, 0.5); -} - -.dynamic-notebook .notebook { - -GtkNotebook-tab-overlap: 3px; - -GtkNotebook-initial-gap: 12px; - - border-width: 1px 0 0 0; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; - padding: 0; -} - -.dynamic-notebook .notebook tab { - padding: 3px; - border-width: 0 1px; - border-color: shade(@theme_bg_color, 0.85); - border-radius: 0; - background-color: shade(@theme_bg_color, 0.9); - background-image: none; - color: @theme_fg_color; -} - -.dynamic-notebook .notebook tab:nth-child(first) { -} - -.dynamic-notebook .notebook tab:active { - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_base_color, 0.85); - background-image: none; - color: @theme_fg_color; - box-shadow:inset 0 -2px @theme_selected_bg_color; -} - -.dynamic-notebook .notebook tab .entry { - border-radius: 2px; - padding: 4px 3px; -} - -.dynamic-notebook .button:hover, -.dynamic-notebook .button:hover:active, -.dynamic-notebook .notebook .button, -.dynamic-notebook .notebook .button:hover, -.dynamic-notebook .notebook .button:hover:active { - border-color: shade(@theme_bg_color, 0.7); - background-color: shade(@theme_bg_color, 1.10); - background-image: none; -} - -.dynamic-notebook .button:hover:active, -.dynamic-notebook .notebook .button:hover:active { - border-color: shade(@theme_bg_color, 0.7); - color: shade(@theme_fg_color, 0.7); -} - -.dynamic-notebook .menu GtkLabel { - color: @menu_fg; -} - -/**************** - * content view * - ****************/ -.content-view-window { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - border-radius: 2px; - background-color:@theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.content-view, -.content-view GtkViewport { - background-color: @theme_base_color; - background-image: none; -} - -.content-view * { - background-color: transparent; - background-image: none; -} - -.content-view .entry { - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.content-view .button { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - border-radius: 2px; - background-color: shade(@theme_base_color, 1.08); - background-image: none; - color: @theme_text_color; -} - -.content-view .button:hover { - border-color: shade(@theme_base_color, 0.7); - background-color: shade(@theme_base_color, 1.10); - background-image: none; -} - -.content-view .button:active { - border-color: shade(@theme_base_color, 0.8); - background-color: shade(@theme_base_color, 0.95); - background-image: none; -} - -.content-view .button:active:hover { - border-color: shade(@theme_base_color, 0.7); - color: shade(@theme_text_color, 0.7); -} - -.content-view .button:insensitive { - background-color: shade(@theme_base_color, 0.9); - background-image: none; -} - -.content-view .help_button * { - color: @theme_text_color; -} - -.content-view .toolbar { - -GtkWidget-window-dragging: true; - - padding: 1px; - border-width: 0 0 1px 0; - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - background-color: @theme_base_color; - background-image: none; -} - -.content-view .menu { - padding: 0; - border-radius: 0; - border-style: none; - background-color: @menu_bg_color; - background-image: none; - color: @menu_fg_color; -} - -/************** - * sourcelist * - **************/ -.source-list, -.source-list.view { - border-radius: 0; - background-color: @theme_bg_color; - background-image: none; - color: mix(@theme_fg_color, @theme_bg_color, 0.1); -} - -.source-list { - -GtkTreeView-horizontal-separator: 1; - -GtkTreeView-vertical-separator: 1; -} - -.source-list.view:selected, -.source-list.view:prelight:selected { - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -.source-list.view:prelight { - background-color: shade(@theme_bg_color, 1.08); - background-image: none; -} - -.source-list.badge, -.source-list.badge:prelight, -.source-list.badge:selected, -.source-list.badge:prelight:selected { - margin: 0 3px; - padding: 0 6px; - border-width: 0; - border-radius: 10px; - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -/****************** - * no undo button * - ******************/ -.button.noundo, -.content-view .button.noundo { - border-color: shade(@error_bg_color, 0.8); - background-color: shade(@error_bg_color, 1.08); - background-image: none; - color: @error_fg_color; -} - -.button.noundo:hover, -.content-view .button.noundo:hover { - border-color: shade(@error_bg_color, 0.7); - background-color: @error_bg_color; - background-image: none; -} - -.button.noundo:active, -.content-view .button.noundo:active { - border-color: shade(@error_bg_color, 0.8); - background-color: shade(@error_bg_color, 0.95); - background-image: none; -} - -.button.noundo:active:hover, -.content-view .button.noundo:active:hover { - border-color: shade(@error_bg_color, 0.7); - background-color: shade(@error_bg_color, 0.97); - background-image: none; -} - -.button.noundo GtkLabel, -.button.noundo Gtklabel:prelight { - color: @error_fg_color; -} - -/********************** - * affirmative button * - **********************/ -.button.affirmative, -.content-view .button.affirmative { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 1.08); - background-image: none; - color: @theme_selected_fg_color; -} - -.button.affirmative:hover, -.content-view .button.affirmative:hover { - border-color: shade(@theme_selected_bg_color, 0.7); - background-color: @theme_selected_bg_color; - background-image: none; -} - -.button.affirmative:active, -.content-view .button.affirmative:active { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 0.95); - background-image: none; -} - -.button.affirmative:active:hover, -.content-view .button.affirmative:active:hover { - border-color: shade(@theme_selected_bg_color, 0.7); - background-color: shade(@theme_selected_bg_color, 0.97); - background-image: none; -} - -.button.affirmative GtkLabel, -.button.affirmative Gtklabel:prelight { - color: @theme_selected_fg_color; -} - -/********************** - * secondary toolbars * - **********************/ -.secondary-toolbar.toolbar { - padding: 2px; - border-color: shade(@toolbar_bg_color, 0.8); - background-color: @toolbar_bg_color; - background-image: none; -} - -.secondary-toolbar.toolbar .button { - border-color: shade(@toolbar_bg_color, 0.8); - background-color: shade(@toolbar_bg_color, 1.08); - background-image: none; - color: @toolbar_fg_color; -} - -.secondary-toolbar.toolbar .button:hover { - border-color: shade(@toolbar_bg_color, 0.7); - background-color: shade(@toolbar_bg_color, 1.10); - background-image: none; -} - -.secondary-toolbar.toolbar .button:active { - border-color: shade(@toolbar_bg_color, 0.8); - background-color: shade(@toolbar_bg_color, 0.95); - background-image: none; -} - -.secondary-toolbar.toolbar .button:active:hover { - border-color: shade(@toolbar_bg_color, 0.7); -} - -.secondary-toolbar.toolbar .button:focus, -.secondary-toolbar.toolbar .button:hover:focus, -.secondary-toolbar.toolbar .button:active:focus, -.secondary-toolbar.toolbar .button:active:hover:focus { - border-color: shade(@toolbar_bg_color, 0.7); -} - -.secondary-toolbar.toolbar .button:insensitive { - border-color: shade(@toolbar_bg_color, 0.85); - background-color: shade(@toolbar_bg_color, 0.9); - background-image: none; -} - -.secondary-toolbar.toolbar .button:active *:insensitive { - border-color: shade(@toolbar_bg_color, 0.75); - background-color: shade(@toolbar_bg_color, 0.80); - background-image: none; -} - -/******************* - * bottom toolbars * - *******************/ -.bottom-toolbar.toolbar { - padding: 6px; - border-width: 1px 0 0 0; - border-color: shade(@theme_bg_color, 0.8); - background-color: @theme_bg_color; - background-image: none; -} - -.bottom-toolbar.toolbar .button { - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 1.08); - background-image: none; - color: @theme_fg_color; -} - -.bottom-toolbar.toolbar .button:hover { - border-color: shade(@theme_bg_color, 0.7); - background-color: shade(@theme_bg_color, 1.10); - background-image: none; -} - -.bottom-toolbar.toolbar .button:active { - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 0.95); - background-image: none; -} - -.bottom-toolbar.toolbar .button:active:hover { - border-color: shade(@theme_bg_color, 0.7); -} - -.bottom-toolbar.toolbar .button:focus, -.bottom-toolbar.toolbar .button:hover:focus, -.bottom-toolbar.toolbar .button:active:focus, -.bottom-toolbar.toolbar .button:active:hover:focus { - border-color: shade(@theme_bg_color, 0.7); -} - -.bottom-toolbar.toolbar .button:insensitive { - border-color: shade(@theme_bg_color, 0.85); - background-color: shade(@theme_bg_color, 0.9); - background-image: none; -} - -.bottom-toolbar.toolbar .button:active *:insensitive { - border-color: shade(@theme_bg_color, 0.75); - background-color: shade(@theme_bg_color, 0.80); - background-image: none; -} - -/************* - * statusbar * - *************/ -GraniteWidgetsStatusBar { - padding: 1px; - background-color: @theme_bg_color; - background-image: none; - box-shadow: inset 0 1px shade(@theme_bg_color, 0.8); -} - -/*********** - * popover * - ***********/ -GraniteWidgetsPopOver { - -GraniteWidgetsPopOver-arrow-width: 21; - -GraniteWidgetsPopOver-arrow-height: 12; - -GraniteWidgetsPopOver-border-radius: 2px; - -GraniteWidgetsPopOver-border-width: 1; - -GraniteWidgetsPopOver-shadow-size: 12; - - margin: 0; - border-style: solid; - border-color: shade(@menu_bg_color, 0.8); - color: @menu_fg_color; -} - -.popover_bg { - background-color: transparent; - background-image: linear-gradient(to bottom, - @menu_bg_color, - @menu_bg_color - ); -} - -GraniteWidgetsPopOver .sidebar.view, -GraniteWidgetsPopOver * { - background-color: transparent; - background-image: none; - color: @menu_fg_color; -} - -GraniteWidgetsPopOver .sidebar.view:selected, -GraniteWidgetsPopOver .sidebar.view:selected:focus, -GraniteWidgetsPopOver *:selected, -GraniteWidgetsPopOver *:selected:focus { - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -GraniteWidgetsPopOver .button { - border-color: shade(@menu_bg_color, 0.8); - background-color: shade(@menu_bg_color, 1.08); - background-image: none; - color: @menu_fg_color; - -} - -GraniteWidgetsPopOver .button:hover { - border-color: shade(@menu_bg_color, 0.7); - background-color: shade(@menu_bg_color, 1.10); - background-image: none; - color: shade(@menu_fg_color, 0.7); -} - -GraniteWidgetsPopOver .button:active { - border-color: shade(@menu_bg_color, 0.8); - background-color: shade(@menu_bg_color, 0.95); - background-image: none; -} - -GraniteWidgetsPopOver .button:active:hover { - border-color: shade(@menu_bg_color, 0.7); - color: shade(@menu_fg_color, 0.7); -} - -/* linked buttons */ -GraniteWidgetsPopOver .linked .button { - box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9); -} - -GraniteWidgetsPopOver .linked .button:active { - box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -GraniteWidgetsPopOver .linked .button:insensitive { - box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9); -} - -/* remove box shadow from last-child and only-child */ -GraniteWidgetsPopOver .linked .button:last-child, -GraniteWidgetsPopOver .linked .button:only-child, -GraniteWidgetsPopOver .linked .button:insensitive:last-child, -GraniteWidgetsPopOver .linked .button:insensitive:only-child, -GraniteWidgetsPopOver .linked .button:active *:insensitive:last-child, -GraniteWidgetsPopOver .linked .button:active *:insensitive:only-child { - box-shadow: none; -} - -/* add back the inset shadow effect */ -GraniteWidgetsPopOver .linked .button:active:last-child, -GraniteWidgetsPopOver .linked .button:active:only-child { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07); -} - -GraniteWidgetsPopOver .entry { - border-color: shade(@menu_bg_color, 0.7); - background-color: @menu_bg_color; - background-image: none; - color: @menu_fg_color; -} - -GraniteWidgetsPopOver .entry:active, -GraniteWidgetsPopOver .entry:focus { - border-color: shade(@menu_bg_color, 0.7); -} - -GraniteWidgetsPopOver *.separator { - border-color: shade(@menu_bg_color, 0.9); - color: transparent; -} - -.button.app { - border-width: 0; - border-radius: 2px; - background-color: transparent; - background-image: none; -} - -.button.app:hover { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -.button.app:focus { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -/******** - * gala * - ********/ -.gala-workspaces-background { - border-width: 1px 0 0 0; - border-color: shade(@panel_bg_color, 0.8); - background-color: @panel_bg_color; - background-image: none; -} - -.gala-workspace-selected { - border-width: 1px; - border-radius: 2px; - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; -} - -/********* - * files * - *********/ -.files-overlay-bar { - margin: 3px; - padding: 3px 6px; - border-width: 1px; - border-color: shade(@theme_base_color, 0.7); - border-radius: 2px; - background-color: @theme_base_color; - background-image: none; -} - -.files-overlay-bar GtkLabel { - color: @theme_text_color; -} - -/********* - * noise * - *********/ -.album-list-view, -.album-list-view * { - border-color: shade(@theme_base_color, 0.7); - border-radius: 0; - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.album-list-view GtkTreeView { - -GtkTreeView-vertical-separator: 1; - -GtkTreeView-grid-line-width: 0; - - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.album-list-view GtkTreeView row:nth-child(even) { - border-width: 0; - border-style: none; - background-color: shade(@theme_base_color, 0.97); - background-image: none; -} - - -.album-list-view GtkTreeView row:nth-child(odd) { - border-width: 0; - border-style: none; - background-color: shade(@theme_base_color, 1.0); - background-image: none; -} - -.album-list-view GtkTreeView row:selected { - background-color: @selected_bg_color; - background-image: none; - color: @selected_fg_color; -} - -/********** - * birdie * - **********/ -BirdieWidgetsTweetList * { - background-color: transparent; - background-image: none; -} - -/********* - * tweet * - *********/ -.tweet { - padding: 0; -} - -/********** - * notify * - **********/ -.notify { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_base_color, 0.7); - border-radius: 2px; - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.notify .low { -} - -.notify .critical { -} - -/********* - * panel * - *********/ -.panel { - background-color: @panel_bg_color; - background-image: none; - color: @panel_fg_color; - font: bold; -} - -.panel .menubar .menuitem { - padding: 1px 3px; -} - -.shadow { - background-color: transparent; - background-image: linear-gradient(to bottom, - rgba(0, 0, 0, 0.3), - transparent - ); -} - -.composited-indicator, -.wingpanel-app-button, -.wingpanel-indicator-button { - padding: 0 2px; - background-color: transparent; - background-image: none; - color: @osd_fg; -} - -.composited-indicator.menuitem:active, -.composited-indicator.menuitem:prelight { - border-style: none; - background-image: none; -} diff --git a/gtk-3.0/apps/lightdm-gtk-greeter.css b/gtk-3.0/apps/lightdm-gtk-greeter.css deleted file mode 100644 index 874cdb3..0000000 --- a/gtk-3.0/apps/lightdm-gtk-greeter.css +++ /dev/null @@ -1,250 +0,0 @@ -/********* - * panel * - *********/ -#panel_window { - background-color: transparent; - background-image: none; - color: white; - font: bold; - text-shadow: 0 1px alpha(black, 0.5); - icon-shadow: 0 1px alpha(black, 0.5); -} - -#panel_window .menubar, -#panel_window .menubar > .menuitem { - background-color: transparent; - background-image: none; - color: white; - font: bold; - text-shadow: 0 1px alpha(black, 0.5); - icon-shadow: 0 1px alpha(black, 0.5); -} - -#panel_window .menubar > .menuitem:hover { - border-style: none; - background-color: alpha(white, 0.2); - background-image: none; - color: white; -} - -#panel_window .menubar > .menuitem *:hover { - color: white; -} - -#panel_window .menubar > .menuitem:insensitive { - color: alpha(white, 0.7); -} - -#panel_window .menubar .menu { - border-radius: 1px; -} - -#panel_window .menubar .menu .menuitem { - font: normal; - text-shadow: none; -} - -/**************** - * login window * - ****************/ -#login_window, -#shutdown_dialog, -#restart_dialog { - border-style: none; - border-radius: 2px; - background-color: @lightdm_bg_color; - color: @lightdm_fg_color; - - /* draw border using box-shadow */ - box-shadow: inset 1px 0 mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21), - inset -1px 0 mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21), - inset 0 1px mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21), - inset 0 -1px mix(shade(@lightdm_bg_color, 0.7), @lightdm_fg_color, 0.21); -} - -#content_frame { - padding-bottom: 14px; -} - -#login_window .menu { - border-radius: 1px; -} - -#login_window GtkComboBox .button, -#login_window GtkComboBox .button:hover, -#login_window GtkComboBox .button:active, -#login_window GtkComboBox .button:active:hover, -#login_window GtkComboBox .button:focus, -#login_window GtkComboBox .button:hover:focus, -#login_window GtkComboBox .button:active:focus, -#login_window GtkComboBox .button:active:hover:focus { - padding: 0; - background: none; - border-style: none; - box-shadow: none; -} - -#login_window GtkComboBox .button:focus, -#login_window GtkComboBox .button:hover:focus, -#login_window GtkComboBox .button:active:focus, -#login_window GtkComboBox .button:active:hover:focus { - background: none; - border-style: none; -} - -#login_window #user_combobox { - color: @lightdm_fg_color; - font: 18px; -} - -#login_window #user_combobox .menu { - font: normal; -} - -#login_window #user_combobox .arrow { - color: mix(@lightdm_fg_color, @lightdm_bg_color, 0.5); -} - -#login_window .entry { - padding: 3px 5px; - border-width: 1px; - border-style: solid; - border-color: shade(@lightdm_bg_color, 0.8); - border-radius: 2px; - background-color: shade(@lightdm_bg_color, 0.9); - background-image: none; - color: @lightdm_fg_color; - - box-shadow: none; - transition: all 150ms ease-out; -} - -#login_window .entry:focus, -#login_window .entry:hover { - border-color: shade(@lightdm_bg_color, 0.7); - - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.10), - inset 0 1px alpha(@dark_shadow, 0.12), - inset -1px 0 alpha(@dark_shadow, 0.10), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -#login_window .button, -#shutdown_dialog .button, -#restart_dialog .button { - padding: 3px 15px; - border-width: 1px; - border-radius: 2px; - border-style: solid; - border-color: shade(@lightdm_bg_color, 0.8); - background-color: shade(@lightdm_bg_color, 1.08); - background-image: none; - color: @lightdm_fg_color; - - transition: all 150ms ease-out; -} - -#user_image { - padding: 3px; - border-radius: 2px; - - /* draw border using box-shadow */ - box-shadow: inset 1px 0 shade(@lightdm_bg_color, 0.7), - inset -1px 0 shade(@lightdm_bg_color, 0.7), - inset 0 1px shade(@lightdm_bg_color, 0.7), - inset 0 -1px shade(@lightdm_bg_color, 0.7); -} - -#user_image_border { - border-radius: 2px; - background-color: shade(@lightdm_bg_color, 0.9); - background-image: none; - - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -#buttonbox_frame { - padding-top: 10px; - padding-bottom: 0; - border-style: none; - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; - background-color: transparent; - background-image: none; - box-shadow: none; -} - -/****************************** - * default and focused button * - ******************************/ -#login_window .button.default, -#shutdown_dialog .button.default, -#restart_dialog .button.default, -#login_window .button:focus, -#login_window .button:active:focus, -#shutdown_dialog .button:focus, -#shutdown_dialog .button:active:focus, -#restart_dialog .button:focus, -#restart_dialog .button:active:focus { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 1.08); - background-image: none; - color: @theme_selected_fg_color; -} - -#login_window .button.default:hover, -#shutdown_dialog .button.default:hover, -#restart_dialog .button.default:hover, -#login_window .button:hover:focus, -#login_window .button:active:hover:focus, -#shutdown_dialog .button:hover:focus, -#shutdown_dialog .button:active:hover:focus, -#restart_dialog .button:hover:focus, -#restart_dialog .button:active:hover:focus { - border-color: shade(@theme_selected_bg_color, 0.7); - background-color: @theme_selected_bg_color; -} - -/******************* - * shutdown button * - *******************/ -#shutdown_button.button { - border-color: shade(@error_bg_color, 0.8); - background-color: shade(@error_bg_color, 1.08); - background-image: none; - color: @error_fg_color; -} - -#shutdown_button.button:hover, -#shutdown_button.button:active, -#shutdown_button.button:active:hover { - border-color: shade(@error_bg_color, 0.7); - background-color: @error_bg_color; -} - -/****************** - * restart button * - ******************/ -#restart_button.button { - border-color: shade(@warning_bg_color, 0.8); - background-color: shade(@warning_bg_color, 1.08); - background-image: none; - color: @warning_fg_color; -} - -#restart_button.button:hover, -#restart_button.button:active, -#restart_button.button:active:hover { - border-color: shade(@warning_bg_color, 0.7); - background-color: @warning_bg_color; -} - -/******************** - * password warning * - ********************/ -#greeter_infobar { - font: bold; -} diff --git a/gtk-3.0/apps/nemo.css b/gtk-3.0/apps/nemo.css deleted file mode 100644 index fa09d03..0000000 --- a/gtk-3.0/apps/nemo.css +++ /dev/null @@ -1,76 +0,0 @@ -/***************** - * desktop icons * - *****************/ -.nemo-canvas-item { - border-radius: 2px; -} - -.nemo-desktop.nemo-canvas-item { - color: white; - text-shadow: 1px 1px black; -} - -.nemo-desktop.nemo-canvas-item:active { - color: @theme_fg_color; -} - -.nemo-desktop.nemo-canvas-item:selected { - color: @theme_selected_fg_color; -} - -.nemo-desktop.nemo-canvas-item:active, -.nemo-desktop.nemo-canvas-item:prelight, -.nemo-desktop.nemo-canvas-item:selected { - text-shadow: none; -} - -/*********************** - * pathbar breadcrumbs * - ***********************/ -NemoPathbarButton { - border-color: shade(@toolbar_bg_color, 0.8); - background-color: shade(@toolbar_bg_color, 1.08); - background-image: none; - color: @toolbar_fg_color; - - -NemoPathbarButton-border-radius: 2px; -} - -NemoPathbarButton:active { - border-color: shade(@toolbar_bg_color, 0.8); - background-color: shade(@toolbar_bg_color, 0.95); - background-image: none; -} - -NemoPathbarButton:hover { - border-color: shade(@toolbar_bg_color, 0.7); - background-color: shade(@toolbar_bg_color, 1.10); - background-image: none; -} - -NemoPathbarButton:active:hover { - border-color: shade(@toolbar_bg_color, 0.7); -} - -/********************************* - * sidebar disk space indicators * - *********************************/ -NemoPlacesTreeView { - -NemoPlacesTreeView-disk-full-bg-color: shade(@toolbar_bg_color, 0.8); - -NemoPlacesTreeView-disk-full-fg-color: @theme_selected_bg_color; - -NemoPlacesTreeView-disk-full-bar-width: 1px; - -NemoPlacesTreeView-disk-full-bar-radius: 1px; - -NemoPlacesTreeView-disk-full-bottom-padding: 2px; - -NemoPlacesTreeView-disk-full-max-length: 70px; -} - -NemoPlacesTreeView:selected { - -NemoPlacesTreeView-disk-full-bg-color: @theme_selected_fg_color; - -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.4); -} - -NemoPlacesTreeView:hover { -} - -NemoPlacesTreeView:selected:hover { -} diff --git a/gtk-3.0/apps/synaptic.css b/gtk-3.0/apps/synaptic.css deleted file mode 100644 index a8877d1..0000000 --- a/gtk-3.0/apps/synaptic.css +++ /dev/null @@ -1,11 +0,0 @@ -/************ - * synaptic * - ************/ -GtkWindow > GtkVBox > .dock, -GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar { - padding: 4px; - border-style: none; - background-color: @toolbar_bg_color; - background-image: none; - color: @toolbar_fg_color; -} diff --git a/gtk-3.0/apps/unity.css b/gtk-3.0/apps/unity.css deleted file mode 100644 index 689e0ab..0000000 --- a/gtk-3.0/apps/unity.css +++ /dev/null @@ -1,79 +0,0 @@ -UnityDecoration { - -UnityDecoration-extents: 28px 1px 1px 1px; - -UnityDecoration-input-extents: 10px; - - -UnityDecoration-shadow-offset-x: 1px; - -UnityDecoration-shadow-offset-y: 1px; - -UnityDecoration-active-shadow-color: rgba(0,0,0,0.7); - -UnityDecoration-active-shadow-radius: 8px; - -UnityDecoration-inactive-shadow-color: rgba(0,0,0,0.5); - -UnityDecoration-inactive-shadow-radius: 5px; - - -UnityDecoration-glow-size: 10px; - -UnityDecoration-glow-color: @theme_selected_bg_color; - - -UnityDecoration-title-indent: 10px; - -UnityDecoration-title-fade: 35px; - -UnityDecoration-title-alignment: 0.0; -} - -UnityDecoration.top { - border: 1px solid mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21); - border-bottom-width: 0; - border-radius: 2px 2px 0 0; - padding: 1px 8px 0 8px; - background-color: @titlebar_bg_color; - color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); - text-shadow: none; -} - -UnityDecoration.top:backdrop { - border: 1px solid mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12); - border-bottom-width: 0; - background-color: @titlebar_bg_color; - color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); -} - -UnityDecoration.left, -UnityDecoration.right, -UnityDecoration.bottom { - background-color: mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21); -} - -UnityDecoration.left:backdrop, -UnityDecoration.right:backdrop, -UnityDecoration.bottom:backdrop { - background-color: mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12); -} - -UnityPanelWidget, -.unity-panel { - border-width: 0 0 1px 0; - border-style: solid; - border-color: @panel_bg_color; - background-color: @panel_bg_color; - background-image: none; - color: @panel_fg_color; -} - -.unity-panel.menubar, -.unity-panel .menubar { -} - -.unity-panel.menuitem, -.unity-panel .menuitem { - border-width: 0 1px; - color: @panel_fg_color; -} - -.unity-panel.menubar.menuitem:hover, -.unity-panel.menubar .menuitem *:hover { - border-color: mix(@panel_bg_color, @panel_fg_color, 0.21); - background-color: mix(@panel_bg_color, @panel_fg_color, 0.21); - background-image: none; - color: shade(@panel_fg_color, 1.08); -} - -SheetStyleDialog.unity-force-quit { - background-color: @theme_bg_color; -} diff --git a/gtk-3.0/apps/xfce.css b/gtk-3.0/apps/xfce.css deleted file mode 100644 index 03cfb20..0000000 --- a/gtk-3.0/apps/xfce.css +++ /dev/null @@ -1,38 +0,0 @@ -XfceHeading { - margin: 0; - padding: 0; - border-width: 0; - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.xfce4-panel { - background-color: @panel_bg_color; - color: @panel_fg_color; - font: normal; -} - -.xfce4-panel .button { - padding: 0 2px; - border-radius: 0; - border-style: none; - color: @panel_fg_color; -} - -.xfce4-panel .button:active { - background-color: shade(@panel_bg_color, 0.8); - background-image: none; - color: @panel_fg_color; -} - -.xfce4-panel .button:hover, -.xfce4-panel .button:active:hover { - background-color: mix(@panel_bg_color, @panel_fg_color, 0.21); - background-image: none; - color: shade(@panel_fg_color, 1.08); -} - -.xfce4-panel .menu { - -gtk-image-effect: none; -} diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css deleted file mode 100644 index 22f93ef..0000000 --- a/gtk-3.0/gtk-dark.css +++ /dev/null @@ -1,85 +0,0 @@ -/* default color scheme */ -@define-color base_color #333333; -@define-color bg_color #2d2d2d; -@define-color text_color #dedede; -@define-color fg_color #dcdcdc; -@define-color selected_bg_color #d64937; -@define-color selected_fg_color #f9f9f9; -@define-color tooltip_bg_color #2d2d2d; -@define-color tooltip_fg_color #dcdcdc; - -/* dark color scheme */ -@define-color dark_bg_color #2d2d2d; -@define-color dark_fg_color #dcdcdc; - -/* colormap actually used by the theme, to be overridden in other css files */ -@define-color theme_bg_color @bg_color; -@define-color theme_fg_color @fg_color; -@define-color theme_base_color @base_color; -@define-color theme_text_color @text_color; -@define-color theme_selected_bg_color @selected_bg_color; -@define-color theme_selected_fg_color @selected_fg_color; -@define-color theme_tooltip_bg_color @tooltip_bg_color; -@define-color theme_tooltip_fg_color @tooltip_fg_color; - -/* shadow effects */ -@define-color light_shadow #fff; -@define-color dark_shadow #000; - -/* misc colors used by gtk+ */ -@define-color info_fg_color rgb (58, 135, 173); -@define-color info_bg_color rgb (217, 237, 247); -@define-color warning_fg_color rgb (192, 152, 83); -@define-color warning_bg_color rgb (252, 248, 227); -@define-color question_fg_color rgb (214, 73, 55); -@define-color question_bg_color rgb (252, 229, 213); -@define-color error_fg_color rgb (185, 74, 72); -@define-color error_bg_color rgb (242, 222, 222); -@define-color link_color #fc6f5d; -@define-color success_color #53a93f; -@define-color warning_color #f57900; -@define-color error_color #cc0000; - -/* widget colors */ -@define-color titlebar_bg_color @dark_bg_color; -@define-color titlebar_fg_color @dark_fg_color; -@define-color menubar_bg_color @dark_bg_color; -@define-color menubar_fg_color @dark_fg_color; -@define-color toolbar_bg_color @theme_bg_color; -@define-color toolbar_fg_color @theme_fg_color; -@define-color menu_bg_color @dark_bg_color; -@define-color menu_fg_color @dark_fg_color; -@define-color panel_bg_color @dark_bg_color; -@define-color panel_fg_color @dark_fg_color; - -/* osd */ -@define-color osd_base @dark_bg_color; -@define-color osd_fg @dark_fg_color; -@define-color osd_bg alpha(@osd_base, 0.8); - -/* lightdm greeter colors */ -@define-color lightdm_bg_color @dark_bg_color; -@define-color lightdm_fg_color @dark_fg_color; - -/* window manager colors */ -@define-color wm_bg @titlebar_bg_color; -@define-color wm_border_focused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21); -@define-color wm_border_unfocused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12); -@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); -@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); -@define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); -@define-color wm_icons_focused_prelight @selected_bg_color; -@define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8); -@define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); -@define-color wm_icons_unfocused_prelight @selected_bg_color; -@define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8); - -@import url("gtk-widgets.css"); -@import url("gtk-widgets-assets.css"); -@import url("apps/gnome-applications.css"); -@import url("apps/granite-widgets.css"); -@import url("apps/unity.css"); -@import url("apps/xfce.css"); -@import url("apps/nemo.css"); -@import url("apps/synaptic.css"); -@import url("apps/lightdm-gtk-greeter.css"); diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css deleted file mode 100644 index 6f878e1..0000000 --- a/gtk-3.0/gtk-widgets-assets.css +++ /dev/null @@ -1,379 +0,0 @@ -/******************* - * check and radio * - *******************/ -.check, -.check row:selected, -.check row:selected:focus { - background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -.check:insensitive, -.check row:selected:insensitive, -.check row:selected:focus:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -.check:active, -.check row:selected:active, -.check row:selected:focus:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -.check:active:insensitive, -.check row:selected:active:insensitive, -.check row:selected:focus:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, shade(@theme_base_color, 0.6) 30%, shade(@theme_base_color, 0.6) 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, shade(@theme_base_color, 0.6) 37%, shade(@theme_base_color, 0.6) 62%, transparent 62%, transparent), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -.check:inconsistent, -.check row:selected:inconsistent, -.check row:selected:focus:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 50% 12%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -.check:inconsistent:insensitive, -.check row:selected:inconsistent:insensitive, -.check row:selected:focus:inconsistent:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 50% 12%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -.radio, -.radio row:selected, -.radio row:selected:focus { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center; - background-size: 90% 90%, 100% 100%; - background-repeat: no-repeat; -} - -.radio:insensitive, -.radio row:selected:insensitive, -.radio row:selected:focus:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center; - background-size: 90% 90%, 100% 100%; - background-repeat: no-repeat; -} - -.radio:active, -.radio row:selected:active, -.radio row:selected:focus:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 40% 40%, 90% 90%, 100% 100%; - background-repeat: no-repeat; -} - -.radio:active:insensitive, -.radio row:selected:active:insensitive, -.radio row:selected:focus:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 40% 40%, 90% 90%, 100% 100%; - background-repeat: no-repeat; -} - -.radio:inconsistent, -.radio row:selected:inconsistent, -.radio row:selected:focus:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 50% 12%, 90% 90%, 100% 100%; - background-repeat: no-repeat; -} - -.radio:inconsistent:insensitive, -.radio row:selected:inconsistent:insensitive, -.radio row:selected:focus:inconsistent:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 50% 12%, 90% 90%, 100% 100%; - background-repeat: no-repeat; -} - -.menuitem.check:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; -} - -.menuitem.check:active:hover { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_fg_color 30%, @theme_selected_fg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_fg_color 37%, @theme_selected_fg_color 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; -} - -.menuitem.check:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, mix(@menu_fg_color, @menu_bg_color, 0.5) 30%, mix(@menu_fg_color, @menu_bg_color, 0.5) 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, mix(@menu_fg_color, @menu_bg_color, 0.5) 37%, mix(@menu_fg_color, @menu_bg_color, 0.5) 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; -} - -.menuitem.radio:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.radio:active:hover { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.radio:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.check:inconsistent, -.menuitem.radio:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color); - - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; -} - -.menuitem.check:inconsistent:hover, -.menuitem.radio:inconsistent:hover { - background-image: linear-gradient(to bottom, @theme_selected_fg_color, @theme_selected_fg_color); - - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; -} - -.menuitem.check:inconsistent:insensitive, -.menuitem.radio:inconsistent:insensitive { - background-image: linear-gradient(to bottom, mix(@menu_fg_color, @menu_bg_color, 0.5), mix(@menu_fg_color, @menu_bg_color, 0.5)); - - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; -} - -GtkIconView.content-view.cell.check { - background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -GtkIconView.content-view.cell.check:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; -} - -/****************** - * pane separator * - ******************/ -.pane-separator, -.pane-separator.horizontal { - background-image: linear-gradient(to bottom, - shade(@theme_bg_color, 0.8) 0%, - shade(@theme_bg_color, 0.8) 20%, - transparent 20%, - transparent 45%, - shade(@theme_bg_color, 0.8) 45%, - shade(@theme_bg_color, 0.8) 55%, - transparent 55%, - transparent 80%, - shade(@theme_bg_color, 0.8) 80%, - shade(@theme_bg_color, 0.8) - ); - - background-size: 4px 10px; - background-repeat: no-repeat; - background-position: center center; -} - -.pane-separator.vertical { - background-image: linear-gradient(to right, - shade(@theme_bg_color, 0.8) 0%, - shade(@theme_bg_color, 0.8) 20%, - transparent 20%, - transparent 45%, - shade(@theme_bg_color, 0.8) 45%, - shade(@theme_bg_color, 0.8) 55%, - transparent 55%, - transparent 80%, - shade(@theme_bg_color, 0.8) 80%, - shade(@theme_bg_color, 0.8) - ); - - background-size: 10px 4px; - background-repeat: no-repeat; - background-position: center center; -} diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css deleted file mode 100644 index 061ef57..0000000 --- a/gtk-3.0/gtk-widgets.css +++ /dev/null @@ -1,3682 +0,0 @@ -/* NOTES to contributors: - * use 4 spaces indents, and keep code ALIGNED and ORDERED */ - -/* default */ -* { - -GtkArrow-arrow-scaling: 0.5; - -GtkButton-child-displacement-x: 0; - -GtkButton-child-displacement-y: 0; - -GtkButton-default-border: 0; - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 1; - -GtkButton-interior-focus: true; - -GtkButtonBox-child-min-height: 24; - -GtkButtonBox-child-internal-pad-y: 1; - -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 14; - -GtkExpander-expander-size: 8; - -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; - -GtkPaned-handle-size: 4; - -GtkProgressBar-min-horizontal-bar-height: 12; - -GtkProgressBar-min-vertical-bar-width: 12; - -GtkRange-slider-width: 12; - -GtkRange-stepper-spacing: 0; - -GtkRange-trough-border: 0; - -GtkRange-trough-under-steppers: 1; - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - -GtkScrollbar-min-slider-length: 80; - -GtkScrolledWindow-scrollbar-spacing: 0; - -GtkScrolledWindow-scrollbars-within-bevel: 1; - -GtkStatusbar-shadow-type: none; - -GtkTextView-error-underline-color: @error_color; - -GtkToolButton-icon-spacing: 6; - -GtkToolItemGroup-expander-size: 8; - -GtkTreeView-expander-size: 8; - -GtkWindow-resize-grip-height: 0; - -GtkWindow-resize-grip-width: 0; - -WnckTasklist-fade-overlay-rect: 0; - - /* legacy only */ - -GtkWidget-focus-line-width: 1; - -GtkWidget-focus-padding: 0; - - background-clip: padding-box; - - /* - outline-color: alpha(@theme_selected_bg_color, 0.5); - outline-style: dashed; - outline-width: 1px; - outline-offset: -2px; - outline-radius: 2px; - */ -} - -/*************** - * base states * - ***************/ -.background { - background-color: @theme_bg_color; - color: @theme_fg_color; -} - -.background:backdrop { - text-shadow: none; - icon-shadow: none; -} - -*:selected, -*:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -*:insensitive, -*:insensitive:insensitive { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -/* apply effects to insensitive and prelit images */ -*:insensitive { - -gtk-image-effect: dim; -} - -*:hover { - -gtk-image-effect: highlight; -} - -.gtkstyle-fallback { - background-color: @theme_bg_color; - color: @theme_fg_color; -} - -.gtkstyle-fallback:prelight { - background-color: shade(@theme_bg_color, 1.1); - color: @theme_fg_color; -} - -.gtkstyle-fallback:active { - background-color: shade(@theme_bg_color, 0.9); - color: @theme_fg_color; -} - -.gtkstyle-fallback:insensitive { - background-color: shade(shade(@theme_bg_color, 0.95), 1.05); - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -.gtkstyle-fallback:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -GtkImage, -GtkImage:insensitive, -GtkLabel, -GtkLabel:insensitive, -GtkBox, -GtkBox:insensitive, -GtkGrid, -GtkGrid:insensitive { - background-color: transparent; -} - -/************** - * hyperlinks * - **************/ -* { - -GtkHTML-link-color: @link_color; - -GtkIMHtml-hyperlink-color: @link_color; - -GtkWidget-link-color: @link_color; - -GtkWidget-visited-link-color: @link_color; -} - -*:link, -*:visited { - color: @link_color; -} - -/****************** - * visual effects * - ******************/ -/* transitions */ -.button { - transition: border 100ms ease-in-out; -} - -.entry { - transition: border 100ms ease-out; -} - -.entry:focus { - transition: border 100ms ease-in; -} - -.entry.image.left { - padding-right: 4px; -} - -.notebook tab GtkLabel, -.notebook .prelight-page, -.notebook .prelight-page GtkLabel, -.notebook .active-page, -.notebook .active-page GtkLabel { - transition: all 200ms ease-in; -} - -/* inset shadows */ -.button:active, -.primary-toolbar .button:active, -.toolbar .button:active, -.header-bar .button:active, -.notebook.header { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -.entry { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.10), - inset 0 1px alpha(@dark_shadow, 0.12), - inset -1px 0 alpha(@dark_shadow, 0.10), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -/* disable inset shadow */ -.button:active *:insensitive, -.primary-toolbar .button:active *:insensitive, -.toolbar .button:active *:insensitive, -.header-bar .button:active *:insensitive, -.entry:insensitive { - box-shadow: none; -} - -/************* - * assistant * - *************/ -GtkAssistant .sidebar .highlight { - font: bold; -} - -GtkAssistant .sidebar { - padding: 4px; - border-width: 0 1px 0 0; - border-style: solid; - border-right-color: shade(@theme_bg_color, 0.8); - border-radius: 0; - background-color: @theme_bg_color; - color: mix(@theme_fg_color, @theme_bg_color, 0.1); -} - -/********** - * button * - **********/ -.button { - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; - - padding: 3px; - border-width: 1px; - border-radius: 2px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 1.08); - background-image: none; - color: @theme_fg_color; -} - -.button:hover { - border-color: shade(@theme_bg_color, 0.7); - background-color: shade(@theme_bg_color, 1.10); - background-image: none; -} - -.button:active { - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 0.95); - background-image: none; -} - -.button:active:hover { - border-color: shade(@theme_bg_color, 0.7); -} - -.button:focus, -.button:hover:focus, -.button:active:focus, -.button:active:hover:focus { - border-color: shade(@theme_bg_color, 0.7); -} - -.button:insensitive { - border-color: shade(@theme_bg_color, 0.85); - background-color: shade(@theme_bg_color, 0.9); - background-image: none; -} - -.button:active *:insensitive { - border-color: shade(@theme_bg_color, 0.75); - background-color: shade(@theme_bg_color, 0.80); - background-image: none; -} - -/* default button */ -.button.default { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 1.08); - color: @theme_selected_fg_color; -} - -.button.default:hover { - border-color: shade(@theme_selected_bg_color, 0.7); - background-color: @theme_selected_bg_color; -} - -.button.default:active { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 0.95); -} - -.button.default:active:hover { - border-color: shade(@theme_selected_bg_color, 0.7); - background-color: shade(@theme_selected_bg_color, 0.97); -} - -/**************** - * cell and row * - ****************/ -.cell { - border-width: 0; - border-radius: 0; -} - -.cell:selected, -.cell:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -row:selected, -row:selected:hover, -row:selected:focus { - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; - - border-width: 1px 0; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -/******************* - * check and radio * - *******************/ -.check, -.radio, -.check:insensitive, -.radio:insensitive { - border-style: none; - background-color: transparent; -} - -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { - background-color: transparent; -} - -GtkCheckButton { - outline-offset: 0; - padding: 3px; -} - -/***************** - * column-header * - *****************/ -column-header .button, -column-header .button:active { - border-width: 0 1px 1px 0; - border-radius: 0; -} - -column-header .button, -column-header .button:active, -column-header .button:focus, -column-header .button:active:focus { - border-color: shade(@theme_base_color, 0.9); - border-bottom-color: shade(@theme_base_color, 0.8); - background-color: shade(@theme_base_color, 0.97); - background-image: none; -} - -column-header .button:hover, -column-header .button:active:hover, -column-header .button:hover:focus, -column-header .button:active:hover:focus { - border-color: shade(@theme_base_color, 0.9); - border-bottom-color: shade(@theme_base_color, 0.8); - background-color: shade(@theme_base_color, 0.99); - background-image: none; -} - -column-header:last-child .button { - border-width: 0 0 1px 0; -} - -/**************** - * content view * - ****************/ -.content-view.subtitle { - font: smaller; - padding: 0 12px; -} - -.content-view.view { - background-color: @theme_base_color; -} - -.content-view.view:prelight { - background-color: alpha(@theme_selected_bg_color, 0.6); -} - -.content-view.view:selected, -.content-view.view:active { - background-color: @theme_selected_bg_color; -} - -.content-view.view:insensitive { - background-color: shade(@theme_base_color, 0.9); -} - -GdMainIconView.content-view { - -GdMainIconView-icon-size: 40; -} - -GtkIconView.content-view.check { - background-color: transparent; -} - -GtkIconView.content-view.check:active { - background-color: transparent; -} - -.content-view.view.check, -.content-view.view.check:active { - background-color: transparent; -} - -GtkIconView.content-view.check:prelight, -GtkIconView.content-view.check:insensitive, -GtkIconView.content-view.check:selected { - background-color: transparent; -} - -/**************** - * drawing area * - ****************/ -GtkDrawingArea { - background-color: @theme_base_color; -} - -GtkDrawingArea:insensitive { - background-color: shade(@theme_base_color, 0.9); -} - -/*********** - * gtkhtml * - ***********/ -GtkHTML { - background-color: @theme_base_color; - color: @theme_text_color; -} - -/*********** -* calendar * -************/ -GtkCalendar { - padding: 4px; - outline-offset: -1px; -} - -GtkCalendar:inconsistent { - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -GtkCalendar.view, -GtkCalendar.header, -GtkCalendar.button, -GtkCalendar.button:hover, -GtkCalendar.button:insensitive { - border-width: 0; - background-color: transparent; - background-image: none; -} - -.highlight, -GtkCalendar.highlight { - border-width: 0; - background-color: transparent; - color: @theme_selected_bg_color; -} - -/****************** - * combobox entry * - ******************/ -.primary-toolbar GtkComboBox.combobox-entry .entry, -.primary-toolbar GtkComboBox.combobox-entry .entry:active, -.primary-toolbar GtkComboBox.combobox-entry .entry:focus, -.primary-toolbar GtkComboBox.combobox-entry .entry:insensitive, -GtkComboBox.combobox-entry .entry, -GtkComboBox.combobox-entry .entry:active, -GtkComboBox.combobox-entry .entry:focus, -GtkComboBox.combobox-entry .entry:insensitive { - border-width: 1px 0 1px 1px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button:hover, -.primary-toolbar GtkComboBox.combobox-entry .button:active, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, -GtkComboBox.combobox-entry .button, -GtkComboBox.combobox-entry .button:hover, -GtkComboBox.combobox-entry .button:active, -GtkComboBox.combobox-entry .button:insensitive { - border-width: 1px 1px 1px 1px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -/********* - * entry * - *********/ -.entry { - padding: 4px 3px; - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 2px; - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -.entry:active, -.entry:focus { - border-color: shade(@theme_bg_color, 0.7); -} - -.entry:selected, -.entry:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -.entry:insensitive { - background-color: shade(@theme_bg_color, 0.95); - background-image: none; - color: mix(@theme_text_color, @theme_base_color, 0.5); -} - -.entry.progressbar { - border-width: 0; - border-radius: 2px; - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -/************ - * expander * -************/ -GtkExpander { - padding: 3px; - outline-offset: 1px; -} - -.expander { - color: alpha(currentColor, 0.7); - border: alpha(currentColor, 0.7); -} - -.expander:hover { - color: alpha(currentColor, 0.8); - border-color: alpha(currentColor, 0.8); -} - -.expander:active { - color: alpha(currentColor, 0.9); - border-color: alpha(currentColor, 0.9); -} - -/************** - * list boxes * - **************/ -.list { - background-color: shade(@theme_bg_color, 0.97); - color: @theme_fg_color; -} - -.list-row { - padding: 3px; -} - -.list-row:hover { - background-color: shade(@theme_bg_color, 1.02); -} - -.list-row:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -/************** -* flow boxes * -**************/ - -.grid-child { - padding: 3px; -} - -/********* - * frame * - *********/ -.frame { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; -} - -/******************* - * scrolled window * - *******************/ -GtkScrolledWindow.frame { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; -} - -/* avoid double borders when a viewport is - * packed into a GtkScrolledWindow */ -GtkScrolledWindow GtkViewport.frame { - border-style: none; -} - -/************ - * iconview * - ************/ -GtkIconView.view.cell:selected, -GtkIconView.view.cell:selected:focus { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); - border-radius: 2px; - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -.content-view.view.rubberband, -.view.rubberband, -.rubberband { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); - border-radius: 0; - background-color: alpha(@theme_selected_bg_color, 0.3); -} - -/*********** - * infobar * - ***********/ -GtkInfoBar { - border-width: 0; - border-style: none; -} - -.info { - border-width: 1px; - border-style: solid; - border-color: shade(@info_bg_color, 0.8); - background-color: @info_bg_color; - background-image: none; - color: @info_fg_color; -} - -.info .button { - border-top-color: shade(@info_bg_color, 0.8); - border-right-color: shade(@info_bg_color, 0.72); - border-left-color: shade(@info_bg_color, 0.72); - border-bottom-color: shade(@info_bg_color, 0.7); - background-color: shade(@info_bg_color, 1.08); - color: @info_fg_color; -} - -.info .button:hover { - border-top-color: shade(@info_bg_color, 0.85); - border-right-color: shade(@info_bg_color, 0.78); - border-left-color: shade(@info_bg_color, 0.78); - border-bottom-color: shade(@info_bg_color, 0.7); - background-color: shade(@info_bg_color, 1.10); -} - -.info .button:active { - border-color: shade(@info_bg_color, 0.6); - background-color: shade(@info_bg_color, 0.95); -} - -.info .button:active:hover { - border-top-color: shade(@info_bg_color, 0.85); - border-right-color: shade(@info_bg_color, 0.78); - border-left-color: shade(@info_bg_color, 0.78); - border-bottom-color: shade(@info_bg_color, 0.7); -} - -.info .button.close { - color: @info_fg_color; -} - -.info .button.close:hover { - background-color: alpha(white, 0.2); -} - -.info .button.close:active { - color: @info_fg_color; - background-color: alpha(black, 0.1); -} - -.warning { - border-width: 1px; - border-style: solid; - border-color: shade(@warning_bg_color, 0.8); - background-color: @warning_bg_color; - background-image: none; - color: @warning_fg_color; -} - -.warning .button { - border-top-color: shade(@warning_bg_color, 0.8); - border-right-color: shade(@warning_bg_color, 0.72); - border-left-color: shade(@warning_bg_color, 0.72); - border-bottom-color: shade(@warning_bg_color, 0.7); - background-color: shade(@warning_bg_color, 1.08); - color: @warning_fg_color; -} - -.warning .button:hover { - border-top-color: shade(@warning_bg_color, 0.85); - border-right-color: shade(@warning_bg_color, 0.78); - border-left-color: shade(@warning_bg_color, 0.78); - border-bottom-color: shade(@warning_bg_color, 0.7); - background-color: shade(@warning_bg_color, 1.10); -} - -.warning .button:active { - border-color: shade(@warning_bg_color, 0.6); - background-color: shade(@warning_bg_color, 0.95); -} - -.warning .button:active:hover { - border-top-color: shade(@warning_bg_color, 0.85); - border-right-color: shade(@warning_bg_color, 0.78); - border-left-color: shade(@warning_bg_color, 0.78); - border-bottom-color: shade(@warning_bg_color, 0.7); -} - -.warning .button.close { - color: @warning_fg_color; -} - -.warning .button.close:hover { - background-color: alpha(white, 0.2); -} - -.warning .button.close:active { - color: @warning_fg_color; - background-color: alpha(black, 0.1); -} - -.question { - border-width: 1px; - border-style: solid; - border-color: shade(@question_bg_color, 0.8); - background-color: @question_bg_color; - background-image: none; - color: @question_fg_color; -} - -.question .button { - border-top-color: shade(@question_bg_color, 0.8); - border-right-color: shade(@question_bg_color, 0.72); - border-left-color: shade(@question_bg_color, 0.72); - border-bottom-color: shade(@question_bg_color, 0.7); - background-color: shade(@question_bg_color, 1.08); - color: @question_fg_color; -} - -.question .button:hover { - border-top-color: shade(@question_bg_color, 0.85); - border-right-color: shade(@question_bg_color, 0.78); - border-left-color: shade(@question_bg_color, 0.78); - border-bottom-color: shade(@question_bg_color, 0.7); - background-color: shade(@question_bg_color, 1.10); -} - -.question .button:active { - border-color: shade(@question_bg_color, 0.6); - background-color: shade(@question_bg_color, 0.95); -} - -.question .button:active:hover { - border-top-color: shade(@question_bg_color, 0.85); - border-right-color: shade(@question_bg_color, 0.78); - border-left-color: shade(@question_bg_color, 0.78); - border-bottom-color: shade(@question_bg_color, 0.7); -} - -.question .button.close { - color: @question_fg_color; -} - -.question .button.close:hover { - background-color: alpha(white, 0.2); -} - -.question .button.close:active { - color: @question_fg_color; - background-color: alpha(black, 0.1); -} - -.error { - border-width: 1px; - border-style: solid; - border-color: shade(@error_bg_color, 0.8); - background-color: @error_bg_color; - background-image: none; - color: @error_fg_color; -} - -.error .button { - border-top-color: shade(@error_bg_color, 0.8); - border-right-color: shade(@error_bg_color, 0.72); - border-left-color: shade(@error_bg_color, 0.72); - border-bottom-color: shade(@error_bg_color, 0.7); - background-color: shade(@error_bg_color, 1.08); - color: @error_fg_color; -} - -.error .button:hover { - border-top-color: shade(@error_bg_color, 0.85); - border-right-color: shade(@error_bg_color, 0.78); - border-left-color: shade(@error_bg_color, 0.78); - border-bottom-color: shade(@error_bg_color, 0.7); - background-color: shade(@error_bg_color, 1.10); -} - -.error .button:active { - border-color: shade(@error_bg_color, 0.6); - background-color: shade(@error_bg_color, 0.95); -} - -.error .button:active:hover { - border-top-color: shade(@error_bg_color, 0.85); - border-right-color: shade(@error_bg_color, 0.78); - border-left-color: shade(@error_bg_color, 0.78); - border-bottom-color: shade(@error_bg_color, 0.7); -} - -.error .button.close { - color: @error_fg_color; -} - -.error .button.close:hover { - background-color: alpha(white, 0.2); -} - -.error .button.close:active { - color: @error_fg_color; - background-color: alpha(black, 0.1); -} - -/******************* - * symbolic images * - *******************/ -.image { - color: alpha(currentColor, 0.5); -} - -.image:hover { - color: alpha(currentColor, 0.9); -} - -.image:selected, -.image:selected:hover { - color: @theme_selected_fg_color; -} - -.view.image, -.view.image:hover { - color: alpha(currentColor, 0.9); -} - -.view.image:selected, -.view.image:selected:hover { - color: @theme_selected_fg_color; -} - -/***************** - * miscellaneous * - *****************/ -.floating-bar { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 2px; - background-color: @theme_bg_color; - background-image: none; - color: @theme_fg_color; -} - -.floating-bar.top { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.floating-bar.right { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.floating-bar.bottom { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.floating-bar.left { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.floating-bar .button { - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; - - border-style: none; - background-color: transparent; - background-image: none; -} - -.view.dim-label, -.dim-label { - color: alpha(currentColor, 0.5); -} - -.dnd { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); -} - -.grip { - background-color: transparent; -} - -.arrow { - color: alpha(currentColor, 0.7); -} - -/******** - * menu * - ********/ -GtkTreeMenu.menu, -GtkMenuToolButton.menu, -GtkComboBox .menu { - background-color: @menu_bg_color; - margin: 3px; -} - -.primary-toolbar .menu, -.primary-toolbar .button .menu, -.toolbar .menu, -.toolbar .primary-toolbar .menu, -.header-bar .menu, -.header-bar .primary-toolbar .menu, -.menu { - padding: 0; - border-radius: 0; - border-style: none; - background-color: @menu_bg_color; - color: @menu_fg_color; -} - -/* Hover-effect on play-button in ubuntu soundmenu */ -.menu:selected { - background-color: @selected_bg_color; -} - -.menu.button:hover, -.menu.button:active, -.menu.button:active *:insensitive, -.menu.button:insensitive, -.menu.button { - border-width: 0; - background-color: @menu_bg_color; - background-image: none; -} - -.context-menu { - font: initial; -} - -/* ubuntu software center menu */ -#toolbar-popup { - background-color: @menu_bg_color; - color: @menu_fg_color; -} - -/*********** - * menubar * - ***********/ -.menubar { - -GtkWidget-window-dragging: true; - - border-style: none; - background-color: @menubar_bg_color; - background-image: none; - color: @menubar_fg_color; -} - -/*************** - * menubaritem * - ***************/ -.menubar.menuitem, -.menubar .menuitem { - padding: 3px 5px; - border-width: 1px; - border-style: solid; - border-color: transparent; - background-color: transparent; - background-image: none; - color: @menubar_fg_color; -} - -.menubar.menuitem:hover, -.menubar .menuitem:hover { - border-color: mix(@menubar_bg_color, @menubar_fg_color, 0.21); - background-color: mix(@menubar_bg_color, @menubar_fg_color, 0.21); - background-image: none; - color: shade(@menubar_fg_color, 1.08); -} - -.menubar .menuitem *:hover { - color: shade(@menubar_fg_color, 1.08); -} - -/************ - * menuitem * - ************/ -GtkTreeMenu .menuitem { - padding: 0; - border-width: 0; -} - -.menuitem, -.menu .menuitem { - -GtkMenuItem-arrow-scaling: 0.5; - - padding: 3px; - border-width: 1px; - border-style: solid; - border-color: transparent; - border-radius: 0; - background-color: transparent; - background-image: none; - color: @menu_fg_color; -} - -.menu .menuitem:active, -.menu .menuitem:hover { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; -} - -.menu .menuitem:active, -.menu .menuitem *:active, -.menu .menuitem:hover, -.menu .menuitem *:hover { - color: @theme_selected_fg_color; -} - -.menu .menuitem:insensitive, -.menu .menuitem *:insensitive { - color: mix(@menu_fg_color, @menu_bg_color, 0.5); -} - -.menuitem.check, -.menuitem.radio, -.menuitem.check:hover, -.menuitem.radio:hover, -.menuitem.check:insensitive, -.menuitem.radio:insensitive { - border-style: none; - background-color: transparent; - background-image: none; -} - -.menuitem.check:active, -.menuitem.radio:active { - border-style: none; - background-color: transparent; -} - -.menuitem GtkCalendar:inconsistent { - color: mix(@menu_fg_color, @menu_bg_color, 0.5); -} - -.menuitem GtkCalendar.button { - border-style: none; - background-color: transparent; - background-image: none; -} - -.menuitem .entry { - border-color: shade(@menu_bg_color, 0.7); - background-color: @menu_bg_color; - background-image: none; - color: @menu_fg_color; -} - -.menuitem .entry:active, -.menuitem .entry:focus { - border-color: shade(@menu_bg_color, 0.7); -} - -.menuitem .accelerator { - color: alpha(@menu_fg_color, 0.6); -} - -.menuitem .accelerator:hover { - color: alpha(@theme_selected_fg_color, 0.8); -} - -.menuitem .accelerator:insensitive { - color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6); -} - -GtkModelMenuItem GtkBox GtkImage { - padding-right: 4px; -} - -/************ - * popovers * - ************/ -GtkPopover { - margin: 10px; - padding: 2px; - border-radius: 2px; - border-color: shade(@theme_bg_color, 0.8); - border-width: 1px; - border-style: solid; - background-clip: border-box; - background-color: @theme_bg_color; - color: @theme_fg_color; - box-shadow: 0 2px 3px alpha(black, 0.5); -} - -GtkPopover:backdrop { - box-shadow: none; -} - -GtkPopover.osd { - box-shadow: 0 2px 7px 3px alpha(black, 0.5); -} - -GtkPopover > .list, -GtkPopover > .view, -GtkPopover > .toolbar { - background-color: transparent; -} - -GtkPopover.osd > .toolbar .button { - border-radius: 0; - border-width: 0; - background-image: none; - background-color: transparent; -} - -GtkPopover .separator { - border: 0; - background-color: transparent; - color: alpha(currentColor, 0.5); - font-size: 80%; - font-weight: bold; -} - -.menuitem.button { - color: @theme_fg_color; -} - -.menuitem.button, -.menuitem.button:active, -.menuitem.button:insensitive, -.menuitem.button:active:insensitive { - background-color: transparent; - background-image: none; - border-color: transparent; - border-style: none; - box-shadow: none; - color: @theme_fg_color; -} - -.menuitem.button:active:hover, -.menuitem.button:hover, -.menuitem.button:selected { - border-width: 0; - border-color: transparent; - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -/************ - * notebook * - ************/ -.notebook { - padding: 0; - border-width: 1px 0 0 0; - border-style: solid; - border-color: shade(@theme_base_color, 0.7); - border-radius: 0; - background-color: @theme_base_color; - background-image: none; - background-clip: border-box; - - -GtkNotebook-initial-gap: 10; - -GtkNotebook-arrow-spacing: 5; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 1; - -GtkNotebook-has-tab-gap: false; -} - -.notebook.frame { - border-width: 1px; -} - -.notebook.header { - border-width: 0; - background-color: shade(@theme_base_color, 0.85); -} - -.notebook.header.frame { - border-color: shade(@theme_base_color, 0.75); -} - -.notebook.header.frame.top { - border-width: 1px 1px 0 1px; -} - -.notebook.header.frame.right { - border-width: 1px 1px 1px 0; -} - -.notebook.header.frame.bottom { - border-width: 0 1px 1px 1px; -} - -.notebook.header.frame.left { - border-width: 1px 0 1px 1px; -} - -.notebook GtkViewport { - border-width: 0; - background-color: @theme_base_color; - color: @theme_text_color; -} - -.notebook tab { - padding: 4px 6px; - border-style: solid; - border-width: 1px; - border-color: transparent; - background-color: transparent; - background-image: none; -} - -.notebook tab:active { - background-color: transparent; - background-image: none; -} - -.notebook tab.top { - border-bottom-width: 2px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.notebook tab.top:hover { - border-bottom-color: alpha(@theme_selected_bg_color, 0.3); -} - -.notebook tab.top:active { - border-bottom-color: @theme_selected_bg_color; -} - -.notebook tab.right { - border-left-width: 2px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.notebook tab.right:hover { - border-left-color: alpha(@theme_selected_bg_color, 0.3); -} - -.notebook tab.right:active { - border-left-color: @theme_selected_bg_color; -} - -.notebook tab.bottom { - border-top-width: 2px; - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.notebook tab.bottom:hover { - border-top-color: alpha(@theme_selected_bg_color, 0.3); -} - -.notebook tab.bottom:active { - border-top-color: @theme_selected_bg_color; -} - -.notebook tab.left { - border-right-width: 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.notebook tab.left:hover { - border-right-color: alpha(@theme_selected_bg_color, 0.3); -} - -.notebook tab.left:active { - border-right-color: @theme_selected_bg_color; -} - -.notebook tab GtkLabel { - color: mix(@theme_text_color, @theme_base_color, 0.3); -} - -.notebook .prelight-page, -.notebook .prelight-page GtkLabel { - color: mix (@theme_text_color, @theme_base_color, 0.15); -} - -.notebook .active-page, -.notebook .active-page GtkLabel { - color: @theme_text_color; -} - -.notebook tab.reorderable-page:hover { - background-color: shade(@theme_base_color, 0.85); - border-left: 0; - border-right: 0; - /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade(@theme_base_color, 0.7), inset -1px 0 shade(@theme_base_color, 0.7); -} - -.notebook tab.reorderable-page:active { - background-color: shade(@theme_base_color, 0.90); - border-left: 0; - border-right: 0; - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade(@theme_base_color, 0.75), inset -1px 0 shade(@theme_base_color, 0.75); -} - -/* close button styling */ -.notebook tab .button, -.notebook tab .button:active, -.notebook tab .button:hover { - padding: 1px; - border-width: 1px; - border-radius: 2px; - border-style: solid; - border-color: transparent; - background-image: none; - background-color: transparent; - color: mix(@theme_text_color, @theme_base_color, 0.5); -} - -.notebook tab .button:hover { - color: @theme_text_color; - border-color: shade(@theme_base_color, 0.8); -} - -.notebook tab .button:active, -.notebook tab .button:active:hover { - border-color: shade(@theme_base_color, 0.7); - background-color: shade(@theme_base_color, 0.95); -} - -/****************** - * pane separator * - ******************/ -.pane-separator { - background-color: @theme_bg_color; - color: transparent; -} - -/************************* - * progressbar and scale * - *************************/ -GtkProgressBar { - padding: 0; - border-width: 1px; - border-radius: 2px; - font-size: smaller; - color: alpha(@theme_fg_color, 0.6); -} - -.progressbar, -.progressbar row, -.progressbar row:hover, -.progressbar row:selected, -.progressbar row:selected:focus { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: linear-gradient(to bottom, - @theme_selected_bg_color, - @theme_selected_bg_color - ); -} - -.progressbar.vertical { - background-color: @theme_selected_bg_color; - background-image: linear-gradient(to right, - @theme_selected_bg_color, - @theme_selected_bg_color - ); -} - -.trough, -.trough row, -.trough row:hover, -.trough row:selected, -.trough row:selected:focus { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 1.08); - background-image: none; -} - -.trough.vertical { - background-color: shade(@theme_bg_color, 1.08); - background-image: none; -} - -/* level bars as used for password quality or remaining power */ -GtkLevelBar { - -GtkLevelBar-min-block-width: 34; - -GtkLevelBar-min-block-height: 2; -} - -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 2; - -GtkLevelBar-min-block-height: 34; -} - -.level-bar.trough { - padding: 1px; - border-radius: 2px; -} - -.level-bar.fill-block { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; -} - -.level-bar.indicator-continuous.fill-block { - padding: 1px; - border-radius: 2px; -} - -.level-bar.indicator-discrete.fill-block.horizontal { - margin: 0 1px; -} - -.level-bar.indicator-discrete.fill-block.vertical { - margin: 1px 0; -} - -/* discrete indicator border rounding, - uncomment when :nth-child will be working - on the widget - -.level-bar.indicator-discrete.fill-block.horizontal:first-child { - border-radius: 2px 0 0 2px; -} - -.level-bar.indicator-discrete.fill-block.horizontal:last-child { - border-radius: 0 2px 2px 0; -} - -.level-bar.indicator-discrete.fill-block.vertical:first-child { - border-radius: 2px 2px 0 0; -} - -.level-bar.indicator-discrete.fill-block.vertical:last-child { - border-radius: 0 0 2px 2px; -} -*/ - -.level-bar.fill-block.level-high { - border-color: shade(@success_color, 0.85); - background-image: linear-gradient(to bottom, - shade(@success_color, 1.2), - @success_color 75%, - shade(@success_color, 0.95) - ); -} - -.level-bar.fill-block.level-low { - border-color: shade(@warning_color, 0.80); - background-image: linear-gradient(to bottom, - shade(@warning_color, 1.3), - @warning_color 75%, - shade(@warning_color, 0.9) - ); -} - -.level-bar.fill-block.empty-fill-block { - border-color: alpha(@theme_fg_color, 0.1); - background-color: transparent; - background-image: none; -} - -.scale { - -GtkRange-slider-width: 16; - -GtkRange-trough-border: 1; - -GtkScale-slider-length: 16; - - padding: 0; - border-width: 1px; - border-radius: 2px; - outline-offset: -1px; -} - -.scale.slider { - border-radius: 8px; - background-color: shade(@theme_bg_color, 1.08); - background-image: none; - /* we will draw the border using box shadow for now */ - box-shadow: inset 1px 0 shade(@theme_bg_color, 0.8), - inset 0 1px shade(@theme_bg_color, 0.8), - inset -1px 0 shade(@theme_bg_color, 0.8), - inset 0 -1px shade(@theme_bg_color, 0.8); -} - -.scale.slider:hover { - box-shadow: inset 1px 0 shade(@theme_bg_color, 0.7), - inset 0 1px shade(@theme_bg_color, 0.7), - inset -1px 0 shade(@theme_bg_color, 0.7), - inset 0 -1px shade(@theme_bg_color, 0.7); -} - -.scale.slider:insensitive { - background-color: shade(@theme_bg_color, 0.9); - background-image: none; - box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85), - inset 0 1px shade(@theme_bg_color, 0.85), - inset -1px 0 shade(@theme_bg_color, 0.85), - inset 0 -1px shade(@theme_bg_color, 0.85); -} - -.scale.slider.fine-tune:active, -.scale.slider.fine-tune:active:hover, -.scale.slider.fine-tune.horizontal:active, -.scale.slider.fine-tune.horizontal:active:hover { - background-size: 50%; - background-repeat: no-repeat; - background-position: center; -} - -.scale.mark { - border-color: shade(@theme_bg_color, 0.8); -} - -.scale.trough { - margin: 7px 0; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 2px; - background-color: shade(@theme_bg_color, 1.08); - background-image: none; -} - -.scale.trough.vertical { - margin: 0 7px; -} - -.menuitem .scale.highlight.left, -.scale.highlight.left { - border-color: @theme_selected_bg_color; - background-color: @theme_selected_bg_color; - background-image: none; -} - -.menuitem .scale.highlight.left:hover { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 0.8); -} - -.scale.highlight.bottom { - border-color: @theme_selected_bg_color; - background-color: @theme_selected_bg_color; - background-image: none; -} - -.scale.trough:insensitive, -.scale.highlight.left:insensitive { - border-color: shade(@theme_bg_color, 0.85); - background-color: shade(@theme_bg_color, 0.9); - background-image: none; -} - -/************* - * scrollbar * - *************/ -.scrollbar { - border-width: 1px; - border-style: solid; - padding: 0; -} - -.scrollbars-junction, -.scrollbar.trough { - border-width: 0; - border-radius: 0; - background-color: @theme_bg_color; - background-image: none; -} - -.scrollbar.button, -.scrollbar.button:active, -.scrollbar.button:active:hover { - border-width: 0; - border-radius: 0; - background-color: transparent; - background-image: none; - color: shade(@theme_bg_color, 0.6); -} - -.scrollbar.slider { - border-width: 1px; - border-color: mix(shade(@theme_bg_color, 0.87), @theme_fg_color, 0.21); - border-radius: 0; - background-color: mix(@theme_bg_color, @theme_fg_color, 0.21); -} - -.scrollbar.slider:hover, -.scrollbar.slider.vertical:hover { - border-color: mix(shade(@theme_bg_color, 0.87), @theme_fg_color, 0.31); - background-color: mix(@theme_bg_color, @theme_fg_color, 0.31); -} - -.scrollbar.slider:active, -.scrollbar.slider.vertical:active { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; -} - -.scrollbar.slider.fine-tune:prelight:active { - border-width: 2px; - border-color: transparent; -} - -/* overlay scrollbar */ -OsThumb { - color: shade(@theme_bg_color, 0.7); -} - -OsThumb:selected, -OsScrollbar:selected { - background-color: @theme_selected_bg_color; -} - -OsThumb:active, -OsScrollbar:active { - background-color: @theme_selected_bg_color; -} - -OsThumb:insensitive, -OsScrollbar:insensitive { - background-color: shade(@theme_bg_color, 0.9); -} - -/************* - * separator * - *************/ -.sidebar.view.separator, -.view.separator, -.separator { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.9); - color: shade(@theme_bg_color, 0.9); -} - -.button .separator, -.button.separator { - border-color: shade(@theme_bg_color, 0.95); -} - -.button .separator:insensitive, -.button.separator:insensitive { - border-color: shade(@theme_bg_color, 0.85); -} - -.primary-toolbar GtkSeparatorToolItem, -.primary-toolbar .separator, -.primary-toolbar .separator:insensitive, -.toolbar GtkSeparatorToolItem, -.toolbar .separator, -.toolbar .separator:insensitive { - -GtkWidget-window-dragging: true; - - border-color: shade(@toolbar_bg_color, 0.95); - color: shade(@toolbar_bg_color, 0.95); -} - -.header-bar GtkSeparatorToolItem, -.header-bar .separator, -.header-bar .separator:insensitive, -.titlebar GtkSeparatorToolItem, -.titlebar .separator, -.titlebar .separator:insensitive { - -GtkWidget-window-dragging: true; - - border-color: shade(@titlebar_bg_color, 0.95); - color: shade(@titlebar_bg_color, 0.95); -} - -.primary-toolbar .button .separator, -.primary-toolbar .button.separator, -.toolbar .button .separator, -.toolbar .button.separator { - border-color: shade(@toolbar_bg_color, 0.95); -} - -.header-bar .button .separator, -.header-bar .button.separator, -.titlebar .button .separator, -.titlebar .button.separator { - border-color: shade(@titlebar_bg_color, 0.95); -} - -.primary-toolbar .button .separator:insensitive, -.primary-toolbar .button.separator:insensitive, -.toolbar .button .separator:insensitive, -.toolbar .button.separator:insensitive { - border-color: shade(@toolbar_bg_color, 0.85); -} - -.header-bar .button .separator:insensitive, -.header-bar .button.separator:insensitive, -.titlebar .button .separator:insensitive, -.titlebar .button.separator:insensitive { - border-color: shade(@titlebar_bg_color, 0.85); -} - -.menuitem.separator { - -GtkMenuItem-horizontal-padding: 0; - -GtkWidget-separator-height: 1; - - border-style: none; - color: shade(@menu_bg_color, 0.9); -} - -GtkComboBox .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; - - border-style: none; -} - -/*********** - * sidebar * - ***********/ -.sidebar, -.sidebar.view, -.sidebar .view, -.sidebar GtkScrolledWindow { - background-color: @theme_bg_color; - color: mix(@theme_fg_color, @theme_bg_color, 0.1); -} - -.sidebar row:selected, -.sidebar row:selected:hover, -.sidebar row:selected:focus, -.sidebar .view row:selected, -.sidebar .view row:selected:hover, -.sidebar .view row:selected:focus { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -.sidebar row:prelight, -.sidebar .view row:prelight { - border-color: shade(@theme_bg_color, 1.05); - background-color: shade(@theme_bg_color, 1.05); - background-image: none; - color: @theme_fg_color; -} - -.sidebar row:selected:prelight, -.sidebar .view row:selected:prelight { - border-color: shade(@theme_selected_bg_color, 1.05); - background-color: shade(@theme_selected_bg_color, 1.05); - background-image: none; - color: @theme_selected_fg_color; -} - -.sidebar .frame { - border-width: 0; -} - -/************** - * spinbutton * - **************/ -.spinbutton .button { - color: mix(@theme_text_color, @theme_base_color, 0.4); - padding: 2px 4px; - border-width: 0; - border-radius: 0; - border-style: none; - background-color: transparent; - background-image: none; - box-shadow: inset 1px 0 shade(@theme_base_color, 0.9); -} - -.spinbutton .button:insensitive { - color: mix(@theme_text_color, @theme_base_color, 0.7); - box-shadow: inset 1px 0 shade(@theme_bg_color, 0.95); -} - -.spinbutton .button:active, -.spinbutton .button:hover { - color: @theme_fg_color; -} - -.spinbutton .button:first-child { - border-radius: 2px 0 0 2px; - box-shadow: none; -} - -.spinbutton .button:last-child { - border-radius: 0 2px 2px 0; -} - -.spinbutton .button:dir(rtl) { - box-shadow: inset -1px 0 shade(@theme_base_color, 0.9); -} - -.spinbutton.vertical .button { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 2px; - background-color: shade(@theme_bg_color, 1.08); - background-image: none; - color: @theme_fg_color; - box-shadow: none; -} - -.spinbutton.vertical .button:hover { - border-color: shade(@theme_bg_color, 0.7); - background-color: shade(@theme_bg_color, 1.10); - background-image: none; -} - -.spinbutton.vertical .button:active { - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 0.95); - background-image: none; -} - -.spinbutton.vertical .button:active:hover { - border-color: shade(@theme_bg_color, 0.7); -} - -.spinbutton.vertical .button:focus, -.spinbutton.vertical .button:hover:focus, -.spinbutton.vertical .button:active:focus, -.spinbutton.vertical .button:active:hover:focus { - border-color: shade(@theme_bg_color, 0.7); -} - -.spinbutton.vertical .button:insensitive { - border-color: shade(@theme_bg_color, 0.85); - background-color: shade(@theme_bg_color, 0.9); - background-image: none; -} - -.spinbutton.vertical .button:first-child { - border-width: 1px; - border-bottom-width: 0; - border-radius: 2px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.spinbutton.vertical .button:last-child { - border-width: 1px; - border-top-width: 0; - border-radius: 2px; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.spinbutton.vertical.entry { - border-width: 1px; - border-style: solid; - border-radius: 0; -} - -/*********** - * spinner * - ***********/ -@keyframes spinner { - 00.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } - - 10.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.90)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)); } - - 20.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.90)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)); } - - 30.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } - - 40.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.50)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)); } - - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(transparent), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.30)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)); } - - 60.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.10)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } - - 70.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.10)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)); } - - 80.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.30)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(transparent), to(transparent)); } - - 90.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.50)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)); } - - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } -} - -.spinner { - background-color: transparent; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); - - background-position: 0% 70%, 33% 70%, 70% 70%; - background-size: 30% 30%; - background-repeat: no-repeat; -} - -.spinner:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); - - animation: spinner 1s infinite linear; -} - -.menu.spinner, -.menu .spinner, -.menu .spinner:hover, -.primary-toolbar .spinner { - color: @theme_selected_bg_color; - border: none; - box-shadow: none; -} - -/************* - * statusbar * - *************/ -GtkStatusbar { - padding: 4px; - color: @theme_fg_color; -} - -/********** - * switch * - **********/ -GtkSwitch { - padding: 0; - border-radius: 2px; - font: bold condensed; - outline-offset: -4px; -} - -GtkSwitch.slider { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 1.08); - background-image: none; -} - -GtkSwitch.slider:insensitive { - border-color: shade(@theme_bg_color, 0.85); - background-color: shade(@theme_bg_color, 0.9); - background-image: none; -} - -GtkSwitch.trough { - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 0.95); - background-image: none; - color: @theme_fg_color; -} - -GtkSwitch.trough:active { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; - background-image: none; - color: @theme_selected_fg_color; -} - -GtkSwitch.trough:insensitive { - border-color: shade(@theme_bg_color, 0.85); - background-color: shade(@theme_bg_color, 0.9); - background-image: none; - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -/************ - * textview * - ************/ -GtkTextView { - background-color: @theme_base_color; - color: @theme_text_color; -} - -/***************** - * color chooser * - *****************/ -GtkColorSwatch, -GtkColorSwatch:selected { - border-width: 1px; - border-style: solid; - border-color: alpha(black, 0.1); - border-radius: 1px; - background-color: transparent; - background-clip: border-box; -} - -GtkColorSwatch:hover, -GtkColorSwatch:selected:hover { - border-color: alpha(black, 0.3); -} - -GtkColorSwatch.color-dark:hover { -} - -GtkColorSwatch.color-light:hover { -} - -GtkColorSwatch.color-light:selected:hover, -GtkColorSwatch.color-dark:selected:hover { - background-image: none; -} - -GtkColorSwatch.left, -GtkColorSwatch:first-child { - border-top-left-radius: 2px; - border-bottom-left-radius: 2px; -} - -GtkColorSwatch.right, -GtkColorSwatch:last-child { - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; -} - -GtkColorSwatch:only-child { - border-radius: 2px; -} - -GtkColorSwatch.top { - border-top-left-radius: 2px; - border-top-right-radius: 2px; -} - -GtkColorSwatch.bottom { - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; -} - -GtkColorChooserWidget #add-color-button { - background-clip: padding-box; - border-color: alpha(black, 0.1); - background-color: shade(@theme_bg_color, 0.95); - color: @theme_fg_color; -} - -GtkColorChooserWidget #add-color-button:hover { - border-color: alpha(black, 0.3); - background-color: shade(@theme_bg_color, 0.90); - color: @theme_fg_color; -} - -.color-active-badge, -.color-active-badge:selected { - border-width: 1px; - border-style: solid; - border-width: 2px; - background-color: transparent; -} - -.color-active-badge.color-light, -.color-active-badge.color-light:hover { - border-color: alpha(black, 0.3); - color: alpha(black, 0.3); -} - -.color-active-badge.color-dark, -.color-active-badge.color-dark:hover { - border-color: alpha(white, 0.3); - color: alpha(white, 0.3); -} - -GtkColorEditor GtkColorSwatch { - border-radius: 2px; -} - -GtkColorEditor GtkColorSwatch.color-dark:hover, -GtkColorEditor GtkColorSwatch.color-light:hover { - background-image: none; - border-color: alpha(black, 0.3); -} - -GtkColorButton.button { - padding: 2px; -} - -/************** - * header-bar * - **************/ -.header-bar { - padding: 4px; - border-width: 0 0 1px 0; - border-style: solid; - border-color: shade(@titlebar_bg_color, 0.8); - background-color: @titlebar_bg_color; - background-image: none; - color: @titlebar_fg_color; -} - -.header-bar .button.text-button { - padding: 4px; -} - -.header-bar .button.image-button { - padding: 6px; -} - -.header-bar .title { - font: bold; - padding: 0 12px; -} - -.header-bar .subtitle { - font: smaller; - padding: 0 12px; -} - -.header-bar GtkComboBox, -.header-bar .button { - border-color: shade(@titlebar_bg_color, 0.8); - background-color: shade(@titlebar_bg_color, 1.08); - background-image: none; - color: @titlebar_fg_color; -} - -.header-bar .button:hover { - border-color: shade(@titlebar_bg_color, 0.7); - background-color: shade(@titlebar_bg_color, 1.10); - background-image: none; -} - -.header-bar .button:active { - border-color: shade(@titlebar_bg_color, 0.8); - background-color: shade(@titlebar_bg_color, 0.95); - background-image: none; -} - -.header-bar .button:active:hover { - border-color: shade(@titlebar_bg_color, 0.7); -} - -.header-bar .button:focus, -.header-bar .button:hover:focus, -.header-bar .button:active:focus, -.header-bar .button:active:hover:focus { - border-color: shade(@titlebar_bg_color, 0.7); -} - -.header-bar .button:insensitive { - border-color: shade(@titlebar_bg_color, 0.85); - background-color: shade(@titlebar_bg_color, 0.9); - background-image: none; -} - -.header-bar .button:active *:insensitive { - border-color: shade(@titlebar_bg_color, 0.75); - background-color: shade(@titlebar_bg_color, 0.80); - background-image: none; -} - -.header-bar .entry { - border-color: shade(@titlebar_bg_color, 0.8); -} - -.header-bar .entry:active, -.header-bar .entry:focus { - border-color: shade(@titlebar_bg_color, 0.7); -} - -/*********** - * toolbar * - ***********/ -.toolbar { - padding: 4px; - border-style: none; - background-color: @toolbar_bg_color; - background-image: none; - color: @toolbar_fg_color; -} - -.toolbar .button { - padding: 2px; -} - -.toolbar .button.text-button { - padding: 2px 4px; -} - -.toolbar .button.image-button { - padding: 4px 3px 3px 4px; -} - -.toolbar:insensitive { - background-color: shade(@toolbar_bg_color, 0.9); - color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5); -} - -/* menubar toolbars */ -.toolbar.menubar { - -GtkToolbar-button-relief: normal; -} - -/******************* - * primary-toolbar * - *******************/ -.primary-toolbar, -.primary-toolbar .toolbar, -.primary-toolbar.toolbar { - -GtkWidget-window-dragging: true; - - padding: 4px; - border-width: 0 0 1px 0; - border-style: solid; - border-color: shade(@toolbar_bg_color, 0.8); - background-color: @toolbar_bg_color; - background-image: none; - color: @toolbar_fg_color; -} - -.primary-toolbar GtkComboBox, -.primary-toolbar .button { - padding: 2px; - border-width: 1px; - border-color: transparent; - border-radius: 2px; - background-color: transparent; - background-image: none; - color: @toolbar_fg_color; -} - -.primary-toolbar .raised .button, -.primary-toolbar .raised.button, -.toolbar GtkComboBox, -.toolbar .button { - border-color: shade(@toolbar_bg_color, 0.8); - background-color: shade(@toolbar_bg_color, 1.08); - background-image: none; - color: @toolbar_fg_color; -} - -.primary-toolbar .button:hover, -.toolbar .button:hover { - border-color: shade(@toolbar_bg_color, 0.7); - background-color: shade(@toolbar_bg_color, 1.10); - background-image: none; -} - -.primary-toolbar .button:active, -.toolbar .button:active { - border-color: shade(@toolbar_bg_color, 0.8); - background-color: shade(@toolbar_bg_color, 0.95); - background-image: none; -} - -.primary-toolbar .button:active:hover, -.toolbar .button:active:hover { - border-color: shade(@toolbar_bg_color, 0.7); -} - -.primary-toolbar .button:focus, -.primary-toolbar .button:hover:focus, -.primary-toolbar .button:active:focus, -.primary-toolbar .button:active:hover:focus, -.toolbar .button:focus, -.toolbar .button:hover:focus, -.toolbar .button:active:focus, -.toolbar .button:active:hover:focus { - border-color: shade(@toolbar_bg_color, 0.7); -} - -.primary-toolbar .button:insensitive, -.toolbar .button:insensitive { - border-color: shade(@toolbar_bg_color, 0.85); - background-color: shade(@toolbar_bg_color, 0.9); - background-image: none; -} - -.primary-toolbar .button:active *:insensitive, -.toolbar .button:active *:insensitive { - border-color: shade(@toolbar_bg_color, 0.75); - background-color: shade(@toolbar_bg_color, 0.80); - background-image: none; -} - -.primary-toolbar .entry, -.toolbar .entry { - border-color: shade(@toolbar_bg_color, 0.8); -} - -.primary-toolbar .entry:active, -.primary-toolbar .entry:focus, -.toolbar .entry:active, -.toolbar .entry:focus { - border-color: shade(@toolbar_bg_color, 0.7); -} - -/* inline-toolbar */ -.inline-toolbar.toolbar { - -GtkToolbar-button-relief: normal; - - padding: 1px; - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; - background-color: @theme_bg_color; - background-image: none; -} - -.inline-toolbar.toolbar:last-child { - border-width: 0 1px 1px 1px; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; -} - -.inline-toolbar.toolbar .button { - padding: 1px; - border-width: 1px 0 1px 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; - background-color: shade(@theme_bg_color, 1.08); - background-image: none; - color: @theme_fg_color; -} - -.inline-toolbar.toolbar .button:hover { - border-color: shade(@theme_bg_color, 0.7); - background-color: shade(@theme_bg_color, 1.10); - background-image: none; -} - -.inline-toolbar.toolbar .button:active { - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 0.95); - background-image: none; -} - -.inline-toolbar.toolbar .button:active:hover { - border-color: shade(@theme_bg_color, 0.7); -} - -.inline-toolbar.toolbar .button:focus, -.inline-toolbar.toolbar .button:hover:focus, -.inline-toolbar.toolbar .button:active:focus, -.inline-toolbar.toolbar .button:active:hover:focus { - border-color: shade(@theme_bg_color, 0.7); -} - -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { - border-color: shade(@theme_bg_color, 0.85); - background-color: shade(@theme_bg_color, 0.9); - background-image: none; -} - -.inline-toolbar.toolbar .button:active *:insensitive -.inline-toolbar.toolbar GtkToolButton .button:active *:insensitive { - border-color: shade(@theme_bg_color, 0.75); - background-color: shade(@theme_bg_color, 0.80); - background-image: none; -} - -/****************** - * linked buttons * - *****************/ -/* set up shadows for visual separation */ -.linked .button, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar GtkToolButton .button, -.inline-toolbar.toolbar GtkToolButton > .button { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9); -} - -.linked .button:active, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton > .button:active { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -.linked .button:insensitive, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button:insensitive, -.inline-toolbar.toolbar GtkToolButton > .button:insensitive { - box-shadow: inset -1px 0 shade(@theme_bg_color, 0.85); -} - -/* remove box shadow from last-child and only-child */ -.linked .button:last-child, -.linked .button:only-child, -.linked .button:insensitive:last-child, -.linked .button:insensitive:only-child, -.linked .button:active *:insensitive:last-child, -.linked .button:active *:insensitive:only-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar .button:active *:insensitive:last-child, -.inline-toolbar.toolbar .button:active *:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button, -.inline-toolbar.toolbar GtkToolButton:only-child > .button, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { - box-shadow: none; -} - -/* add back the inset shadow effect */ -.linked .button:active:last-child, -.linked .button:active:only-child, -.inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar .button:active:only-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07); -} - -/* middle button */ -.linked .entry, -.linked .button, -.linked .button:active, -.linked .button:active:hover, -.linked .button:insensitive, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button, -.inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton .button:insensitive { - border-width: 1px; - border-radius: 0; - border-right-width: 0; - border-left-width: 0; -} - -/*leftmost button */ -.linked .entry:first-child, -.linked .button:first-child, -.linked .button:active:first-child, -.linked .button:active:hover:first-child, -.linked .button:insensitive:first-child, -.inline-toolbar.toolbar .button:first-child, -.inline-toolbar.toolbar .button:active:first-child, -.inline-toolbar.toolbar .button:insensitive:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child .button, -.inline-toolbar.toolbar GtkToolButton:first-child .button:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive { - border-width: 1px; - border-radius: 2px; - border-right-width: 0; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -/* rightmost button */ -.linked .entry:last-child, -.linked .button:last-child, -.linked .button:active:last-child, -.linked .button:active:hover:last-child, -.linked .button:insensitive:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button, -.inline-toolbar.toolbar GtkToolButton:last-child .button:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive { - border-width: 1px; - border-radius: 2px; - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -/* linked single button */ -.linked .entry:only-child, -.linked .button:only-child, -.linked .button:active:only-child, -.linked .button:active:hover:only-child, -.linked .button:insensitive:only-child, -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar .button:active:only-child, -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child .button, -.inline-toolbar.toolbar GtkToolButton:only-child .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive { - border-width: 1px; - border-radius: 2px; -} - -/* linked button shadows (vertical) */ -.linked.vertical .button, -.inline-toolbar.toolbar.vertical .button, -.inline-toolbar.toolbar.vertical GtkToolButton > .button { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9); -} - -.linked.vertical .button:active, -.inline-toolbar.toolbar.vertical .button:active, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:active { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07); -} - -.linked.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive { - box-shadow: inset 0 -1px shade(@theme_bg_color, 0.85); -} - -/* remove box shadow from last-child and only-child */ -.linked.vertical .button:last-child, -.linked.vertical .button:only-child, -.linked.vertical .button:insensitive:last-child, -.linked.vertical .button:insensitive:only-child, -.linked.vertical .button:active *:insensitive:last-child, -.linked.vertical .button:active *:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:last-child, -.inline-toolbar.toolbar.vertical .button:only-child, -.inline-toolbar.toolbar.vertical .button:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { - box-shadow: none; -} - -/* add back the inset shadow effect */ -.linked.vertical .button:active:last-child, -.linked.vertical .button:active:only-child, -.inline-toolbar.toolbar.vertical .button:active:last-child, -.inline-toolbar.toolbar.vertical .button:active:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07); -} - -/* middle button (vertical) */ -.linked.vertical .entry, -.linked.vertical .button, -.linked.vertical .button:active, -.linked.vertical .button:active:hover, -.linked.vertical .button:insensitive { - border-width: 1px; - border-radius: 0; - border-top-width: 0; - border-bottom-width: 0; -} - -/* top button (vertical) */ -.linked.vertical .entry:first-child, -.linked.vertical .button:first-child, -.linked.vertical .button:active:first-child, -.linked.vertical .button:active:hover:first-child, -.linked.vertical .button:insensitive:first-child { - border-width: 1px; - border-radius: 2px; - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -/* bottom button (vertical) */ -.linked.vertical .entry:last-child, -.linked.vertical .button:last-child, -.linked.vertical .button:active:last-child, -.linked.vertical .button:active:hover:last-child, -.linked.vertical .button:insensitive:last-child { - border-width: 1px; - border-radius: 2px; - border-top-width: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -/* linked single button (vertical) */ -.linked.vertical .entry:only-child, -.linked.vertical .button:only-child, -.linked.vertical .button:active:only-child, -.linked.vertical .button:active:hover:only-child, -.linked.vertical .button:insensitive:only-child { - border-width: 1px; - border-radius: 2px; -} - -/* linked toolbar buttons */ -.primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button, -.toolbar .button.raised.linked, -.toolbar .raised.linked .button, -.toolbar .linked .button { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9); -} - -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active, -.toolbar .button.raised.linked:active, -.toolbar .raised.linked .button:active, -.toolbar .linked .button:active { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button:insensitive, -.toolbar .linked .button:insensitive { - box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.85); -} - -/* remove box shadow from last-child and only-child */ -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .button.raised.linked:only-child, -.primary-toolbar .button:insensitive.raised.linked:last-child, -.primary-toolbar .button:insensitive.raised.linked:only-child, -.primary-toolbar .button:active *:insensitive.raised.linked:last-child, -.primary-toolbar .button:active *:insensitive.raised.linked:only-child, -.primary-toolbar .raised.linked .button:last-child, -.primary-toolbar .raised.linked .button:only-child, -.primary-toolbar .raised.linked .button:insensitive:last-child, -.primary-toolbar .raised.linked .button:insensitive:only-child, -.primary-toolbar .raised.linked .button:active *:insensitive:last-child, -.primary-toolbar .raised.linked .button:active *:insensitive:only-child, -.toolbar .button.raised.linked:last-child, -.toolbar .button.raised.linked:only-child, -.toolbar .button:insensitive.raised.linked:last-child, -.toolbar .button:insensitive.raised.linked:only-child, -.toolbar .button:active *:insensitive.raised.linked:last-child, -.toolbar .button:active *:insensitive.raised.linked:only-child, -.toolbar .raised.linked .button:last-child, -.toolbar .raised.linked .button:only-child, -.toolbar .raised.linked .button:insensitive:last-child, -.toolbar .raised.linked .button:insensitive:only-child, -.toolbar .raised.linked .button:active *:insensitive:last-child, -.toolbar .raised.linked .button:active *:insensitive:only-child, -.toolbar .linked .button:last-child, -.toolbar .linked .button:only-child, -.toolbar .linked .button:insensitive:last-child, -.toolbar .linked .button:insensitive:only-child, -.toolbar .linked .button:active *:insensitive:last-child, -.toolbar .linked .button:active *:insensitive:only-child { - box-shadow: none; -} - -/* add back the inset shadow effect */ -.primary-toolbar .button:active.raised.linked:last-child, -.primary-toolbar .button:active.raised.linked:only-child, -.primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:active:only-child, -.toolbar .button:active.raised.linked:last-child, -.toolbar .button:active.raised.linked:only-child, -.toolbar .raised.linked .button:active:last-child, -.toolbar .raised.linked .button:active:only-child, -.toolbar .linked .button:active:last-child, -.toolbar .linked .button:active:only-child { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07); -} - -/* middle button */ -.primary-toolbar .button.raised.linked, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button, -.primary-toolbar .raised.linked .button:active, -.primary-toolbar .raised.linked .button:insensitive, -.toolbar .button.raised.linked, -.toolbar .button.raised.linked:active, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button, -.toolbar .raised.linked .button:active, -.toolbar .raised.linked .button:insensitive, -.toolbar .linked .button, -.toolbar .linked .button:active, -.toolbar .linked .button:insensitive { - border-width: 1px; - border-radius: 0; - border-right-width: 0; - border-left-width: 0; -} - -/* leftmost button */ -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .button.raised.linked:active:first-child, -.primary-toolbar .button.raised.linked:insensitive:first-child, -.primary-toolbar .raised.linked .button:first-child, -.primary-toolbar .raised.linked .button:active:first-child, -.primary-toolbar .raised.linked .button:insensitive:first-child, -.toolbar .button.raised.linked:first-child, -.toolbar .button.raised.linked:active:first-child, -.toolbar .button.raised.linked:insensitive:first-child, -.toolbar .raised.linked .button:first-child, -.toolbar .raised.linked .button:active:first-child, -.toolbar .raised.linked .button:insensitive:first-child, -.toolbar .linked .button:first-child, -.toolbar .linked .button:active:first-child { - border-width: 1px; - border-radius: 2px; - border-right-width: 0; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -/* rightmost button */ -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .button.raised.linked:active:last-child, -.primary-toolbar .button.raised.linked:insensitive:last-child, -.primary-toolbar .raised.linked .button:last-child, -.primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:insensitive:last-child, -.toolbar .button.raised.linked:last-child, -.toolbar .button.raised.linked:active:last-child, -.toolbar .button.raised.linked:insensitive:last-child, -.toolbar .raised.linked .button:last-child, -.toolbar .raised.linked .button:active:last-child, -.toolbar .raised.linked .button:insensitive:last-child, -.toolbar .linked .button:last-child, -.toolbar .linked .button:active:last-child, -.toolbar .linked .button:insensitive:last-child { - border-width: 1px; - border-radius: 2px; - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -/* linked single button */ -.primary-toolbar .button.raised.linked:only-child, -.primary-toolbar .button.raised.linked:active:only-child, -.primary-toolbar .button.raised.linked:insensitive:only-child, -.primary-toolbar .raised.linked .button:only-child, -.primary-toolbar .raised.linked .button:active:only-child, -.primary-toolbar .raised.linked .button:insensitive:only-child, -.toolbar .button.raised.linked:only-child, -.toolbar .button.raised.linked:active:only-child, -.toolbar .button.raised.linked:insensitive:only-child, -.toolbar .raised.linked .button:only-child, -.toolbar .raised.linked .button:active:only-child, -.toolbar .raised.linked .button:insensitive:only-child, -.toolbar .linked .button:only-child, -.toolbar .linked .button:active:only-child, -.toolbar .linked .button:insensitive:only-child { - border-width: 1px; - border-radius: 2px; -} - -/* linked titlebar buttons */ -.header-bar .button.raised.linked, -.header-bar .raised.linked .button, -.header-bar .linked .button { - box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.9); -} - -.header-bar .button.raised.linked:active, -.header-bar .raised.linked .button:active, -.header-bar .linked .button:active { - box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.9), - inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset 0 -1px alpha(@dark_shadow, 0.05); -} - -.header-bar .button.raised.linked:insensitive, -.header-bar .raised.linked .button:insensitive, -.header-bar .linked .button:insensitive { - box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.85); -} - -/* remove box shadow from last-child and only-child */ -.header-bar .button.raised.linked:last-child, -.header-bar .button.raised.linked:only-child, -.header-bar .button:insensitive.raised.linked:last-child, -.header-bar .button:insensitive.raised.linked:only-child, -.header-bar .button:active *:insensitive.raised.linked:last-child, -.header-bar .button:active *:insensitive.raised.linked:only-child, -.header-bar .raised.linked .button:last-child, -.header-bar .raised.linked .button:only-child, -.header-bar .raised.linked .button:insensitive:last-child, -.header-bar .raised.linked .button:insensitive:only-child, -.header-bar .raised.linked .button:active *:insensitive:last-child, -.header-bar .raised.linked .button:active *:insensitive:only-child, -.header-bar .linked .button:last-child, -.header-bar .linked .button:only-child, -.header-bar .linked .button:insensitive:last-child, -.header-bar .linked .button:insensitive:only-child, -.header-bar .linked .button:active *:insensitive:last-child, -.header-bar .linked .button:active *:insensitive:only-child { - box-shadow: none; -} - -/* add back the inset shadow effect */ -.header-bar .button:active.raised.linked:last-child, -.header-bar .button:active.raised.linked:only-child, -.header-bar .raised.linked .button:active:last-child, -.header-bar .raised.linked .button:active:only-child, -.header-bar .linked .button:active:last-child, -.header-bar .linked .button:active:only-child { - box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), - inset 0 1px alpha(@dark_shadow, 0.08), - inset -1px 0 alpha(@dark_shadow, 0.07); -} - -/* middle button */ -.header-bar .button.raised.linked, -.header-bar .button.raised.linked:active, -.header-bar .button.raised.linked:insensitive, -.header-bar .raised.linked .button, -.header-bar .raised.linked .button:active, -.header-bar .raised.linked .button:insensitive, -.header-bar .linked .button, -.header-bar .linked .button:active, -.header-bar .linked .button:insensitive { - border-width: 1px; - border-radius: 0; - border-right-width: 0; - border-left-width: 0; -} - -/* leftmost button */ -.header-bar .button.raised.linked:first-child, -.header-bar .button.raised.linked:active:first-child, -.header-bar .button.raised.linked:insensitive:first-child, -.header-bar .raised.linked .button:first-child, -.header-bar .raised.linked .button:active:first-child, -.header-bar .raised.linked .button:insensitive:first-child, -.header-bar .linked .button:first-child, -.header-bar .linked .button:active:first-child, -.header-bar .linked .button:insensitive:first-child { - border-width: 1px; - border-radius: 2px; - border-right-width: 0; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -/* rightmost button */ -.header-bar .button.raised.linked:last-child, -.header-bar .button.raised.linked:active:last-child, -.header-bar .button.raised.linked:insensitive:last-child, -.header-bar .raised.linked .button:last-child, -.header-bar .raised.linked .button:active:last-child, -.header-bar .raised.linked .button:insensitive:last-child, -.header-bar .linked .button:last-child, -.header-bar .linked .button:active:last-child, -.header-bar .linked .button:insensitive:last-child { - border-width: 1px; - border-radius: 2px; - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -/* linked single button */ -.header-bar .button.raised.linked:only-child, -.header-bar .button.raised.linked:active:only-child, -.header-bar .button.raised.linked:insensitive:only-child, -.header-bar .raised.linked .button:only-child, -.header-bar .raised.linked .button:active:only-child, -.header-bar .raised.linked .button:insensitive:only-child, -.header-bar .linked .button:only-child, -.header-bar .linked .button:active:only-child, -.header-bar .linked .button:insensitive:only-child { - border-width: 1px; - border-radius: 2px; -} - -/*********** - * tooltip * - ***********/ -.tooltip { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_tooltip_bg_color, 0.8); - border-radius: 2px; - background-color: @theme_tooltip_bg_color; - background-image: none; - color: @theme_tooltip_fg_color; -} - -.tooltip * { - background-color: transparent; -} - -/************ - * treeview * - ************/ -GtkTreeView { - -GtkTreeView-vertical-separator: 0; - - outline-offset: -1px; -} - -GtkTreeView.dnd { - border-width: 1px; - border-style: solid; - border-color: @theme_selected_bg_color; - border-radius: 0; -} - -GtkTreeView .entry { - border-radius: 0; - background-color: @theme_base_color; - background-image: none; -} - -/************ - * viewport * - ************/ -GtkViewport.frame { - border-width: 0; -} - -.view { - background-color: @theme_base_color; - color: @theme_text_color; -} - -.view:insensitive, -.view:insensitive:insensitive { - background-color: shade(@theme_base_color, 0.9); - color: mix(@theme_fg_color, @theme_bg_color, 0.5); -} - -.view:selected, -.view:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; -} - -/************** - * action-bar * - **************/ -.action-bar { - padding: 4px; - border-width: 1px 0 0 0; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: @theme_bg_color; - background-image: none; - color: @theme_fg_color; -} - -.action-bar .button.text-button { - padding: 4px; -} - -.action-bar .button.image-button { - padding: 6px; -} - -.action-bar .title { - font: bold; - padding: 0 12px; -} - -.action-bar .subtitle { - font: smaller; - padding: 0 12px; -} - -/*************** - * search bars * - ***************/ -.search-bar { - border-width: 0 0 1px 0; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: shade(@theme_bg_color, 0.98); -} - -.search-bar .button.close-button { - padding: 4px; -} - -/*********** - * dialogs * - ***********/ -GtkMessageDialog, -.prompt { - -GtkDialog-content-area-border: 0; - -GtkDialog-action-area-border: 0; - -GtkDialog-button-spacing: 0; - - margin: 0; - padding: 0; -} - -/******************** - * various choosers * - ********************/ -GtkFontButton .separator, -GtkFileChooserButton .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; -} - -GtkFontButton GtkLabel:last-child { - color: alpha(currentColor, 0.7); -} - -GtkFileChooserButton GtkImage:last-child { - color: alpha(currentColor, 0.7); -} - -GtkFileChooser .pane-separator, -GtkFileChooser .pane-separator:hover { - border-width: 0 1px 0 0; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - background-color: @theme_bg_color; - color: shade(@theme_bg_color, 0.9); -} - -/* for fallback when header bar not used */ -GtkFileChooser .dialog-action-box { - border-width: 1px 0 0; - border-style: solid; - border-color: shade(@theme_bg_color, 0.7); -} - -/********************* - * app notifications * - *********************/ -.app-notification { - border-style: solid; - border-color: shade(@theme_base_color, 0.8); - border-width: 0 1px 1px 1px; - border-radius: 0 0 2px 2px; - padding: 8px; - background-color: @theme_base_color; - background-image: none; - color: @theme_text_color; -} - -/******* - * osd * - *******/ -.background.osd { - color: @osd_fg; - background-color: @osd_bg; -} - -GtkOverlay.osd { - background-color: transparent; -} - -.osd.frame { - background-clip: border-box; - background-origin: border-box; -} - -.osd.button, -.osd .button { - padding: 4px; - border-width: 1px; - border-style: solid; - border-color: shade(@osd_bg, 0.8); - border-radius: 2px; - background-color: shade(@osd_bg, 1.08); - background-image: none; - color: @osd_fg; -} - -.osd.button:prelight, -.osd.button:hover, -.osd .button:hover { - border-color: shade(@osd_bg, 0.7); - background-color: shade(@osd_bg, 1.10); - background-image: none; -} - -.osd.button:active, -.osd .button:active, -.osd GtkMenuButton.button:active { - border-color: shade(@osd_bg, 0.8); - background-color: shade(@osd_bg, 0.95); - background-image: none; -} - -.osd.button:active:hover, -.osd .button:active:hover, -.osd GtkMenuButton.button:active:hover { - border-color: shade(@osd_bg, 0.7); -} - -.osd.button:insensitive, -.osd .button:insensitive { - border-color: shade(@osd_bg, 0.85); - background-color: shade(@osd_bg, 0.9); - background-image: none; -} - -.osd.button:active *:insensitive, -.osd .button:active *:insensitive { - background-color: shade(@osd_bg, 0.80); - background-image: none; -} - -.osd.toolbar { - -GtkToolbar-button-relief: normal; - - padding: 4px; - border-width: 1px; - border-style: solid; - border-radius: 2px; - border-color: shade(@osd_bg, 0.8); - background-color: @osd_bg; - background-image: none; - color: @osd_fg; -} - -.osd.toolbar .button { - padding: 4px; - border-width: 1px; - border-style: solid; - border-color: shade(@osd_bg, 0.8); - border-radius: 2px; - background-color: shade(@osd_bg, 1.08); - background-image: none; - color: @osd_fg; -} - -.osd.toolbar .button:hover { - border-color: shade(@osd_bg, 0.7); - background-color: shade(@osd_bg, 1.10); - background-image: none; -} - -.osd.toolbar .button:active { - border-color: shade(@osd_bg, 0.8); - background-color: shade(@osd_bg, 0.95); - background-image: none; -} - -.osd.toolbar .button:active:hover { - border-color: shade(@osd_bg, 0.7); -} - -.osd.toolbar .button:focus, -.osd.toolbar .button:hover:focus, -.osd.toolbar .button:active:focus, -.osd.toolbar .button:active:hover:focus { - border-color: shade(@osd_bg, 0.7); -} - -.osd.toolbar .button:insensitive { - border-color: shade(@osd_bg, 0.85); - background-color: shade(@osd_bg, 0.9); - background-image: none; -} - -.osd.toolbar .button:active *:insensitive { - border-color: shade(@osd_bg, 0.75); - background-color: shade(@osd_bg, 0.80); - background-image: none; -} - -.osd.toolbar .button:first-child { - border-radius: 2px 0 0 2px; - border-width: 1px 0 1px 1px; - box-shadow: inset -1px 0 shade(@osd_bg, 0.9); -} - -.osd.toolbar .button:last-child { - box-shadow: none; - border-radius: 0 2px 2px 0; - border-width: 1px 1px 1px 0; -} - -.osd.toolbar .button:only-child, -.osd.toolbar GtkToolButton .button, -.osd.toolbar GtkToolButton:only-child .button, -.osd.toolbar GtkToolButton:last-child .button, -.osd.toolbar GtkToolButton:first-child .button { - border-width: 1px; - border-radius: 2px; - border-style: solid; -} - -.osd.toolbar .separator { - color: shade(@osd_bg, 0.9); -} - -/* used by gnome-settings-daemon's media-keys OSD */ -.osd.trough { - background-color: shade(@osd_bg, 0.8); -} - -.osd.progressbar { - background-color: @osd_fg; -} - -.osd .scale.slider { - background-color: shade(@osd_bg, 1.08); - background-image: none; - /* we will draw the border using box shadow for now */ - box-shadow: inset 1px 0 shade(@osd_bg, 0.8), - inset 0 1px shade(@osd_bg, 0.8), - inset -1px 0 shade(@osd_bg, 0.8), - inset 0 -1px shade(@osd_bg, 0.8); -} - -.osd .scale.slider:hover { - box-shadow: inset 1px 0 shade(@osd_bg, 0.7), - inset 0 1px shade(@osd_bg, 0.7), - inset -1px 0 shade(@osd_bg, 0.7), - inset 0 -1px shade(@osd_bg, 0.7); -} - -.osd .scale.slider:insensitive { - background-color: shade(@osd_bg, 0.9); - background-image: none; - box-shadow: inset 1px 0 shade(@osd_bg, 0.85), - inset 0 1px shade(@osd_bg, 0.85), - inset -1px 0 shade(@osd_bg, 0.85), - inset 0 -1px shade(@osd_bg, 0.85); -} - -.osd .scale.trough { - border-color: shade(@osd_bg, 0.8); - background-color: shade(@osd_bg, 1.08); - background-image: none; -} - -.osd .scale.trough.highlight { - border-color: @theme_selected_bg_color; - background-color: @theme_selected_bg_color; - background-image: none; -} - -.osd .scale.trough:insensitive, -.osd .scale.trough.highlight:insensitive { - border-color: shade(@osd_bg, 0.85); - background-color: shade(@osd_bg, 0.9); - background-image: none; -} - -.osd GtkProgressBar, -GtkProgressBar.osd { - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 2px; - -GtkProgressBar-min-horizontal-bar-height: 2px; - - padding: 0; -} - -.osd GtkProgressBar.trough, -GtkProgressBar.osd.trough { - padding: 0; - border-style: none; - border-radius: 0; - background-image: none; - background-color: transparent; -} - -.osd GtkProgressBar.progressbar, -GtkProgressBar.osd.progressbar { - border-style: none; - border-radius: 0; - background-color: @theme_selected_bg_color; - background-image: none; -} - -.osd .view, -.osd.view { - background-color: @osd_base; -} - -.osd .scrollbar.trough { - background-color: @osd_bg; -} - -.osd .scrollbar.slider { - border-width: 1px; - border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.21); - border-radius: 0; - background-color: mix(@osd_base, @osd_fg, 0.21); -} - -.osd .scrollbar.slider:hover { - border-color: mix(shade(@osd_base, 0.87), @osd_fg, 0.31); - background-color: mix(@osd_base, @osd_fg, 0.31); -} - -.osd .scrollbar.slider:active { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: @theme_selected_bg_color; -} - -.osd GtkIconView.cell:selected, -.osd GtkIconView.cell:selected:focus { - background-color: transparent; - border-style: solid; - border-radius: 2px; - border-width: 3px; - border-color: @osd_fg; - outline-color: transparent; -} - -/* used by Documents */ -.osd .page-thumbnail { - border-style: solid; - border-width: 1px; - border-color: shade(@osd_bg, 0.9); - /* when there's no pixbuf yet */ - background-color: @osd_bg; -} - -/****************************** - * destructive action buttons * - ******************************/ -.destructive-action.button { - border-width: 1px; - border-style: solid; - border-color: shade(@error_color, 0.8); - border-radius: 2px; - background-color: @error_color; - background-image: none; - color: mix(@theme_selected_fg_color, @error_color, 0.1); -} - -.destructive-action.button:hover { - border-color: shade(@error_color, 0.7); - background-color: shade(@error_color, 1.12); - background-image: none; -} - -.destructive-action.button:active { - border-color: shade(@error_color, 0.8); - background-color: shade(@error_color, 0.87); - background-image: none; -} - -.destructive-action.button:hover:active { - border-color: shade(@error_color, 0.7); -} - -/****************************** - * suggested action buttons * - ******************************/ -.suggested-action.button { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); - border-radius: 2px; - background-color: shade(@theme_selected_bg_color, 1.18); - background-image: none; - color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.1); -} - -.suggested-action.button:hover { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 1.20); - background-image: none; -} - -.suggested-action.button:active { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: shade(@theme_selected_bg_color, 1.05); - background-image: none; -} - -.suggested-action.button:hover:active { - border-color: shade(@theme_selected_bg_color, 0.8); -} - -/****************** - * selection mode * - ******************/ -.selection-mode.header-bar, -.selection-mode.toolbar { - border-style: solid; - border-color: @theme_selected_bg_color; - background-color: shade(@theme_selected_bg_color, 1.6); - background-image: none; - color: @theme_selected_bg_color; -} - -.selection-mode.header-bar { - border-top-color: shade(@theme_selected_bg_color, 1.6); - border-bottom-color: @theme_selected_bg_color; -} - -.selection-mode.toolbar { - padding: 4px; -} - -/* regular button */ -.selection-mode.header-bar .button, -.selection-mode.toolbar .button, -.selection-mode.toolbar GtkToolButton .button { - border-width: 1px; - border-style: solid; - border-color: @theme_selected_bg_color; - border-radius: 2px; - background-color: shade(@theme_selected_bg_color, 1.68); - background-image: none; - color: shade(@theme_selected_bg_color, 0.8); -} - -.selection-mode.header-bar .button:hover, -.selection-mode.toolbar .button:hover, -.selection-mode.toolbar GtkToolButton .button:hover { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: shade(@theme_selected_bg_color, 1.70); - background-image: none; -} - -.selection-mode.header-bar .button:active, -.selection-mode.toolbar .button:active, -.selection-mode.toolbar GtkToolButton .button:active { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: shade(@theme_selected_bg_color, 1.55); - background-image: none; -} - -.selection-mode.header-bar .button:hover:active, -.selection-mode.toolbar .button:hover:active, -.selection-mode.toolbar GtkToolButton .button:hover:active { - border-color: shade(@theme_selected_bg_color, 0.8); -} - -/* suggested button */ -.selection-mode.header-bar .suggested-action.button, -.selection-mode.toolbar .suggested-action.button, -.selection-mode.toolbar GtkToolButton.suggested-action .button { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_selected_bg_color, 0.9); - border-radius: 2px; - background-color: shade(@theme_selected_bg_color, 1.18); - background-image: none; - color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.1); -} - -.selection-mode.header-bar .suggested-action.button:hover, -.selection-mode.toolbar .suggested-action.button:hover, -.selection-mode.toolbar GtkToolButton.suggested-action .button:hover { - border-color: shade(@theme_selected_bg_color, 0.8); - background-color: shade(@theme_selected_bg_color, 1.20); - background-image: none; -} - -.selection-mode.header-bar .suggested-action.button:active, -.selection-mode.toolbar .suggested-action.button:active, -.selection-mode.toolbar GtkToolButton.suggested-action:active { - border-color: shade(@theme_selected_bg_color, 0.9); - background-color: shade(@theme_selected_bg_color, 1.05); - background-image: none; -} - -.selection-mode.header-bar .suggested-action.button:hover:active, -.selection-mode.toolbar .suggested-action.button:hover:active, -.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active { - border-color: shade(@theme_selected_bg_color, 0.8); -} - -/* menu button */ -.selection-mode.header-bar .selection-menu.button, -.selection-mode.toolbar .selection-menu.button { - border-style: none; - background-color: transparent; - background-image: none; - color: shade(@theme_selected_bg_color, 0.8); -} - -.selection-mode.toolbar .dim-label, -.selection-mode.toolbar .selection-menu.button .dim-label { - color: shade(@theme_selected_bg_color, 0.7); -} - -.selection-mode.header-bar .selection-menu.button:hover, -.selection-mode.toolbar .dim-label:hover, -.selection-mode.toolbar .selection-menu.button:hover, -.selection-mode.toolbar .selection-menu.button .dim-label:hover { - color: shade(@theme_selected_bg_color, 0.7); -} - -.selection-mode.header-bar .selection-menu.button:active, -.selection-mode.toolbar .selection-menu.button:active { - color: shade(@theme_selected_bg_color, 0.8); - box-shadow: none; -} - -/************************* - * touch text selections * - *************************/ -GtkBubbleWindow { - border-radius: 2px; - background-clip: border-box; -} - -GtkBubbleWindow.osd.background { - background-color: @osd_bg; -} - -GtkBubbleWindow .toolbar { - background-color: transparent; -} - -/******* - * CSD * - *******/ -.titlebar { - border-radius: 2px 2px 0 0; - background-image: none; - background-color: @titlebar_bg_color; - color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); - text-shadow: none; -} - -.tiled .titlebar { - border-radius: 0; -} - -.maximized .titlebar { - border-radius: 0; -} - -/* this is the default titlebar that is added by GTK - * when client-side decorations are in use and the application - * did not set a custom titlebar. - */ -.titlebar.default-decoration { - border: none; - box-shadow: none; -} - -.titlebar .title { - font: bold; -} - -.titlebar:backdrop { - background-image: none; - background-color: @titlebar_bg_color; - color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); - text-shadow: none; -} - -.titlebar .titlebutton { - padding: 4px; - border-style: none; - background: none; - color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); - icon-shadow: none; -} - -.titlebar .titlebutton:hover, -.titlebar .titlebutton:hover:focus { - background: none; - color: @theme_selected_bg_color; -} - -.titlebar .titlebutton:active, -.titlebar .titlebutton:active:hover { - background: none; - color: shade(@theme_selected_bg_color, 0.9); - box-shadow: none; -} - -/* -.titlebar .right .titlebutton:first-child { - border-left: 1px solid shade(@titlebar_bg_color, 0.9); -} - -.titlebar .right .titlebutton:last-child { -} - -.titlebar .left .titlebutton:last-child { - border-right: 1px solid shade(@titlebar_bg_color, 0.9); -} - -.titlebar .left .titlebutton:first-child { -} -*/ - -.titlebar .titlebutton:backdrop { - background-image: none; - color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); - icon-shadow: none; -} - -.window-frame { - border-style: none; - border-radius: 2px 2px 0 0; - box-shadow: 0 3px 7px 1px alpha(black, 0.7), - 0 0 0 1px mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21); - - /* this is used for the resize cursor area */ - margin: 10px; -} - -.window-frame.tiled { - border-radius: 0; -} - -.window-frame:backdrop { - box-shadow: 0 3px 5px 1px alpha(black, 0.5), - 0 0 0 1px mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12); -} diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 72e9b19..fe669f9 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,85 +1,2 @@ -/* default color scheme */ -@define-color bg_color #dedede; -@define-color fg_color #555555; -@define-color base_color #f9f9f9; -@define-color text_color #333333; -@define-color selected_bg_color #d64937; -@define-color selected_fg_color #f9f9f9; -@define-color tooltip_bg_color #2d2d2d; -@define-color tooltip_fg_color #dcdcdc; -/* dark color scheme */ -@define-color dark_bg_color #2d2d2d; -@define-color dark_fg_color #dcdcdc; - -/* colormap actually used by the theme, to be overridden in other css files */ -@define-color theme_bg_color @bg_color; -@define-color theme_fg_color @fg_color; -@define-color theme_base_color @base_color; -@define-color theme_text_color @text_color; -@define-color theme_selected_bg_color @selected_bg_color; -@define-color theme_selected_fg_color @selected_fg_color; -@define-color theme_tooltip_bg_color @tooltip_bg_color; -@define-color theme_tooltip_fg_color @tooltip_fg_color; - -/* shadow effects */ -@define-color light_shadow #fff; -@define-color dark_shadow #000; - -/* misc colors used by gtk+ */ -@define-color info_fg_color rgb (58, 135, 173); -@define-color info_bg_color rgb (217, 237, 247); -@define-color warning_fg_color rgb (192, 152, 83); -@define-color warning_bg_color rgb (252, 248, 227); -@define-color question_fg_color rgb (214, 73, 55); -@define-color question_bg_color rgb (252, 229, 213); -@define-color error_fg_color rgb (185, 74, 72); -@define-color error_bg_color rgb (242, 222, 222); -@define-color link_color #fc6f5d; -@define-color success_color #53a93f; -@define-color warning_color #f57900; -@define-color error_color #cc0000; - -/* widget colors */ -@define-color titlebar_bg_color @dark_bg_color; -@define-color titlebar_fg_color @dark_fg_color; -@define-color menubar_bg_color @dark_bg_color; -@define-color menubar_fg_color @dark_fg_color; -@define-color toolbar_bg_color @theme_bg_color; -@define-color toolbar_fg_color @theme_fg_color; -@define-color menu_bg_color @dark_bg_color; -@define-color menu_fg_color @dark_fg_color; -@define-color panel_bg_color @dark_bg_color; -@define-color panel_fg_color @dark_fg_color; - -/* osd */ -@define-color osd_base @dark_bg_color; -@define-color osd_fg @dark_fg_color; -@define-color osd_bg alpha(@osd_base, 0.8); - -/* lightdm greeter colors */ -@define-color lightdm_bg_color @dark_bg_color; -@define-color lightdm_fg_color @dark_fg_color; - -/* window manager colors */ -@define-color wm_bg @titlebar_bg_color; -@define-color wm_border_focused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21); -@define-color wm_border_unfocused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12); -@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); -@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); -@define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); -@define-color wm_icons_focused_prelight @selected_bg_color; -@define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8); -@define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); -@define-color wm_icons_unfocused_prelight @selected_bg_color; -@define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8); - -@import url("gtk-widgets.css"); -@import url("gtk-widgets-assets.css"); -@import url("apps/gnome-applications.css"); -@import url("apps/granite-widgets.css"); -@import url("apps/unity.css"); -@import url("apps/xfce.css"); -@import url("apps/nemo.css"); -@import url("apps/synaptic.css"); -@import url("apps/lightdm-gtk-greeter.css"); +@import url("gen/widgets.css"); \ No newline at end of file diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/_base.scss new file mode 100644 index 0000000..95a1994 --- /dev/null +++ b/gtk-3.0/scss/_base.scss @@ -0,0 +1,119 @@ +@import "functions"; + +* { + -GtkArrow-arrow-scaling: 0.5; + -GtkButton-child-displacement-x: 0; + -GtkButton-child-displacement-y: 0; + -GtkButton-default-border: 0; + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 1; + -GtkButton-interior-focus: true; + -GtkButtonBox-child-min-height: 24; + -GtkButtonBox-child-internal-pad-y: 1; + -GtkCheckButton-indicator-size: 16; + -GtkCheckMenuItem-indicator-size: 14; + -GtkExpander-expander-size: 8; + -GtkMenu-horizontal-padding: 0; + -GtkMenu-vertical-padding: 0; + -GtkPaned-handle-size: 4; + -GtkProgressBar-min-horizontal-bar-height: 12; + -GtkProgressBar-min-vertical-bar-width: 12; + -GtkRange-slider-width: 12; + -GtkRange-stepper-spacing: 0; + -GtkRange-trough-border: 0; + -GtkRange-trough-under-steppers: 1; + -GtkScrollbar-has-backward-stepper: false; + -GtkScrollbar-has-forward-stepper: false; + -GtkScrollbar-min-slider-length: 80; + -GtkScrolledWindow-scrollbar-spacing: 0; + -GtkScrolledWindow-scrollbars-within-bevel: 1; + -GtkStatusbar-shadow-type: none; + -GtkTextView-error-underline-color: $error_color; + -GtkToolButton-icon-spacing: 6; + -GtkToolItemGroup-expander-size: 8; + -GtkTreeView-expander-size: 8; + -GtkWindow-resize-grip-height: 0; + -GtkWindow-resize-grip-width: 0; + -WnckTasklist-fade-overlay-rect: 0; + + /* legacy stuff */ + -GtkWidget-focus-line-width: 1; + -GtkWidget-focus-padding: 0; + + /* + outline-color: alpha($selected_bg_color, 0.5); + outline-style: dashed; + outline-width: 1px; + outline-offset: -2px; + outline-radius: 2px; + */ +} + +/*************** +* base states * +***************/ +* { + &:selected, + &:selected:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + &:insensitive, + &:insensitive:insensitive { color: mix($fg_color, $bg_color, 50%); } + + &:insensitive { -gtk-image-effect: dim; } + + &:hover { -gtk-image-effect: highlight; } +} + +.background { + background-color: $bg_color; + color: $fg_color; + + &:backdrop { + text-shadow: none; + icon-shadow: none; + } +} + +.gtkstyle-fallback { + background-color: $bg_color; + color: $fg_color; + + &:prelight { + background-color: shade($bg_color, 1.1); + color: $fg_color; + } + + &:active { + background-color: shade($bg_color, 0.9); + color: $fg_color; + } + + &:insensitive { + background-color: shade(shade($bg_color, 0.95), 1.05); + color: mix($fg_color, $bg_color, 50%); + } + + &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + } +} + +GtkImage, GtkLabel, GtkBox, GtkGrid { + &, &:insensitive { background-color: transparent; } +} + +/************** +* hyperlinks * +**************/ +* { + -GtkHTML-link-color: $link_color; + -GtkIMHtml-hyperlink-color: $link_color; + -GtkWidget-link-color: $link_color; + -GtkWidget-visited-link-color: $link_color; + + &:link, &:visited { color: $link_color; } +} \ No newline at end of file diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss new file mode 100644 index 0000000..82f84e0 --- /dev/null +++ b/gtk-3.0/scss/_button.scss @@ -0,0 +1,105 @@ +@import "functions"; + +@mixin linked_button($bg, $shadow) { + border-width: 1px; + border-radius: 0; + border-right-width: 0; + border-left-width: 0; + box-shadow: inset -1px 0 border_normal($bg); + + &:first-child { + border-width: 1px; + border-radius: $roundness; + border-right-width: 0; + border-bottom-right-radius: 0; + border-top-right-radius: 0; + } + + &:last-child { + border-width: 1px; + border-radius: $roundness; + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } + + &:only-child { + border-width: 1px; + border-radius: $roundness; + } + + &:focus, &:hover { box-shadow: inset -1px 0 border_focus($bg); } + + &:active, &:active:hover, + &:active:focus, &:active:hover:focus { + box-shadow: inset -1px 0 border_active($bg), + inset 1px 0 alpha($shadow, .07), + inset 0 1px alpha($shadow, .08), + inset 0 -1px alpha($shadow, .05); + } + + &:insensitive { box-shadow: inset -1px 0 border_insensitive($bg); } + + &:last-child, &:only-child, + &:insensitive:last-child, &:insensitive:only-child, + &:active *:insensitive:last-child, &:active *:insensitive:only-child { box-shadow: none; } + + &:active:last-child, &:active:only-child { + box-shadow: inset 1px 0 alpha($shadow, .07), + inset 0 1px alpha($shadow, .08), + inset -1px 0 alpha($shadow, .07); + } +} + +@mixin button($bg, $fg) { + @include linear-gradient(shade($bg, 1.05)); + @include border(shade($bg, 1.05)); + + padding: ($spacing - 1px) ($spacing + 1px); + border-width: 1px; + border-radius: $roundness; + border-style: solid; + color: $fg; + transition: 100ms ease; + + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; + + &:focus, &:hover { @include linear-gradient(shade($bg, 1.1)); } + + &:active { + @include linear-gradient(shade($bg, .95)); + + box-shadow: inset 1px 0 alpha($dark_shadow, .07), + inset 0 1px alpha($dark_shadow, .08), + inset -1px 0 alpha($dark_shadow, .07), + inset 0 -1px alpha($dark_shadow, .05); + } + + &:insensitive { + @include linear-gradient(shade($bg, .95)); + + color: mix($bg, $fg, .5); + } + + &:active *:insensitive { + @include linear-gradient(shade($bg, .8)); + + box-shadow: none; + } + + &.separator, .separator { + color: shade($bg, .95); + border: 1px solid currentColor; + + &:insensitive { color: shade($bg, .85); } + } + + &.linked, &.raised.linked, .linked & { @include linked_button(shade($bg, 1.05), $dark_shadow); } +} + +.button { + @include button($bg_color, $fg_color); + + &.default { @include button($selected_bg_color, $selected_fg_color); } +} \ No newline at end of file diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss new file mode 100644 index 0000000..dc9e658 --- /dev/null +++ b/gtk-3.0/scss/_entry.scss @@ -0,0 +1,72 @@ +@import "functions"; + +@mixin linked_entry($bg) { + border-width: 1px; + border-radius: 0; + border-right-width: 0; + border-left-width: 0; + + &:first-child { + border-width: 1px; + border-radius: $roundness; + border-right-width: 0; + border-bottom-right-radius: 0; + border-top-right-radius: 0; + } + + &:last-child { + border-width: 1px; + border-radius: $roundness; + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } + + &:only-child { + border-width: 1px; + border-radius: $roundness; + } +} + +@mixin entry($bg, $fg) { + @include linear-gradient($bg); + @include border(shade($bg, .9)); + + padding: ($spacing - 1px) ($spacing + 1px); + border-width: 1px; + border-style: solid; + border-radius: $roundness; + transition: border 100ms ease; + box-shadow: inset 1px 0 alpha($dark_shadow, .1), + inset 0 1px alpha($dark_shadow, .12), + inset -1px 0 alpha($dark_shadow, .1), + inset 0 -1px alpha($dark_shadow, .05); + + &:selected, &:selected:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + &:insensitive { + @include linear-gradient(shade($bg, .9)); + + color: mix($bg, $fg, .5); + box-shadow: none; + } + + &.progressbar { + @include linear-gradient($selected_bg_color); + + border-width: 0; + border-radius: $roundness; + color: $selected_fg_color; + } + + &.image.left { padding-right: $spacing; } +} + +.entry { + @include entry($base_color, $text_color); + + .linked & { @include linked_entry($base_color); } +} \ No newline at end of file diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss new file mode 100644 index 0000000..ab12059 --- /dev/null +++ b/gtk-3.0/scss/_functions.scss @@ -0,0 +1,64 @@ +@import "global"; + +@function alpha($color, $amount) { + @if type-of($color) == "color" { + @return fade-out($color, (1 - $amount)); + } @else { + @return unquote("alpha(#{$color},#{$amount})"); + } +} + +@function shade($color, $amount) { +// @if type-of($color) == "color" { +// @if $amount < 1 { +// @return darken($color, ((1 - $amount) * 100)); +// } @else { +// @return lighten($color, (($amount - 1) * 100)); +// } +// } @else { + @return unquote("shade(#{$color},#{$amount})"); +// } +} + +@function mix($color1, $color2, $amount) { + @return unquote("mix(#{$color1},#{$color2},#{$amount})"); +} + +@function border_normal($color) { + @return shade($color, $contrast); +} + +@function border_focus($color) { + @return shade($color, ($contrast - .1)); +} + +@function border_active($color) { + @return shade($color, ($contrast - .15)); +} + +@function border_insensitive($color) { + @return shade($color, ($contrast + .05)); +} + +@mixin linear-gradient($color, $direction: to bottom) { + $amount: $gradient / 2; + + background-color: $color; + background-image: linear-gradient($direction, + shade($color, (1 + $amount)), + shade($color, (1 - $amount)) + ); +} + +@mixin border($color) { + border-color: border_normal($color); + + &:focus, &:hover { border-color: border_focus($color); } + + &:active, &:active:hover, + &:active:focus, &:active:hover:focus { border-color: border_active($color); } + + &:insensitive { border-color: border_insensitive($color); } + + &:active *:insensitive { border-color: border_normal($color); } +} \ No newline at end of file diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss new file mode 100644 index 0000000..eee1977 --- /dev/null +++ b/gtk-3.0/scss/_global.scss @@ -0,0 +1,43 @@ +/* default color scheme */ +$bg_color: #dedede; +$fg_color: #555555; +$base_color: #f9f9f9; +$text_color: #2d2d2d; +$selected_bg_color: #d64937; +$selected_fg_color: #f9f9f9; +$tooltip_bg_color: #2d2d2d; +$tooltip_fg_color: #dedede; + +/* dark colors */ +$dark_bg_color: #2d2d2d; +$dark_fg_color: #dedede; + +/* shadows */ +$dark_shadow: #000; +$light_shadow: #fff; + +/* misc colors used by gtk+ */ +$info_fg_color: rgb (58, 135, 173); +$info_bg_color: rgb (217, 237, 247); +$warning_fg_color: rgb (192, 152, 83); +$warning_bg_color: rgb (252, 248, 227); +$question_fg_color: rgb (214, 73, 55); +$question_bg_color: rgb (252, 229, 213); +$error_fg_color: rgb (185, 74, 72); +$error_bg_color: rgb (242, 222, 222); +$link_color: #fc6f5d; +$success_color: #53a93f; +$warning_color: #f57900; +$error_color: #cc0000; + +$titlebar_bg_color: $dark_bg_color; +$titlebar_fg_color: $dark_fg_color; + +$menu_bg_color: $dark_bg_color; +$menu_fg_color: $dark_fg_color; + +/* widget styles */ +$roundness: 2px; +$spacing: 5px; +$gradient: 0; +$contrast: .7; \ No newline at end of file diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss new file mode 100644 index 0000000..905dc8a --- /dev/null +++ b/gtk-3.0/scss/_menu.scss @@ -0,0 +1,152 @@ +@import "functions"; +@import "entry"; + +GtkTreeMenu, GtkMenuToolButton, GtkComboBox { + &.menu, .menu { + background-color: $menu_bg_color; + margin: $spacing; + } +} + +#toolbar-popup, .menu { + padding: 0; + border-radius: 0; + border-style: none; + background-color: $menu_bg_color; + color: $menu_fg_color; + + &:selected { background-color: $selected_bg_color; } + + .button { + &, &:hover, &:active, &:active *:insensitive, &:insensitive { + border-width: 0; + background-color: transparent; + background-image: none; + } + } +} + +.context-menu { font: initial; } + +.menuitem { + GtkTreeMenu & { + padding: 0; + border-width: 0; + } + + &, .menu & { + padding: $spacing; + border-width: 1px; + border-style: solid; + border-color: transparent; + border-radius: 0; + background-color: transparent; + background-image: none; + + -GtkMenuItem-arrow-scaling: 0.5; + + &:active, &:hover { + border-color: shade($selected_bg_color, .9); + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + + & *:active, & *:hover { color: $selected_fg_color; } + + &:insensitive, & *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); } + } + + &.check, &.radio { + &, &:focus, &:hover, &:insensitive { background-image: none; } + + &, &:focus, &:hover, &:active, &:insensitive { + border-style: none; + background-color: transparent; + } + } + + &.separator { + -GtkMenuItem-horizontal-padding: 0; + -GtkWidget-separator-height: 1; + + border-style: none; + color: shade($menu_bg_color, .9); + } + + &.button { + &, &:active, &:insensitive, &:active:insensitive { + background-color: transparent; + background-image: none; + border-color: transparent; + border-style: none; + box-shadow: none; + color: currentColor; + } + + &:hover, &:active:hover, &:selected { + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + } + + GtkCalendar { + &:inconsistent { color: mix($menu_fg_color, $menu_bg_color, .5); } + + .button { + border-style: none; + background-color: transparent; + background-image: none; + } + } + + .accelerator { + color: alpha($menu_fg_color, .6); + + &:hover { color: alpha($selected_fg_color, .8); } + + &:insensitive { color: alpha(mix($menu_fg_color, $menu_bg_color, .5), .4); } + } + + .entry { @include entry($menu_bg_color, $menu_fg_color); } +} + +GtkModelMenuItem GtkBox GtkImage { padding-right: $spacing; } + +GtkPopover { + @include border($menu_bg_color); + + margin: 10px; + padding: $spacing; + border-radius: $roundness; + border-width: 1px; + border-style: solid; + background-clip: border-box; + background-color: $menu_bg_color; + color: $menu_fg_color; + box-shadow: 0 2px 3px alpha(black, .5); + + &:backdrop { box-shadow: none; } + + &.osd { + box-shadow: 0 2px 7px 3px alpha(black, .5); + + > .toolbar .button { + border-radius: 0; + border-width: 0; + background-image: none; + background-color: transparent; + } + } + + > .list, > .view, > .toolbar { background-color: transparent; } + + .separator { + border: 0; + background-color: transparent; + color: alpha($menu_bg_color, .5); + font-size: 80%; + font-weight: bold; + } +} \ No newline at end of file diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss new file mode 100644 index 0000000..e4f21ca --- /dev/null +++ b/gtk-3.0/scss/_toolbar.scss @@ -0,0 +1,120 @@ +@import "functions"; +@import "button"; + +@mixin toolbar($bg, $fg) { + @include linear-gradient($bg); + @include border($bg); + + padding: $spacing; + color: $fg; + + &:insensitive { + @include linear-gradient(darken($bg, 10%)); + + color: mix($fg, $bg, .5); + } + + .title { + font: bold; + padding: 0 12px; + } + + .subtitle { + font: smaller; + padding: 0 12px; + } + + .button { @include button($bg, $fg); } + + GtkComboBox, .button { + padding: 2px; + + &.text-button { padding: 4px; } + + &.image-button { padding: $spacing ($spacing - 1px) ($spacing - 1px) $spacing; } + } + + GtkSeparatorToolItem, .separator, .separator:insensitive { + color: border_normal($bg); + border-color: currentColor; + + -GtkWidget-window-dragging: true; + } + + .menubar { -GtkToolbar-button-relief: normal; } +} + +.toolbar { + @include toolbar($bg_color, $fg_color); + + border-style: none; +} + +.header-bar { + @include toolbar($titlebar_bg_color, $titlebar_fg_color); + + border-width: 0 0 1px 0; + border-style: solid; +} + +.titlebar { + @include linear-gradient($titlebar_bg_color); + + border-radius: $roundness $roundness 0 0; + color: mix($titlebar_fg_color, $titlebar_bg_color, .9); + + &:backdrop { + @include linear-gradient($titlebar_bg_color); + + color: mix($titlebar_fg_color, $titlebar_bg_color, .6); + text-shadow: none; + } + + &.default-decoration { + border: none; + box-shadow: none; + } + + .tiled &, .maximized & { border-radius: 0; } + + .title { font: bold; } + + .titlebutton { + padding: $spacing; + border: none; + background: none; + color: mix($titlebar_fg_color, $titlebar_bg_color, 90%); + + &:hover, &:hover:focus { + background: none; + color: $selected_bg_color; + } + + &:active, &:active:hover { + background: none; + color: darken($selected_bg_color, 10%); + box-shadow: none; + } + + &:backdrop { + background-image: none; + color: mix($titlebar_fg_color, $titlebar_bg_color, 60%); + icon-shadow: none; + } + } +} + +.window-frame { + margin: 10px; + border-style: none; + border-radius: $roundness $roundness 0 0; + box-shadow: 0 3px 7px 1px fade-out(black, .3), + 0 0 0 1px mix($titlebar_fg_color, $titlebar_bg_color, 21%); + + &:backdrop { + box-shadow: 0 3px 5px 1px fade-out(black, 0.5), + 0 0 0 1px mix($titlebar_fg_color, $titlebar_bg_color, 12%); + } + + &.tiled { border-radius: 0; } +} \ No newline at end of file diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss new file mode 100644 index 0000000..178dccc --- /dev/null +++ b/gtk-3.0/scss/widgets.scss @@ -0,0 +1,5 @@ +@import "base"; +@import "button"; +@import "entry"; +@import "menu"; +@import "toolbar"; \ No newline at end of file diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini deleted file mode 100644 index 9aa01e5..0000000 --- a/gtk-3.0/settings.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Settings] -gtk-auto-mnemonics = 1 -gtk-visible-focus = automatic From 2267965321fa89b23f7558bd5e341432bc65d935 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 3 Oct 2014 23:22:52 +0530 Subject: [PATCH 02/73] Added a color defintion file so other apps can get color from theme --- gtk-3.0/scss/_button.scss | 46 ++++++++++++++++++------- gtk-3.0/scss/_colors.scss | 67 ++++++++++++++++++++++++++++++++++++ gtk-3.0/scss/_entry.scss | 9 ++--- gtk-3.0/scss/_functions.scss | 8 ++--- gtk-3.0/scss/_global.scss | 38 ++++++++++---------- gtk-3.0/scss/_toolbar.scss | 17 +-------- gtk-3.0/scss/_window.scss | 35 +++++++++++++++++++ gtk-3.0/scss/widgets.scss | 4 ++- 8 files changed, 165 insertions(+), 59 deletions(-) create mode 100644 gtk-3.0/scss/_colors.scss create mode 100644 gtk-3.0/scss/_window.scss diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index 82f84e0..fe017a6 100644 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -1,26 +1,39 @@ @import "functions"; @mixin linked_button($bg, $shadow) { - border-width: 1px; + border: 1px solid border_normal($bg); border-radius: 0; - border-right-width: 0; - border-left-width: 0; - box-shadow: inset -1px 0 border_normal($bg); + border-right-style: none; + border-left-style: none; + box-shadow: inset -1px 0 border_normal($bg), + 0 1px 2px -1px alpha($dark_shadow, .3); &:first-child { border-width: 1px; border-radius: $roundness; - border-right-width: 0; - border-bottom-right-radius: 0; + border-left-style: solid; + border-right-style: none; border-top-right-radius: 0; + border-bottom-right-radius: 0; + + &:dir(rtl) { + border-left-style: none; + border-right-style: solid; + } } &:last-child { border-width: 1px; border-radius: $roundness; - border-left-width: 0; - border-bottom-left-radius: 0; + border-left-style: none; + border-right-style: solid; border-top-left-radius: 0; + border-bottom-left-radius: 0; + + &:dir(rtl) { + border-left-style: solid; + border-right-style: none; + } } &:only-child { @@ -28,7 +41,10 @@ border-radius: $roundness; } - &:focus, &:hover { box-shadow: inset -1px 0 border_focus($bg); } + &:focus, &:hover { + box-shadow: inset -1px 0 border_focus($bg), + 0 1px 2px -1px alpha($dark_shadow, .3); + } &:active, &:active:hover, &:active:focus, &:active:hover:focus { @@ -61,11 +77,16 @@ border-style: solid; color: $fg; transition: 100ms ease; + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); -GtkWidget-focus-padding: 1; -GtkWidget-focus-line-width: 0; - &:focus, &:hover { @include linear-gradient(shade($bg, 1.1)); } + &:focus, &:hover { + @include linear-gradient(shade($bg, 1.1)); + + box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5); + } &:active { @include linear-gradient(shade($bg, .95)); @@ -80,6 +101,7 @@ @include linear-gradient(shade($bg, .95)); color: mix($bg, $fg, .5); + box-shadow: none; } &:active *:insensitive { @@ -94,12 +116,10 @@ &:insensitive { color: shade($bg, .85); } } - - &.linked, &.raised.linked, .linked & { @include linked_button(shade($bg, 1.05), $dark_shadow); } } .button { @include button($bg_color, $fg_color); &.default { @include button($selected_bg_color, $selected_fg_color); } -} \ No newline at end of file +} diff --git a/gtk-3.0/scss/_colors.scss b/gtk-3.0/scss/_colors.scss new file mode 100644 index 0000000..37ab130 --- /dev/null +++ b/gtk-3.0/scss/_colors.scss @@ -0,0 +1,67 @@ +@import "global"; + +/* dark color scheme */ +@define-color dark_bg_color #{"" + $dark_bg_color}; +@define-color dark_fg_color #{"" + $dark_fg_color}; + +/* colormap actually used by the theme, to be overridden in other css files */ +@define-color theme_bg_color #{"" + $bg_color}; +@define-color theme_fg_color #{"" + $fg_color}; +@define-color theme_base_color #{"" + $base_color}; +@define-color theme_text_color #{"" + $text_color}; +@define-color theme_selected_bg_color #{"" + $selected_bg_color}; +@define-color theme_selected_fg_color #{"" + $selected_fg_color}; +@define-color theme_tooltip_bg_color #{"" + $tooltip_bg_color}; +@define-color theme_tooltip_fg_color #{"" + $tooltip_fg_color}; + +/* shadow effects */ +@define-color light_shadow #{"" + $light_shadow}; +@define-color dark_shadow #{"" + $dark_shadow}; + +/* misc colors used by gtk+ */ +@define-color info_fg_color #{"" + $info_fg_color}; +@define-color info_bg_color #{"" + $info_bg_color}; +@define-color warning_fg_color #{"" + $warning_fg_color}; +@define-color warning_bg_color #{"" + $warning_bg_color}; +@define-color question_fg_color #{"" + $question_fg_color}; +@define-color question_bg_color #{"" + $question_bg_color}; +@define-color error_fg_color #{"" + $error_fg_color}; +@define-color error_bg_color #{"" + $error_bg_color}; +@define-color link_color #{"" + $link_color}; +@define-color success_color #{"" + $success_color}; +@define-color warning_color #{"" + $warning_color}; +@define-color error_color #{"" + $error_color}; + +/* widget colors */ +@define-color titlebar_bg_color @dark_bg_color; +@define-color titlebar_fg_color @dark_fg_color; +@define-color menubar_bg_color @dark_bg_color; +@define-color menubar_fg_color @dark_fg_color; +@define-color toolbar_bg_color @theme_bg_color; +@define-color toolbar_fg_color @theme_fg_color; +@define-color menu_bg_color @dark_bg_color; +@define-color menu_fg_color @dark_fg_color; +@define-color panel_bg_color @dark_bg_color; +@define-color panel_fg_color @dark_fg_color; + +/* osd */ +@define-color osd_base @dark_bg_color; +@define-color osd_fg @dark_fg_color; +@define-color osd_bg alpha(@osd_base, 0.8); + +/* lightdm greeter colors */ +@define-color lightdm_bg_color @dark_bg_color; +@define-color lightdm_fg_color @dark_fg_color; + +/* window manager colors */ +@define-color wm_bg @titlebar_bg_color; +@define-color wm_border_focused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21); +@define-color wm_border_unfocused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12); +@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); +@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); +@define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); +@define-color wm_icons_focused_prelight @selected_bg_color; +@define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8); +@define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); +@define-color wm_icons_unfocused_prelight @selected_bg_color; +@define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8); diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss index dc9e658..f86563b 100644 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/_entry.scss @@ -40,7 +40,8 @@ box-shadow: inset 1px 0 alpha($dark_shadow, .1), inset 0 1px alpha($dark_shadow, .12), inset -1px 0 alpha($dark_shadow, .1), - inset 0 -1px alpha($dark_shadow, .05); + inset 0 -1px alpha($dark_shadow, .05), + 0 1px 2px -1px shade($bg_color, 1.4); &:selected, &:selected:focus { background-color: $selected_bg_color; @@ -65,8 +66,4 @@ &.image.left { padding-right: $spacing; } } -.entry { - @include entry($base_color, $text_color); - - .linked & { @include linked_entry($base_color); } -} \ No newline at end of file +.entry { @include entry($base_color, $text_color); } diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index ab12059..5d90e85 100644 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -29,15 +29,15 @@ } @function border_focus($color) { - @return shade($color, ($contrast - .1)); + @return shade($color, ($contrast - .05)); } @function border_active($color) { - @return shade($color, ($contrast - .15)); + @return shade($color, ($contrast - .10)); } @function border_insensitive($color) { - @return shade($color, ($contrast + .05)); + @return shade($color, ($contrast + .1)); } @mixin linear-gradient($color, $direction: to bottom) { @@ -61,4 +61,4 @@ &:insensitive { border-color: border_insensitive($color); } &:active *:insensitive { border-color: border_normal($color); } -} \ No newline at end of file +} diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index eee1977..c19db09 100644 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -1,30 +1,30 @@ /* default color scheme */ -$bg_color: #dedede; -$fg_color: #555555; -$base_color: #f9f9f9; -$text_color: #2d2d2d; -$selected_bg_color: #d64937; -$selected_fg_color: #f9f9f9; -$tooltip_bg_color: #2d2d2d; -$tooltip_fg_color: #dedede; +$bg_color: #eee; +$fg_color: #444; +$base_color: #fff; +$text_color: #444; +$selected_bg_color: #f06860; +$selected_fg_color: #fff; +$tooltip_bg_color: #444; +$tooltip_fg_color: #eee; /* dark colors */ -$dark_bg_color: #2d2d2d; -$dark_fg_color: #dedede; +$dark_bg_color: #444; +$dark_fg_color: #eee; /* shadows */ $dark_shadow: #000; $light_shadow: #fff; /* misc colors used by gtk+ */ -$info_fg_color: rgb (58, 135, 173); -$info_bg_color: rgb (217, 237, 247); -$warning_fg_color: rgb (192, 152, 83); -$warning_bg_color: rgb (252, 248, 227); -$question_fg_color: rgb (214, 73, 55); -$question_bg_color: rgb (252, 229, 213); -$error_fg_color: rgb (185, 74, 72); -$error_bg_color: rgb (242, 222, 222); +$info_fg_color: #3986ac; +$info_bg_color: #d9edf7; +$warning_fg_color: #c09853; +$warning_bg_color: #fcf8e3; +$question_fg_color: #d64937; +$question_bg_color: #fce5d5; +$error_fg_color: #b94a48; +$error_bg_color: #f2dede; $link_color: #fc6f5d; $success_color: #53a93f; $warning_color: #f57900; @@ -40,4 +40,4 @@ $menu_fg_color: $dark_fg_color; $roundness: 2px; $spacing: 5px; $gradient: 0; -$contrast: .7; \ No newline at end of file +$contrast: .7; diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index e4f21ca..fd96a69 100644 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -61,7 +61,7 @@ @include linear-gradient($titlebar_bg_color); border-radius: $roundness $roundness 0 0; - color: mix($titlebar_fg_color, $titlebar_bg_color, .9); + color: mix($titlebar_fg_color, $titlebar_bg_color, .1); &:backdrop { @include linear-gradient($titlebar_bg_color); @@ -103,18 +103,3 @@ } } } - -.window-frame { - margin: 10px; - border-style: none; - border-radius: $roundness $roundness 0 0; - box-shadow: 0 3px 7px 1px fade-out(black, .3), - 0 0 0 1px mix($titlebar_fg_color, $titlebar_bg_color, 21%); - - &:backdrop { - box-shadow: 0 3px 5px 1px fade-out(black, 0.5), - 0 0 0 1px mix($titlebar_fg_color, $titlebar_bg_color, 12%); - } - - &.tiled { border-radius: 0; } -} \ No newline at end of file diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/_window.scss new file mode 100644 index 0000000..eb91653 --- /dev/null +++ b/gtk-3.0/scss/_window.scss @@ -0,0 +1,35 @@ +.window-frame { + border-style: none; + border-radius: 2px 2px 0 0; + box-shadow: 0 3px 7px 1px alpha(black, 0.7), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); + + /* this is used for the resize cursor area */ + margin: 10px; + + &:backdrop { + box-shadow: 0 3px 5px 1px alpha(black, 0.5), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); + } + + &.tiled { border-radius: 0; } + + &.csd { + &.popup { + border-radius: 0; + box-shadow: 0 1px 2px alpha(black, 0.8), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); + } + + &.tooltip { + border-radius: 2px; + box-shadow: none; + } + + &.message-dialog { + border-radius: 2px; + box-shadow: 0 1px 2px alpha(black, 0.8), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); + } + } +} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index 178dccc..09c5ce7 100644 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -1,5 +1,7 @@ +@import "colors"; @import "base"; @import "button"; @import "entry"; @import "menu"; -@import "toolbar"; \ No newline at end of file +@import "toolbar"; +@import "window"; From 5be05672307f03b76c6823eff154214c280b6ce1 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 19 Oct 2014 02:27:23 +0530 Subject: [PATCH 03/73] Added more styles --- gtk-3.0/scss/_base.scss | 126 +++++++++++++++++++++++++++++++++------- 1 file changed, 105 insertions(+), 21 deletions(-) diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/_base.scss index 95a1994..224814b 100644 --- a/gtk-3.0/scss/_base.scss +++ b/gtk-3.0/scss/_base.scss @@ -1,4 +1,5 @@ @import "functions"; +@import "global"; * { -GtkArrow-arrow-scaling: 0.5; @@ -40,24 +41,25 @@ -GtkWidget-focus-line-width: 1; -GtkWidget-focus-padding: 0; - /* outline-color: alpha($selected_bg_color, 0.5); outline-style: dashed; outline-width: 1px; outline-offset: -2px; outline-radius: 2px; - */ } /*************** -* base states * -***************/ -* { - &:selected, - &:selected:focus { + * base states * + ***************/ +%selected_items { + &, &:focus { background-color: $selected_bg_color; color: $selected_fg_color; } +} + +* { + &:selected { @extend %selected_items; } &:insensitive, &:insensitive:insensitive { color: mix($fg_color, $bg_color, 50%); } @@ -65,6 +67,14 @@ &:insensitive { -gtk-image-effect: dim; } &:hover { -gtk-image-effect: highlight; } + + /* hyperlinks */ + -GtkHTML-link-color: $link_color; + -GtkIMHtml-hyperlink-color: $link_color; + -GtkWidget-link-color: $link_color; + -GtkWidget-visited-link-color: $link_color; + + &:link, &:visited { color: $link_color; } } .background { @@ -96,24 +106,98 @@ color: mix($fg_color, $bg_color, 50%); } - &:selected { - background-color: $selected_bg_color; - color: $selected_fg_color; - } + &:selected { @extend %selected_items; } } GtkImage, GtkLabel, GtkBox, GtkGrid { &, &:insensitive { background-color: transparent; } } -/************** -* hyperlinks * -**************/ -* { - -GtkHTML-link-color: $link_color; - -GtkIMHtml-hyperlink-color: $link_color; - -GtkWidget-link-color: $link_color; - -GtkWidget-visited-link-color: $link_color; +GtkLabel { + &.separator { + color: $fg_color; - &:link, &:visited { color: $link_color; } -} \ No newline at end of file + @extend .dim-label; + } + + &:selected { @extend %selected_items; } + + &:insensitive { color: mix($fg_color, $bg_color, 50%); } +} + +.dim-label { + opacity: 0.5; + text-shadow: none; +} + +.view { + color: $text_color; + background-color: $base_color; + + &:selected { @extend %selected_items; } +} + +.rubberband { + border: 1px solid $selected_bg_color; + background-color: alpha($selected_bg_color, 0.2); +} + +/* used by GtkScrolledWindow, shown when content is touch-dragged past boundaries. */ +.overshoot { background-color: alpha($selected_bg_color, 0.2); } + +GtkAssistant { + .sidebar { + background-color: $base_color; + border-top: 1px solid border_normal($base_color); + + &:dir(ltr) { border-right: 1px solid border_normal($base_color); } + &:dir(rtl) { border-left: 1px solid border_normal($base_color); } + + GtkLabel { + padding: $spacing ($spacing * 2); + + &.highlight { background-color: mix($bg_color, $fg_color, 80%); } + } + } + + &.csd .sidebar { border-top-style: none; } +} + +GtkTextView { + /* this will get overridden by .view, needed by gedit line numbers */ + background-color: mix($bg_color, $base_color, 50%); +} + + +GtkFlowBox .grid-child { + padding: 3px; + border-radius: 3px; + + &:selected { + @extend %selected_items; + + outline-offset: -2px; + } +} + +/********************* + * spinner animation * + *********************/ +@keyframes spin { + to { -gtk-icon-transform: rotate(1turn); } +} + +.spinner { + background-image: none; + background-color: blue; + opacity: 0; // non spinning spinner makes no sense + + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + + &:active { + opacity: 1; + animation: spin 1s linear infinite; + + &:insensitive { opacity: 0.5; } + } +} From e03e412f40a8d83df4c79fdcfc12c7a0f76bdf6b Mon Sep 17 00:00:00 2001 From: progandy Date: Mon, 20 Oct 2014 10:22:07 +0200 Subject: [PATCH 04/73] Essential support for radio and checkbox Supports sticky button, indeterminate radio and indeterminate checkbox. This requires the following icons in your icon theme. * checkbox-checked-symbolic.svg * checkbox-mixed-symbolic.svg * checkbox-symbolic.svg * radio-checked-symbolic.svg * radio-mixed-symbolic.svg * radio-symbolic.svg Fallback icons are available in the Adwaita icon theme. --- gtk-3.0/scss/_button.scss | 4 +++- gtk-3.0/scss/_toggle.scss | 40 +++++++++++++++++++++++++++++++++++++++ gtk-3.0/scss/widgets.scss | 1 + 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gtk-3.0/scss/_toggle.scss diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index fe017a6..8efdfdc 100644 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -88,9 +88,11 @@ box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5); } - &:active { + &:checked, &:active { @include linear-gradient(shade($bg, .95)); + } + &:active { box-shadow: inset 1px 0 alpha($dark_shadow, .07), inset 0 1px alpha($dark_shadow, .08), inset -1px 0 alpha($dark_shadow, .07), diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/_toggle.scss new file mode 100644 index 0000000..a3af16a --- /dev/null +++ b/gtk-3.0/scss/_toggle.scss @@ -0,0 +1,40 @@ +/************************* + * Check and Radio items * + *************************/ +@mixin toggle($type, $bg, $fg) { + color: $fg; + background-image: none; + -gtk-icon-source: -gtk-icontheme('#{$type}-symbolic'); + + &:checked, &:active { + -gtk-icon-source: -gtk-icontheme('#{$type}-checked-symbolic'); + } + + &:inconsistent { + -gtk-icon-source: -gtk-icontheme('#{$type}-mixed-symbolic'); + } + + &:focus, &:hover { + color: shade($fg, 1.2); + } + + &:active { + color: shade($fg, 0.8); + } + + &:insensitive { + color: mix($bg, $fg, .5); + } + + &:active *:insensitive { + color: mix($bg, $fg, .8); + } + +} + +.radio { + @include toggle("radio", $bg_color, $fg_color); +} +.check { + @include toggle("checkbox", $bg_color, $fg_color); +} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index 09c5ce7..1780fbc 100644 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -1,6 +1,7 @@ @import "colors"; @import "base"; @import "button"; +@import "toggle"; @import "entry"; @import "menu"; @import "toolbar"; From cd54212f23f1d3d1e654a12aa75c12bff5965b44 Mon Sep 17 00:00:00 2001 From: progandy Date: Mon, 20 Oct 2014 10:23:51 +0200 Subject: [PATCH 05/73] Simplistic Makefile to call sass --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e5f44c6 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +SASS=sass + +css: + $(SASS) --update gtk-3.0/scss:gtk-3.0/gen + +all: css + + +.PHONY: css +# vim: set ts=4 sw=4 tw=0 noet : From bc367f6471751b68dd68292daf7d4a89fd6d217b Mon Sep 17 00:00:00 2001 From: progandy Date: Mon, 20 Oct 2014 10:40:41 +0200 Subject: [PATCH 06/73] The mix command doesn't accept percent --- gtk-3.0/scss/_base.scss | 10 +++++----- gtk-3.0/scss/_toolbar.scss | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/_base.scss index 224814b..521af8f 100644 --- a/gtk-3.0/scss/_base.scss +++ b/gtk-3.0/scss/_base.scss @@ -62,7 +62,7 @@ &:selected { @extend %selected_items; } &:insensitive, - &:insensitive:insensitive { color: mix($fg_color, $bg_color, 50%); } + &:insensitive:insensitive { color: mix($fg_color, $bg_color, 0.50); } &:insensitive { -gtk-image-effect: dim; } @@ -103,7 +103,7 @@ &:insensitive { background-color: shade(shade($bg_color, 0.95), 1.05); - color: mix($fg_color, $bg_color, 50%); + color: mix($fg_color, $bg_color, 0.50); } &:selected { @extend %selected_items; } @@ -122,7 +122,7 @@ GtkLabel { &:selected { @extend %selected_items; } - &:insensitive { color: mix($fg_color, $bg_color, 50%); } + &:insensitive { color: mix($fg_color, $bg_color, 0.50); } } .dim-label { @@ -156,7 +156,7 @@ GtkAssistant { GtkLabel { padding: $spacing ($spacing * 2); - &.highlight { background-color: mix($bg_color, $fg_color, 80%); } + &.highlight { background-color: mix($bg_color, $fg_color, 0.80); } } } @@ -165,7 +165,7 @@ GtkAssistant { GtkTextView { /* this will get overridden by .view, needed by gedit line numbers */ - background-color: mix($bg_color, $base_color, 50%); + background-color: mix($bg_color, $base_color, 0.50); } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index fd96a69..491a507 100644 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -83,7 +83,7 @@ padding: $spacing; border: none; background: none; - color: mix($titlebar_fg_color, $titlebar_bg_color, 90%); + color: mix($titlebar_fg_color, $titlebar_bg_color, 0.90); &:hover, &:hover:focus { background: none; @@ -98,7 +98,7 @@ &:backdrop { background-image: none; - color: mix($titlebar_fg_color, $titlebar_bg_color, 60%); + color: mix($titlebar_fg_color, $titlebar_bg_color, 0.60); icon-shadow: none; } } From e1b94f2602a8f3044252ade6cc82d3372b6a8ba2 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Tue, 21 Oct 2014 00:21:50 +0530 Subject: [PATCH 07/73] Added a clean task to Makefile --- .gitignore | 3 ++- Makefile | 10 +++++++--- gtk-3.0/gtk.css | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 29d5568..c8a7d64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Ignore Backup Copies from Text Editor *~ + # Ignore SASS files .sass-cache -gen +dist diff --git a/Makefile b/Makefile index e5f44c6..a3777f1 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,14 @@ SASS=sass +SCSS_DIR=gtk-3.0/scss +DIST_DIR=gtk-3.0/dist -css: - $(SASS) --update gtk-3.0/scss:gtk-3.0/gen +css: + $(SASS) --sourcemap=none --update $(SCSS_DIR):$(DIST_DIR) all: css - +clean: + rm -rf $(DIST_DIR) + .PHONY: css # vim: set ts=4 sw=4 tw=0 noet : diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index fe669f9..27ebee0 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,2 +1,2 @@ -@import url("gen/widgets.css"); \ No newline at end of file +@import url("dist/widgets.css"); From ce39f0cf9c22f633d08bb8d249923d102ebc62d5 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Thu, 13 Nov 2014 23:45:48 +0530 Subject: [PATCH 08/73] Added sidebar styles --- CREDITS | 0 LICENSE | 0 Makefile | 0 README.md | 0 gtk-2.0/gtkrc | 0 gtk-3.0/gtk.css | 0 gtk-3.0/scss/_base.scss | 0 gtk-3.0/scss/_button.scss | 0 gtk-3.0/scss/_colors.scss | 0 gtk-3.0/scss/_entry.scss | 0 gtk-3.0/scss/_functions.scss | 0 gtk-3.0/scss/_global.scss | 6 +++ gtk-3.0/scss/_menu.scss | 0 gtk-3.0/scss/_sidebar.scss | 54 ++++++++++++++++++++++++++ gtk-3.0/scss/_toggle.scss | 0 gtk-3.0/scss/_toolbar.scss | 0 gtk-3.0/scss/_window.scss | 0 gtk-3.0/scss/widgets.scss | 1 + index.theme | 0 metacity-1/metacity-theme-2.xml | 0 metacity-1/metacity-theme-3.xml | 0 openbox-3/close.xbm | 0 openbox-3/desk.xbm | 0 openbox-3/desk_toggled.xbm | 0 openbox-3/iconify.xbm | 0 openbox-3/max.xbm | 0 openbox-3/max_toggled.xbm | 0 openbox-3/shade.xbm | 0 openbox-3/shade_toggled.xbm | 0 openbox-3/themerc | 0 unity/close.svg | 0 unity/close_focused_prelight.svg | 0 unity/close_focused_pressed.svg | 0 unity/close_unfocused.svg | 0 unity/maximize.svg | 0 unity/maximize_focused_prelight.svg | 0 unity/maximize_focused_pressed.svg | 0 unity/maximize_unfocused.svg | 0 unity/minimize.svg | 0 unity/minimize_focused_prelight.svg | 0 unity/minimize_focused_pressed.svg | 0 unity/minimize_unfocused.svg | 0 unity/minimized.svg | 0 unity/progress_bar_fill.svg | 0 unity/progress_bar_trough.svg | 0 unity/unmaximize.svg | 0 unity/unmaximize_focused_prelight.svg | 0 unity/unmaximize_focused_pressed.svg | 0 unity/unmaximize_unfocused.svg | 0 xfce-notify-4.0/gtkrc | 0 xfwm4/bottom-active.xpm | 0 xfwm4/bottom-inactive.xpm | 0 xfwm4/bottom-left-active.xpm | 0 xfwm4/bottom-left-inactive.xpm | 0 xfwm4/bottom-right-active.xpm | 0 xfwm4/bottom-right-inactive.xpm | 0 xfwm4/close-active.xpm | 0 xfwm4/close-inactive.xpm | 0 xfwm4/close-prelight.xpm | 0 xfwm4/close-pressed.png | Bin xfwm4/close-pressed.xpm | 0 xfwm4/hide-active.xpm | 0 xfwm4/hide-inactive.xpm | 0 xfwm4/hide-prelight.xpm | 0 xfwm4/hide-pressed.png | Bin xfwm4/hide-pressed.xpm | 0 xfwm4/left-active.xpm | 0 xfwm4/left-inactive.xpm | 0 xfwm4/maximize-active.xpm | 0 xfwm4/maximize-inactive.xpm | 0 xfwm4/maximize-prelight.xpm | 0 xfwm4/maximize-pressed.png | Bin xfwm4/maximize-pressed.xpm | 0 xfwm4/maximize-toggled-active.xpm | 0 xfwm4/maximize-toggled-inactive.xpm | 0 xfwm4/maximize-toggled-prelight.xpm | 0 xfwm4/maximize-toggled-pressed.png | Bin xfwm4/maximize-toggled-pressed.xpm | 0 xfwm4/menu-active.xpm | 0 xfwm4/menu-inactive.xpm | 0 xfwm4/menu-prelight.xpm | 0 xfwm4/menu-pressed.xpm | 0 xfwm4/right-active.xpm | 0 xfwm4/right-inactive.xpm | 0 xfwm4/shade-active.xpm | 0 xfwm4/shade-inactive.xpm | 0 xfwm4/shade-prelight.xpm | 0 xfwm4/shade-pressed.png | Bin xfwm4/shade-pressed.xpm | 0 xfwm4/shade-toggled-active.xpm | 0 xfwm4/shade-toggled-inactive.xpm | 0 xfwm4/shade-toggled-prelight.xpm | 0 xfwm4/shade-toggled-pressed.png | Bin xfwm4/shade-toggled-pressed.xpm | 0 xfwm4/stick-active.xpm | 0 xfwm4/stick-inactive.xpm | 0 xfwm4/stick-prelight.xpm | 0 xfwm4/stick-pressed.png | Bin xfwm4/stick-pressed.xpm | 0 xfwm4/stick-toggled-active.xpm | 0 xfwm4/stick-toggled-inactive.xpm | 0 xfwm4/stick-toggled-prelight.xpm | 0 xfwm4/stick-toggled-pressed.png | Bin xfwm4/stick-toggled-pressed.xpm | 0 xfwm4/themerc | 0 xfwm4/title-1-active.xpm | 0 xfwm4/title-1-inactive.xpm | 0 xfwm4/title-2-active.xpm | 0 xfwm4/title-2-inactive.xpm | 0 xfwm4/title-3-active.xpm | 0 xfwm4/title-3-inactive.xpm | 0 xfwm4/title-4-active.xpm | 0 xfwm4/title-4-inactive.xpm | 0 xfwm4/title-5-active.xpm | 0 xfwm4/title-5-inactive.xpm | 0 xfwm4/top-left-active.xpm | 0 xfwm4/top-left-inactive.xpm | 0 xfwm4/top-right-active.xpm | 0 xfwm4/top-right-inactive.xpm | 0 119 files changed, 61 insertions(+) mode change 100644 => 100755 CREDITS mode change 100644 => 100755 LICENSE mode change 100644 => 100755 Makefile mode change 100644 => 100755 README.md mode change 100644 => 100755 gtk-2.0/gtkrc mode change 100644 => 100755 gtk-3.0/gtk.css mode change 100644 => 100755 gtk-3.0/scss/_base.scss mode change 100644 => 100755 gtk-3.0/scss/_button.scss mode change 100644 => 100755 gtk-3.0/scss/_colors.scss mode change 100644 => 100755 gtk-3.0/scss/_entry.scss mode change 100644 => 100755 gtk-3.0/scss/_functions.scss mode change 100644 => 100755 gtk-3.0/scss/_global.scss mode change 100644 => 100755 gtk-3.0/scss/_menu.scss create mode 100755 gtk-3.0/scss/_sidebar.scss mode change 100644 => 100755 gtk-3.0/scss/_toggle.scss mode change 100644 => 100755 gtk-3.0/scss/_toolbar.scss mode change 100644 => 100755 gtk-3.0/scss/_window.scss mode change 100644 => 100755 gtk-3.0/scss/widgets.scss mode change 100644 => 100755 index.theme mode change 100644 => 100755 metacity-1/metacity-theme-2.xml mode change 100644 => 100755 metacity-1/metacity-theme-3.xml mode change 100644 => 100755 openbox-3/close.xbm mode change 100644 => 100755 openbox-3/desk.xbm mode change 100644 => 100755 openbox-3/desk_toggled.xbm mode change 100644 => 100755 openbox-3/iconify.xbm mode change 100644 => 100755 openbox-3/max.xbm mode change 100644 => 100755 openbox-3/max_toggled.xbm mode change 100644 => 100755 openbox-3/shade.xbm mode change 100644 => 100755 openbox-3/shade_toggled.xbm mode change 100644 => 100755 openbox-3/themerc mode change 100644 => 100755 unity/close.svg mode change 100644 => 100755 unity/close_focused_prelight.svg mode change 100644 => 100755 unity/close_focused_pressed.svg mode change 100644 => 100755 unity/close_unfocused.svg mode change 100644 => 100755 unity/maximize.svg mode change 100644 => 100755 unity/maximize_focused_prelight.svg mode change 100644 => 100755 unity/maximize_focused_pressed.svg mode change 100644 => 100755 unity/maximize_unfocused.svg mode change 100644 => 100755 unity/minimize.svg mode change 100644 => 100755 unity/minimize_focused_prelight.svg mode change 100644 => 100755 unity/minimize_focused_pressed.svg mode change 100644 => 100755 unity/minimize_unfocused.svg mode change 100644 => 100755 unity/minimized.svg mode change 100644 => 100755 unity/progress_bar_fill.svg mode change 100644 => 100755 unity/progress_bar_trough.svg mode change 100644 => 100755 unity/unmaximize.svg mode change 100644 => 100755 unity/unmaximize_focused_prelight.svg mode change 100644 => 100755 unity/unmaximize_focused_pressed.svg mode change 100644 => 100755 unity/unmaximize_unfocused.svg mode change 100644 => 100755 xfce-notify-4.0/gtkrc mode change 100644 => 100755 xfwm4/bottom-active.xpm mode change 100644 => 100755 xfwm4/bottom-inactive.xpm mode change 100644 => 100755 xfwm4/bottom-left-active.xpm mode change 100644 => 100755 xfwm4/bottom-left-inactive.xpm mode change 100644 => 100755 xfwm4/bottom-right-active.xpm mode change 100644 => 100755 xfwm4/bottom-right-inactive.xpm mode change 100644 => 100755 xfwm4/close-active.xpm mode change 100644 => 100755 xfwm4/close-inactive.xpm mode change 100644 => 100755 xfwm4/close-prelight.xpm mode change 100644 => 100755 xfwm4/close-pressed.png mode change 100644 => 100755 xfwm4/close-pressed.xpm mode change 100644 => 100755 xfwm4/hide-active.xpm mode change 100644 => 100755 xfwm4/hide-inactive.xpm mode change 100644 => 100755 xfwm4/hide-prelight.xpm mode change 100644 => 100755 xfwm4/hide-pressed.png mode change 100644 => 100755 xfwm4/hide-pressed.xpm mode change 100644 => 100755 xfwm4/left-active.xpm mode change 100644 => 100755 xfwm4/left-inactive.xpm mode change 100644 => 100755 xfwm4/maximize-active.xpm mode change 100644 => 100755 xfwm4/maximize-inactive.xpm mode change 100644 => 100755 xfwm4/maximize-prelight.xpm mode change 100644 => 100755 xfwm4/maximize-pressed.png mode change 100644 => 100755 xfwm4/maximize-pressed.xpm mode change 100644 => 100755 xfwm4/maximize-toggled-active.xpm mode change 100644 => 100755 xfwm4/maximize-toggled-inactive.xpm mode change 100644 => 100755 xfwm4/maximize-toggled-prelight.xpm mode change 100644 => 100755 xfwm4/maximize-toggled-pressed.png mode change 100644 => 100755 xfwm4/maximize-toggled-pressed.xpm mode change 100644 => 100755 xfwm4/menu-active.xpm mode change 100644 => 100755 xfwm4/menu-inactive.xpm mode change 100644 => 100755 xfwm4/menu-prelight.xpm mode change 100644 => 100755 xfwm4/menu-pressed.xpm mode change 100644 => 100755 xfwm4/right-active.xpm mode change 100644 => 100755 xfwm4/right-inactive.xpm mode change 100644 => 100755 xfwm4/shade-active.xpm mode change 100644 => 100755 xfwm4/shade-inactive.xpm mode change 100644 => 100755 xfwm4/shade-prelight.xpm mode change 100644 => 100755 xfwm4/shade-pressed.png mode change 100644 => 100755 xfwm4/shade-pressed.xpm mode change 100644 => 100755 xfwm4/shade-toggled-active.xpm mode change 100644 => 100755 xfwm4/shade-toggled-inactive.xpm mode change 100644 => 100755 xfwm4/shade-toggled-prelight.xpm mode change 100644 => 100755 xfwm4/shade-toggled-pressed.png mode change 100644 => 100755 xfwm4/shade-toggled-pressed.xpm mode change 100644 => 100755 xfwm4/stick-active.xpm mode change 100644 => 100755 xfwm4/stick-inactive.xpm mode change 100644 => 100755 xfwm4/stick-prelight.xpm mode change 100644 => 100755 xfwm4/stick-pressed.png mode change 100644 => 100755 xfwm4/stick-pressed.xpm mode change 100644 => 100755 xfwm4/stick-toggled-active.xpm mode change 100644 => 100755 xfwm4/stick-toggled-inactive.xpm mode change 100644 => 100755 xfwm4/stick-toggled-prelight.xpm mode change 100644 => 100755 xfwm4/stick-toggled-pressed.png mode change 100644 => 100755 xfwm4/stick-toggled-pressed.xpm mode change 100644 => 100755 xfwm4/themerc mode change 100644 => 100755 xfwm4/title-1-active.xpm mode change 100644 => 100755 xfwm4/title-1-inactive.xpm mode change 100644 => 100755 xfwm4/title-2-active.xpm mode change 100644 => 100755 xfwm4/title-2-inactive.xpm mode change 100644 => 100755 xfwm4/title-3-active.xpm mode change 100644 => 100755 xfwm4/title-3-inactive.xpm mode change 100644 => 100755 xfwm4/title-4-active.xpm mode change 100644 => 100755 xfwm4/title-4-inactive.xpm mode change 100644 => 100755 xfwm4/title-5-active.xpm mode change 100644 => 100755 xfwm4/title-5-inactive.xpm mode change 100644 => 100755 xfwm4/top-left-active.xpm mode change 100644 => 100755 xfwm4/top-left-inactive.xpm mode change 100644 => 100755 xfwm4/top-right-active.xpm mode change 100644 => 100755 xfwm4/top-right-inactive.xpm diff --git a/CREDITS b/CREDITS old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc old mode 100644 new mode 100755 diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/_base.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_colors.scss b/gtk-3.0/scss/_colors.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss old mode 100644 new mode 100755 index c19db09..d6f6cf7 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -30,12 +30,18 @@ $success_color: #53a93f; $warning_color: #f57900; $error_color: #cc0000; +$toolbar_bg_color: $bg_color; +$toolbar_fg_color: $fg_color; + $titlebar_bg_color: $dark_bg_color; $titlebar_fg_color: $dark_fg_color; $menu_bg_color: $dark_bg_color; $menu_fg_color: $dark_fg_color; +$menubar_bg_color: $dark_bg_color; +$menubar_fg_color: $dark_fg_color; + /* widget styles */ $roundness: 2px; $spacing: 5px; diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_sidebar.scss b/gtk-3.0/scss/_sidebar.scss new file mode 100755 index 0000000..7584d2c --- /dev/null +++ b/gtk-3.0/scss/_sidebar.scss @@ -0,0 +1,54 @@ +@import "functions"; + +.sidebar { + &, &.view, & .view, & GtkScrolledWindow { + background-color: $bg_color; + color: mix($fg_color, $bg_color, 0.1); + + &.separator { + border-width: 1px; + border-style: solid; + border-color: shade($bg_color, 0.9); + color: shade($bg_color, 0.9); + } + } + + row, .view row { + &:selected { + &, &:hover, &:focus { + border-color: border_normal($selected_bg_color); + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + + &:prelight { + border-color: border_focus($selected_bg_color); + background-color: shade($selected_bg_color, 1.05); + background-image: none; + color: $selected_fg_color; + } + } + + &:prelight { + border-color: shade($bg_color, 1.05); + background-color: shade($bg_color, 1.05); + background-image: none; + color: $fg_color; + } + } + + .frame { border-width: 0; } + + GtkAssistant & { + padding: 4px; + border-width: 0 1px 0 0; + border-style: solid; + border-right-color: border_normal($bg_color); + border-radius: 0; + background-color: $bg_color; + color: mix($fg_color, $bg_color, 0.1); + + .highlight { font: bold; } + } +} diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/_toggle.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/_window.scss old mode 100644 new mode 100755 diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss old mode 100644 new mode 100755 index 1780fbc..e1ca55a --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -5,4 +5,5 @@ @import "entry"; @import "menu"; @import "toolbar"; +@import "sidebar"; @import "window"; diff --git a/index.theme b/index.theme old mode 100644 new mode 100755 diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml old mode 100644 new mode 100755 diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml old mode 100644 new mode 100755 diff --git a/openbox-3/close.xbm b/openbox-3/close.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/desk.xbm b/openbox-3/desk.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/desk_toggled.xbm b/openbox-3/desk_toggled.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/iconify.xbm b/openbox-3/iconify.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/max.xbm b/openbox-3/max.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/max_toggled.xbm b/openbox-3/max_toggled.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/shade.xbm b/openbox-3/shade.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/shade_toggled.xbm b/openbox-3/shade_toggled.xbm old mode 100644 new mode 100755 diff --git a/openbox-3/themerc b/openbox-3/themerc old mode 100644 new mode 100755 diff --git a/unity/close.svg b/unity/close.svg old mode 100644 new mode 100755 diff --git a/unity/close_focused_prelight.svg b/unity/close_focused_prelight.svg old mode 100644 new mode 100755 diff --git a/unity/close_focused_pressed.svg b/unity/close_focused_pressed.svg old mode 100644 new mode 100755 diff --git a/unity/close_unfocused.svg b/unity/close_unfocused.svg old mode 100644 new mode 100755 diff --git a/unity/maximize.svg b/unity/maximize.svg old mode 100644 new mode 100755 diff --git a/unity/maximize_focused_prelight.svg b/unity/maximize_focused_prelight.svg old mode 100644 new mode 100755 diff --git a/unity/maximize_focused_pressed.svg b/unity/maximize_focused_pressed.svg old mode 100644 new mode 100755 diff --git a/unity/maximize_unfocused.svg b/unity/maximize_unfocused.svg old mode 100644 new mode 100755 diff --git a/unity/minimize.svg b/unity/minimize.svg old mode 100644 new mode 100755 diff --git a/unity/minimize_focused_prelight.svg b/unity/minimize_focused_prelight.svg old mode 100644 new mode 100755 diff --git a/unity/minimize_focused_pressed.svg b/unity/minimize_focused_pressed.svg old mode 100644 new mode 100755 diff --git a/unity/minimize_unfocused.svg b/unity/minimize_unfocused.svg old mode 100644 new mode 100755 diff --git a/unity/minimized.svg b/unity/minimized.svg old mode 100644 new mode 100755 diff --git a/unity/progress_bar_fill.svg b/unity/progress_bar_fill.svg old mode 100644 new mode 100755 diff --git a/unity/progress_bar_trough.svg b/unity/progress_bar_trough.svg old mode 100644 new mode 100755 diff --git a/unity/unmaximize.svg b/unity/unmaximize.svg old mode 100644 new mode 100755 diff --git a/unity/unmaximize_focused_prelight.svg b/unity/unmaximize_focused_prelight.svg old mode 100644 new mode 100755 diff --git a/unity/unmaximize_focused_pressed.svg b/unity/unmaximize_focused_pressed.svg old mode 100644 new mode 100755 diff --git a/unity/unmaximize_unfocused.svg b/unity/unmaximize_unfocused.svg old mode 100644 new mode 100755 diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc old mode 100644 new mode 100755 diff --git a/xfwm4/bottom-active.xpm b/xfwm4/bottom-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/bottom-inactive.xpm b/xfwm4/bottom-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/bottom-left-active.xpm b/xfwm4/bottom-left-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/bottom-left-inactive.xpm b/xfwm4/bottom-left-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/bottom-right-active.xpm b/xfwm4/bottom-right-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/bottom-right-inactive.xpm b/xfwm4/bottom-right-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/close-prelight.xpm b/xfwm4/close-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/close-pressed.png b/xfwm4/close-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/hide-active.xpm b/xfwm4/hide-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/hide-prelight.xpm b/xfwm4/hide-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/hide-pressed.png b/xfwm4/hide-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/left-active.xpm b/xfwm4/left-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/left-inactive.xpm b/xfwm4/left-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-active.xpm b/xfwm4/maximize-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-prelight.xpm b/xfwm4/maximize-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-pressed.png b/xfwm4/maximize-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-toggled-pressed.png b/xfwm4/maximize-toggled-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/menu-active.xpm b/xfwm4/menu-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/menu-inactive.xpm b/xfwm4/menu-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/menu-prelight.xpm b/xfwm4/menu-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/menu-pressed.xpm b/xfwm4/menu-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/right-active.xpm b/xfwm4/right-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/right-inactive.xpm b/xfwm4/right-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-active.xpm b/xfwm4/shade-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-inactive.xpm b/xfwm4/shade-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-pressed.png b/xfwm4/shade-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-toggled-active.xpm b/xfwm4/shade-toggled-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-toggled-inactive.xpm b/xfwm4/shade-toggled-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/shade-toggled-pressed.png b/xfwm4/shade-toggled-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-active.xpm b/xfwm4/stick-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-inactive.xpm b/xfwm4/stick-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-prelight.xpm b/xfwm4/stick-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-pressed.png b/xfwm4/stick-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-toggled-active.xpm b/xfwm4/stick-toggled-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-toggled-inactive.xpm b/xfwm4/stick-toggled-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-toggled-prelight.xpm b/xfwm4/stick-toggled-prelight.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/stick-toggled-pressed.png b/xfwm4/stick-toggled-pressed.png old mode 100644 new mode 100755 diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/themerc b/xfwm4/themerc old mode 100644 new mode 100755 diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-1-inactive.xpm b/xfwm4/title-1-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm old mode 100644 new mode 100755 diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm old mode 100644 new mode 100755 From 2d1661776f838dd4e2681a13214fb00a6d342091 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 14 Nov 2014 01:29:02 +0530 Subject: [PATCH 09/73] Add styles for grid and view --- gtk-3.0/scss/_grid.scss | 29 +++++++++++ gtk-3.0/scss/_toolbar.scss | 12 +++-- gtk-3.0/scss/_view.scss | 103 +++++++++++++++++++++++++++++++++++++ gtk-3.0/scss/_window.scss | 18 +++---- gtk-3.0/scss/widgets.scss | 2 + 5 files changed, 150 insertions(+), 14 deletions(-) create mode 100644 gtk-3.0/scss/_grid.scss create mode 100644 gtk-3.0/scss/_view.scss diff --git a/gtk-3.0/scss/_grid.scss b/gtk-3.0/scss/_grid.scss new file mode 100644 index 0000000..7975977 --- /dev/null +++ b/gtk-3.0/scss/_grid.scss @@ -0,0 +1,29 @@ +@import "functions"; + +.list { + background-color: shade($bg_color, 0.97); + color: $fg_color; + + &-row { + border: none; + border-radius: 0; + padding: 3px; + background-image: none; + background-color: transparent; + + &:hover { + background-image: none; + background-color: shade($bg_color, 1.02); + } + + &:selected { + &, &:hover, &:focus { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + } +} + +.grid-child { padding: $spacing; } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index 491a507..600bd30 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -16,20 +16,20 @@ .title { font: bold; - padding: 0 12px; + padding: 0 ($spacing * 2); } .subtitle { font: smaller; - padding: 0 12px; + padding: 0 ($spacing * 2); } .button { @include button($bg, $fg); } GtkComboBox, .button { - padding: 2px; + padding: $spacing - 1px; - &.text-button { padding: 4px; } + &.text-button { padding: $spacing; } &.image-button { padding: $spacing ($spacing - 1px) ($spacing - 1px) $spacing; } } @@ -84,10 +84,12 @@ border: none; background: none; color: mix($titlebar_fg_color, $titlebar_bg_color, 0.90); + box-shadow: none; &:hover, &:hover:focus { background: none; color: $selected_bg_color; + box-shadow: none; } &:active, &:active:hover { @@ -97,7 +99,7 @@ } &:backdrop { - background-image: none; + background: none; color: mix($titlebar_fg_color, $titlebar_bg_color, 0.60); icon-shadow: none; } diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss new file mode 100644 index 0000000..6c7b01c --- /dev/null +++ b/gtk-3.0/scss/_view.scss @@ -0,0 +1,103 @@ +@import "functions"; + +.cell { + border-width: 0; + border-radius: 0; + + &:selected, &:selected:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } +} + +row { + &:selected { + &, &:hover, &:focus { + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; + + border-width: 1px 0; + border-style: solid; + border-color: border_normal($selected_bg_color); + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + } +} + +column-header { + .button { + &, &:active { + border-width: 0 1px 1px 0; + border-radius: 0; + } + + &, &:active, &:focus, &:active:focus { + border-color: shade($base_color, 0.9); + border-bottom-color: shade($base_color, 0.8); + background-color: shade($base_color, 0.97); + background-image: none; + } + + &:hover, &:active:hover, &:hover:focus, &:active:hover:focus { + border-color: shade($base_color, 0.9); + border-bottom-color: shade($base_color, 0.8); + background-color: shade($base_color, 0.99); + background-image: none; + } + + &:last-child .button { border-width: 0 0 1px 0; } + } +} + +.content-view { + &.view { + background-color: $base_color; + + &:prelight { background-color: alpha($selected_bg_color, 0.6); } + + &:selected, &:active { background-color: $selected_bg_color; } + + &:insensitive { background-color: shade($base_color, 0.9); } + + &.check { + &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } + } + } + + .subtitle { + font: smaller; + padding: 0 12px; + } +} + +GtkIconView { + &.content-view.check { + &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } + } + + &.view.cell { + &:selected, &:selected:focus { + border-width: 1px; + border-style: solid; + border-color: border_normal($selected_bg_color); + border-radius: 2px; + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + } +} + +.rubberband { + &, &.view, &.content-view.view { + border-width: 1px; + border-style: solid; + border-color: $selected_bg_color; + border-radius: 0; + background-color: alpha($selected_bg_color, 0.3); + } +} + +GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/_window.scss index eb91653..cad2ef9 100755 --- a/gtk-3.0/scss/_window.scss +++ b/gtk-3.0/scss/_window.scss @@ -1,14 +1,14 @@ .window-frame { - border-style: none; - border-radius: 2px 2px 0 0; - box-shadow: 0 3px 7px 1px alpha(black, 0.7), + border: none; + border-radius: $roundness $roundness 0 0; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); /* this is used for the resize cursor area */ - margin: 10px; + margin: $spacing * 3; &:backdrop { - box-shadow: 0 3px 5px 1px alpha(black, 0.5), + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); } @@ -17,18 +17,18 @@ &.csd { &.popup { border-radius: 0; - box-shadow: 0 1px 2px alpha(black, 0.8), + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); } &.tooltip { - border-radius: 2px; + border-radius: $roundness; box-shadow: none; } &.message-dialog { - border-radius: 2px; - box-shadow: 0 1px 2px alpha(black, 0.8), + border-radius: $roundness; + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); } } diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index e1ca55a..a4912a2 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -6,4 +6,6 @@ @import "menu"; @import "toolbar"; @import "sidebar"; +@import "view"; +@import "grid"; @import "window"; From 608c5be890caa8677dc75a0621c68ac4c5db1a42 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 14 Nov 2014 21:43:25 +0530 Subject: [PATCH 10/73] Tweak sidebar --- gtk-3.0/scss/_sidebar.scss | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gtk-3.0/scss/_sidebar.scss b/gtk-3.0/scss/_sidebar.scss index 7584d2c..78619cd 100755 --- a/gtk-3.0/scss/_sidebar.scss +++ b/gtk-3.0/scss/_sidebar.scss @@ -6,34 +6,36 @@ color: mix($fg_color, $bg_color, 0.1); &.separator { - border-width: 1px; - border-style: solid; - border-color: shade($bg_color, 0.9); - color: shade($bg_color, 0.9); + &, &:hover, &:focus { + border-width: 1px; + border-style: solid; + border-color: shade($bg_color, 0.9); + color: shade($bg_color, 0.9); + } } } row, .view row { &:selected { &, &:hover, &:focus { - border-color: border_normal($selected_bg_color); - background-color: $selected_bg_color; + border: none; background-image: none; + background-color: $selected_bg_color; color: $selected_fg_color; } &:prelight { - border-color: border_focus($selected_bg_color); - background-color: shade($selected_bg_color, 1.05); + border: none; background-image: none; + background-color: shade($selected_bg_color, 1.05); color: $selected_fg_color; } } &:prelight { - border-color: shade($bg_color, 1.05); - background-color: shade($bg_color, 1.05); + border: none; background-image: none; + background-color: shade($bg_color, 0.95); color: $fg_color; } } From e87a3b6f4177920ce019efda06d6624d7ff0f7fb Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 14 Nov 2014 22:08:08 +0530 Subject: [PATCH 11/73] Remove border from selections --- gtk-3.0/scss/_menu.scss | 9 ++++----- gtk-3.0/scss/_toolbar.scss | 13 ++++++++----- gtk-3.0/scss/_view.scss | 8 ++------ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss index 905dc8a..3859a6f 100755 --- a/gtk-3.0/scss/_menu.scss +++ b/gtk-3.0/scss/_menu.scss @@ -35,10 +35,9 @@ GtkTreeMenu, GtkMenuToolButton, GtkComboBox { } &, .menu & { + margin: $spacing; padding: $spacing; - border-width: 1px; - border-style: solid; - border-color: transparent; + border: none; border-radius: 0; background-color: transparent; background-image: none; @@ -46,7 +45,7 @@ GtkTreeMenu, GtkMenuToolButton, GtkComboBox { -GtkMenuItem-arrow-scaling: 0.5; &:active, &:hover { - border-color: shade($selected_bg_color, .9); + border: none; background-color: $selected_bg_color; background-image: none; color: $selected_fg_color; @@ -149,4 +148,4 @@ GtkPopover { font-size: 80%; font-weight: bold; } -} \ No newline at end of file +} diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index 600bd30..0590dbd 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -82,25 +82,28 @@ .titlebutton { padding: $spacing; border: none; - background: none; - color: mix($titlebar_fg_color, $titlebar_bg_color, 0.90); + background-image: none; + background-color: transparent; + color: mix($titlebar_fg_color, $titlebar_bg_color, .1); box-shadow: none; &:hover, &:hover:focus { - background: none; + background-image: none; + background-color: transparent; color: $selected_bg_color; box-shadow: none; } &:active, &:active:hover { - background: none; + background-image: none; + background-color: transparent; color: darken($selected_bg_color, 10%); box-shadow: none; } &:backdrop { background: none; - color: mix($titlebar_fg_color, $titlebar_bg_color, 0.60); + color: mix($titlebar_fg_color, $titlebar_bg_color, .6); icon-shadow: none; } } diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index 6c7b01c..169e180 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -16,9 +16,7 @@ row { -GtkWidget-focus-padding: 1; -GtkWidget-focus-line-width: 0; - border-width: 1px 0; - border-style: solid; - border-color: border_normal($selected_bg_color); + border: none; background-color: $selected_bg_color; background-image: none; color: $selected_fg_color; @@ -79,9 +77,7 @@ GtkIconView { &.view.cell { &:selected, &:selected:focus { - border-width: 1px; - border-style: solid; - border-color: border_normal($selected_bg_color); + border: none; border-radius: 2px; background-color: $selected_bg_color; background-image: none; From c3bc33386c4e55617471e4fabab469dbd1701666 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 23 Nov 2014 22:36:45 +0530 Subject: [PATCH 12/73] Fix linked buttons and other fixes --- gtk-3.0/scss/_base.scss | 93 ++++---------------------- gtk-3.0/scss/_button.scss | 21 ++++-- gtk-3.0/scss/_entry.scss | 6 ++ gtk-3.0/scss/_functions.scss | 9 +++ gtk-3.0/scss/_grid.scss | 19 +++++- gtk-3.0/scss/_menu.scss | 11 ++++ gtk-3.0/scss/_sidebar.scss | 17 +++++ gtk-3.0/scss/_spinner.scss | 26 ++++++++ gtk-3.0/scss/_toggle.scss | 63 +++++++++++++++--- gtk-3.0/scss/_toolbar.scss | 5 ++ gtk-3.0/scss/_view.scss | 124 +++++++++++++++++++++-------------- gtk-3.0/scss/_window.scss | 8 +++ 12 files changed, 256 insertions(+), 146 deletions(-) create mode 100644 gtk-3.0/scss/_spinner.scss diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/_base.scss index 521af8f..1407017 100755 --- a/gtk-3.0/scss/_base.scss +++ b/gtk-3.0/scss/_base.scss @@ -1,6 +1,11 @@ @import "functions"; @import "global"; + +/************** + ! GTK settings +***************/ + * { -GtkArrow-arrow-scaling: 0.5; -GtkButton-child-displacement-x: 0; @@ -11,8 +16,6 @@ -GtkButton-interior-focus: true; -GtkButtonBox-child-min-height: 24; -GtkButtonBox-child-internal-pad-y: 1; - -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 14; -GtkExpander-expander-size: 8; -GtkMenu-horizontal-padding: 0; -GtkMenu-vertical-padding: 0; @@ -37,10 +40,6 @@ -GtkWindow-resize-grip-width: 0; -WnckTasklist-fade-overlay-rect: 0; - /* legacy stuff */ - -GtkWidget-focus-line-width: 1; - -GtkWidget-focus-padding: 0; - outline-color: alpha($selected_bg_color, 0.5); outline-style: dashed; outline-width: 1px; @@ -48,9 +47,11 @@ outline-radius: 2px; } -/*************** - * base states * - ***************/ + +/************* + ! Base states + *************/ + %selected_items { &, &:focus { background-color: $selected_bg_color; @@ -88,7 +89,7 @@ } .gtkstyle-fallback { - background-color: $bg_color; + background-color: alpha($bg_color, .5); color: $fg_color; &:prelight { @@ -129,75 +130,3 @@ GtkLabel { opacity: 0.5; text-shadow: none; } - -.view { - color: $text_color; - background-color: $base_color; - - &:selected { @extend %selected_items; } -} - -.rubberband { - border: 1px solid $selected_bg_color; - background-color: alpha($selected_bg_color, 0.2); -} - -/* used by GtkScrolledWindow, shown when content is touch-dragged past boundaries. */ -.overshoot { background-color: alpha($selected_bg_color, 0.2); } - -GtkAssistant { - .sidebar { - background-color: $base_color; - border-top: 1px solid border_normal($base_color); - - &:dir(ltr) { border-right: 1px solid border_normal($base_color); } - &:dir(rtl) { border-left: 1px solid border_normal($base_color); } - - GtkLabel { - padding: $spacing ($spacing * 2); - - &.highlight { background-color: mix($bg_color, $fg_color, 0.80); } - } - } - - &.csd .sidebar { border-top-style: none; } -} - -GtkTextView { - /* this will get overridden by .view, needed by gedit line numbers */ - background-color: mix($bg_color, $base_color, 0.50); -} - - -GtkFlowBox .grid-child { - padding: 3px; - border-radius: 3px; - - &:selected { - @extend %selected_items; - - outline-offset: -2px; - } -} - -/********************* - * spinner animation * - *********************/ -@keyframes spin { - to { -gtk-icon-transform: rotate(1turn); } -} - -.spinner { - background-image: none; - background-color: blue; - opacity: 0; // non spinning spinner makes no sense - - -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); - - &:active { - opacity: 1; - animation: spin 1s linear infinite; - - &:insensitive { opacity: 0.5; } - } -} diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index 8efdfdc..5546310 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -1,4 +1,10 @@ @import "functions"; +@import "global"; + + +/********* + ! Buttons +**********/ @mixin linked_button($bg, $shadow) { border: 1px solid border_normal($bg); @@ -47,7 +53,9 @@ } &:active, &:active:hover, - &:active:focus, &:active:hover:focus { + &:active:focus, &:active:hover:focus, + &:checked, &:checked:hover, + &:checked:focus, &:checked:hover:focus { box-shadow: inset -1px 0 border_active($bg), inset 1px 0 alpha($shadow, .07), inset 0 1px alpha($shadow, .08), @@ -58,9 +66,11 @@ &:last-child, &:only-child, &:insensitive:last-child, &:insensitive:only-child, - &:active *:insensitive:last-child, &:active *:insensitive:only-child { box-shadow: none; } + &:active *:insensitive:last-child, &:active *:insensitive:only-child, + &:checked *:insensitive:last-child, &:checked *:insensitive:only-child { box-shadow: none; } - &:active:last-child, &:active:only-child { + &:active:last-child, &:active:only-child, + &:checked:last-child, &:checked:only-child { box-shadow: inset 1px 0 alpha($shadow, .07), inset 0 1px alpha($shadow, .08), inset -1px 0 alpha($shadow, .07); @@ -90,9 +100,7 @@ &:checked, &:active { @include linear-gradient(shade($bg, .95)); - } - &:active { box-shadow: inset 1px 0 alpha($dark_shadow, .07), inset 0 1px alpha($dark_shadow, .08), inset -1px 0 alpha($dark_shadow, .07), @@ -106,7 +114,8 @@ box-shadow: none; } - &:active *:insensitive { + &:active *:insensitive, + &:checked *:insensitive { @include linear-gradient(shade($bg, .8)); box-shadow: none; diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss index f86563b..ce11777 100755 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/_entry.scss @@ -1,4 +1,10 @@ @import "functions"; +@import "global"; + + +/******* + ! Entry +********/ @mixin linked_entry($bg) { border-width: 1px; diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index 5d90e85..0c81dcd 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -1,5 +1,14 @@ @import "global"; +$modules: () !default; + +@mixin exports($name) { + @if (not index($modules, $name)) { + $modules: append($modules, $name) !global; + @content; + } +} + @function alpha($color, $amount) { @if type-of($color) == "color" { @return fade-out($color, (1 - $amount)); diff --git a/gtk-3.0/scss/_grid.scss b/gtk-3.0/scss/_grid.scss index 7975977..1f60beb 100644 --- a/gtk-3.0/scss/_grid.scss +++ b/gtk-3.0/scss/_grid.scss @@ -1,4 +1,10 @@ @import "functions"; +@import "global"; + + +/****************** + ! Grid and flowbox +*******************/ .list { background-color: shade($bg_color, 0.97); @@ -26,4 +32,15 @@ } } -.grid-child { padding: $spacing; } +.grid-child { + &, GtkFlowBox & { + padding: $spacing; + border-radius: $roundness; + + &:selected { + @extend %selected_items; + + outline-offset: -2px; + } + } +} diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss index 3859a6f..94c7f6d 100755 --- a/gtk-3.0/scss/_menu.scss +++ b/gtk-3.0/scss/_menu.scss @@ -1,6 +1,12 @@ @import "functions"; +@import "global"; @import "entry"; + +/****** + ! Menu +*******/ + GtkTreeMenu, GtkMenuToolButton, GtkComboBox { &.menu, .menu { background-color: $menu_bg_color; @@ -113,6 +119,11 @@ GtkTreeMenu, GtkMenuToolButton, GtkComboBox { GtkModelMenuItem GtkBox GtkImage { padding-right: $spacing; } + +/********* + ! Popover +**********/ + GtkPopover { @include border($menu_bg_color); diff --git a/gtk-3.0/scss/_sidebar.scss b/gtk-3.0/scss/_sidebar.scss index 78619cd..4cb626d 100755 --- a/gtk-3.0/scss/_sidebar.scss +++ b/gtk-3.0/scss/_sidebar.scss @@ -1,4 +1,10 @@ @import "functions"; +@import "global"; + + +/********* + ! Sidebar +**********/ .sidebar { &, &.view, & .view, & GtkScrolledWindow { @@ -51,6 +57,17 @@ background-color: $bg_color; color: mix($fg_color, $bg_color, 0.1); + &:dir(ltr) { border-width: 0 1px 0 0; } + &:dir(rtl) { border-width: 0 0 0 1px; } + + GtkLabel { + padding: $spacing ($spacing * 2); + + &.highlight { background-color: mix($bg_color, $fg_color, 0.80); } + } + + &.csd .sidebar { border-top-style: none; } + .highlight { font: bold; } } } diff --git a/gtk-3.0/scss/_spinner.scss b/gtk-3.0/scss/_spinner.scss new file mode 100644 index 0000000..f8b00e7 --- /dev/null +++ b/gtk-3.0/scss/_spinner.scss @@ -0,0 +1,26 @@ +@import "functions"; +@import "global"; + + +/******************* + ! Spinner animation +********************/ + +@keyframes spin { + to { -gtk-icon-transform: rotate(1turn); } +} + +.spinner { + background-image: none; + background-color: $selected_bg_color; + opacity: 0; // non spinning spinner makes no sense + + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + + &:active { + opacity: 1; + animation: spin 1s linear infinite; + + &:insensitive { opacity: 0.5; } + } +} diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/_toggle.scss index a3af16a..4ef007a 100755 --- a/gtk-3.0/scss/_toggle.scss +++ b/gtk-3.0/scss/_toggle.scss @@ -1,6 +1,16 @@ -/************************* - * Check and Radio items * - *************************/ +@import "functions"; +@import "global"; + + +/*********************** + ! Check and Radio items +************************/ + +* { + -GtkCheckButton-indicator-size: 16; + -GtkCheckMenuItem-indicator-size: 14; +} + @mixin toggle($type, $bg, $fg) { color: $fg; background-image: none; @@ -32,9 +42,46 @@ } -.radio { - @include toggle("radio", $bg_color, $fg_color); -} -.check { - @include toggle("checkbox", $bg_color, $fg_color); +.radio { @include toggle("radio", $bg_color, $fg_color); } + +.check { @include toggle("checkbox", $bg_color, $fg_color); } + + +/******** + ! Switch +*********/ + +GtkSwitch { + padding: 0; + border-radius: $roundness; + font: bold condensed; + outline-offset: -4px; + + &.slider { + border: 1px solid shade($bg_color, 0.8); + background-color: shade($bg_color, 1.08); + + &:insensitive { + border-color: shade($bg_color, 0.85); + background-color: shade($bg_color, 0.9); + } + } + + &.trough { + border-color: shade($bg_color, 0.8); + background-color: shade($bg_color, 0.95); + color: $fg_color; + + &:active { + border-color: shade($selected_bg_color, 0.9); + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + &:insensitive { + border-color: shade($bg_color, 0.85); + background-color: shade($bg_color, 0.9); + color: mix($fg_color, $bg_color, 0.5); + } + } } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index 0590dbd..4721a6d 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -1,6 +1,11 @@ @import "functions"; +@import "global"; @import "button"; +/********* + ! Toolbar +**********/ + @mixin toolbar($bg, $fg) { @include linear-gradient($bg); @include border($bg); diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index 169e180..5ba4ad2 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -1,4 +1,17 @@ @import "functions"; +@import "global"; + + +/*************** + ! Generic views +****************/ + +.view { + color: $text_color; + background-color: $base_color; + + &:selected { @extend %selected_items; } +} .cell { border-width: 0; @@ -24,6 +37,68 @@ row { } } +.content-view { + &.view { + background-color: $base_color; + + &:prelight { background-color: alpha($selected_bg_color, 0.6); } + + &:selected, &:active { background-color: $selected_bg_color; } + + &:insensitive { background-color: shade($base_color, 0.9); } + + &.check { + &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } + } + } + + .subtitle { + font: smaller; + padding: 0 12px; + } +} + +GtkIconView { + &.content-view.check { @extend .content-view.check; } + + &.view.cell { + &:selected, &:selected:focus { + border: none; + border-radius: 2px; + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } +} + +.rubberband { + &, &.view, &.content-view.view { + border: 1px solid $selected_bg_color; + border-radius: 0; + background-color: alpha($selected_bg_color, 0.3); + } +} + +/* used by GtkScrolledWindow, shown when content is touch-dragged past boundaries. */ +.overshoot { background-color: alpha($selected_bg_color, 0.3); } + +GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } + +/* this will get overridden by .view, needed by gedit line numbers */ +GtkTextView { background-color: mix($bg_color, $base_color, 0.50); } + +GtkDrawingArea, GtkHTML { + @extend .view; + + &:insensitive { background-color: shade($base_color, 0.9); } +} + + +/********************* + ! Column view headers +**********************/ + column-header { .button { &, &:active { @@ -48,52 +123,3 @@ column-header { &:last-child .button { border-width: 0 0 1px 0; } } } - -.content-view { - &.view { - background-color: $base_color; - - &:prelight { background-color: alpha($selected_bg_color, 0.6); } - - &:selected, &:active { background-color: $selected_bg_color; } - - &:insensitive { background-color: shade($base_color, 0.9); } - - &.check { - &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } - } - } - - .subtitle { - font: smaller; - padding: 0 12px; - } -} - -GtkIconView { - &.content-view.check { - &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } - } - - &.view.cell { - &:selected, &:selected:focus { - border: none; - border-radius: 2px; - background-color: $selected_bg_color; - background-image: none; - color: $selected_fg_color; - } - } -} - -.rubberband { - &, &.view, &.content-view.view { - border-width: 1px; - border-style: solid; - border-color: $selected_bg_color; - border-radius: 0; - background-color: alpha($selected_bg_color, 0.3); - } -} - -GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/_window.scss index cad2ef9..fc31783 100755 --- a/gtk-3.0/scss/_window.scss +++ b/gtk-3.0/scss/_window.scss @@ -1,3 +1,11 @@ +@import "functions"; +@import "global"; + + +/************** + ! Window frame +***************/ + .window-frame { border: none; border-radius: $roundness $roundness 0 0; From 9aa670d828e35187e57f48ff4096422c65876ca4 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 29 Nov 2014 18:32:31 +0530 Subject: [PATCH 13/73] Tweaked comboboxes and views --- gtk-3.0/scss/_entry.scss | 23 ++++++++++++++ gtk-3.0/scss/_menu.scss | 65 ++++++++++++++++++++++++++++++++++++++-- gtk-3.0/scss/_view.scss | 52 ++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 2 deletions(-) diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss index ce11777..d099aff 100755 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/_entry.scss @@ -73,3 +73,26 @@ } .entry { @include entry($base_color, $text_color); } + + +/****************** + ! Combobox entry * +*******************/ + +GtkComboBox.combobox-entry { + .entry { + &, &:hover, &:focus, &:active, &:insensitive { + border-width: 1px 0 1px 1px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + } + + .button { + &, &:hover, &:focus, &:active, &:insensitive { + border-width: 1px 1px 1px 1px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } + } +} diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss index 94c7f6d..44fd1bf 100755 --- a/gtk-3.0/scss/_menu.scss +++ b/gtk-3.0/scss/_menu.scss @@ -3,6 +3,38 @@ @import "entry"; +/********* + ! Menubar +**********/ + +.menubar { + -GtkWidget-window-dragging: true; + + border: none; + background-color: $menubar_bg_color; + background-image: none; + color: $menubar_fg_color; + + + &.menuitem, .menuitem { + padding: $spacing ($spacing * 2); + border: 1px solid transparent; + background-color: transparent; + background-image: none; + color: $menubar_fg_color; + + &:hover { + border-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); + background-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); + background-image: none; + color: shade($menubar_fg_color, 1.08); + } + + & *:hover { color: shade($menubar_fg_color, 1.08); } + } +} + + /****** ! Menu *******/ @@ -80,7 +112,7 @@ GtkTreeMenu, GtkMenuToolButton, GtkComboBox { } &.button { - &, &:active, &:insensitive, &:active:insensitive { + &, &:focus, &:active, &:insensitive, &:active:insensitive { background-color: transparent; background-image: none; border-color: transparent; @@ -89,7 +121,7 @@ GtkTreeMenu, GtkMenuToolButton, GtkComboBox { color: currentColor; } - &:hover, &:active:hover, &:selected { + &:hover, &:focus:hover, &:active:hover, &:selected { background-color: $selected_bg_color; background-image: none; color: $selected_fg_color; @@ -134,9 +166,16 @@ GtkPopover { border-style: solid; background-clip: border-box; background-color: $menu_bg_color; + background-image: none; color: $menu_fg_color; box-shadow: 0 2px 3px alpha(black, .5); + &.background { + background-image: none; + background-color: $menu_bg_color; + color: $menu_fg_color; + } + &:backdrop { box-shadow: none; } &.osd { @@ -160,3 +199,25 @@ GtkPopover { font-weight: bold; } } + +GtkModelButton.button { + &, &:focus, &:active, &:insensitive, &:active:insensitive { + &, &:backdrop { + background-color: transparent; + background-image: none; + border-color: transparent; + border-image: none; + border-style: none; + box-shadow: none; + color: $menu_fg_color; + } + } + + &:focus:hover, &:active:hover, &:hover, &:selected { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + border: none; + border-radius: 2px; + } +} diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index 5ba4ad2..0acc213 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -123,3 +123,55 @@ column-header { &:last-child .button { border-width: 0 0 1px 0; } } } + + +/********** + ! Frames * +***********/ + +.frame { border: none; } + +GtkScrolledWindow { + &.frame { border: 1px solid border_normal($bg_color); } + + /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ + GtkViewport.frame { border: none; } +} + + +/************* + ! Expanders * +**************/ + +GtkExpander { + padding: $spacing; + outline-offset: 1px; +} + +.expander { + color: alpha(currentColor, 0.7); + border: alpha(currentColor, 0.7); + + &:hover { + color: alpha(currentColor, 0.8); + border-color: alpha(currentColor, 0.8); + } + + &:active { + color: alpha(currentColor, 0.9); + border-color: alpha(currentColor, 0.9); + } +} + + +/******************* + ! Symbolic images * +********************/ + +.image { + color: alpha(currentColor, 0.5); + + &:hover { color: alpha(currentColor, 0.9); } + + &:selected, &:selected:hover { color: $selected_fg_color; } +} From ec000bba3fb61f4379e62506e701efbbebabb7b5 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 29 Nov 2014 18:43:30 +0530 Subject: [PATCH 14/73] More view related tweaks --- gtk-3.0/scss/_view.scss | 46 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index 0acc213..ea99496 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -10,7 +10,12 @@ color: $text_color; background-color: $base_color; - &:selected { @extend %selected_items; } + &:insensitive, &:insensitive:insensitive { + background-color: shade($base_color, 0.9); + color: mix($text_color, $base_color, 0.5); + } + + &:selected, &:selected:focus { @extend %selected_items; } } .cell { @@ -72,6 +77,16 @@ GtkIconView { } } +.dim-label { + &, &.view { color: alpha(currentColor, 0.5); } +} + +.dnd { border: 1px solid $selected_bg_color; } + +.grip { background-color: transparent; } + +.arrow { color: alpha(currentColor, 0.7); } + .rubberband { &, &.view, &.content-view.view { border: 1px solid $selected_bg_color; @@ -95,6 +110,25 @@ GtkDrawingArea, GtkHTML { } +/************ + ! Treeview * +*************/ + +GtkTreeView { + -GtkTreeView-vertical-separator: 0; + + outline-offset: -1px; + + &.dnd { border: 1px solid $selected_bg_color; } + + .entry { + border-radius: 0; + background-color: $base_color; + background-image: none; + } +} + + /********************* ! Column view headers **********************/ @@ -175,3 +209,13 @@ GtkExpander { &:selected, &:selected:hover { color: $selected_fg_color; } } + + +/****************** + ! Pane separator * +*******************/ + +.pane-separator { + background-color: $bg_color; + color: transparent; +} From c0767cd305f6a7547a4c87c18c61a52baebcafe2 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 15:29:35 +0530 Subject: [PATCH 15/73] Commit current progress --- gtk-3.0/scss/_button.scss | 20 +- gtk-3.0/scss/_global.scss | 10 +- gtk-3.0/scss/_progress.scss | 205 +++++ gtk-3.0/scss/widgets.scss | 1438 +++++++++++++++++++++++++++++++++++ 4 files changed, 1666 insertions(+), 7 deletions(-) create mode 100644 gtk-3.0/scss/_progress.scss diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index 5546310..e548bc7 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -12,7 +12,7 @@ border-right-style: none; border-left-style: none; box-shadow: inset -1px 0 border_normal($bg), - 0 1px 2px -1px alpha($dark_shadow, .3); + 0 1px 2px -1px alpha($shadow, .3); &:first-child { border-width: 1px; @@ -49,7 +49,7 @@ &:focus, &:hover { box-shadow: inset -1px 0 border_focus($bg), - 0 1px 2px -1px alpha($dark_shadow, .3); + 0 1px 2px -1px alpha($shadow, .3); } &:active, &:active:hover, @@ -121,12 +121,28 @@ box-shadow: none; } + &.flat { + color: inherit; + + &, &:hover, &:focus, + &:active, &:active:hover, &:active:focus, + &:checked, &:checked:hover, &:checked:focus { + border: none; + background-color: transparent; + background-image: none; + } + + // TODO + } + &.separator, .separator { color: shade($bg, .95); border: 1px solid currentColor; &:insensitive { color: shade($bg, .85); } } + + .linked & { @include linked_button($bg, $dark_shadow); } } .button { diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index d6f6cf7..f6bbff4 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -1,4 +1,4 @@ -/* default color scheme */ +// default color scheme $bg_color: #eee; $fg_color: #444; $base_color: #fff; @@ -8,15 +8,15 @@ $selected_fg_color: #fff; $tooltip_bg_color: #444; $tooltip_fg_color: #eee; -/* dark colors */ +// dark colors $dark_bg_color: #444; $dark_fg_color: #eee; -/* shadows */ +// shadows $dark_shadow: #000; $light_shadow: #fff; -/* misc colors used by gtk+ */ +// misc colors used by gtk+ $info_fg_color: #3986ac; $info_bg_color: #d9edf7; $warning_fg_color: #c09853; @@ -42,7 +42,7 @@ $menu_fg_color: $dark_fg_color; $menubar_bg_color: $dark_bg_color; $menubar_fg_color: $dark_fg_color; -/* widget styles */ +// widget styles $roundness: 2px; $spacing: 5px; $gradient: 0; diff --git a/gtk-3.0/scss/_progress.scss b/gtk-3.0/scss/_progress.scss new file mode 100644 index 0000000..7f3ba02 --- /dev/null +++ b/gtk-3.0/scss/_progress.scss @@ -0,0 +1,205 @@ +@import "functions"; +@import "global"; + + +/***************** + ! Progress bars * +******************/ + +* { + -GtkProgressBar-min-horizontal-bar-height: 12; + -GtkProgressBar-min-vertical-bar-width: 12; +} + +GtkProgressBar { + padding: 0; + border-radius: 2px; + font-size: smaller; + color: alpha($fg_color, 0.6); + + &.osd { + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 0; + -GtkProgressBar-min-horizontal-bar-height: 3; + } + + &.trough { + border: 1px solid shade($bg_color, 0.8); + background-color: shade($bg_color, 1.08); + background-image: none; + } +} + +.progressbar { + background-image: none; + background-color: $selected_bg_color; + border-radius: 0; + box-shadow: none; + + &.left { + border-top-left-radius: $roundness; + border-bottom-left-radius: $roundness; + } + + &.right { + border-top-right-radius: $roundness; + border-bottom-right-radius: $roundness; + } + + &.left.right { box-shadow: none; } + + &.vertical { + background-image: none; + background-color: $selected_bg_color; + + &.bottom { + border-bottom-left-radius: $roundness; + border-bottom-right-radius: $roundness; + } + + &.top { + border-top-left-radius: $roundness; + border-top-right-radius: $roundness; + } + } +} + +GtkLevelBar { + -GtkLevelBar-min-block-width: 34; + -GtkLevelBar-min-block-height: 3; + + &.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; + } +} + +.level-bar { + &.trough { + border: 1px solid shade($bg_color, 0.8); + background-color: shade($bg_color, 1.08); + background-image: none; + } + + &.fill-block { + // FIXME: it would be nice to set make fill blocks bigger, but we'd need + // :nth-child working on discrete indicators + border: 1px shade($selected_bg_color, 5%)); + background-color: $selected_bg_color; + box-shadow: 0 1px transparentize(black, 0.9); + border-radius: 1px; + &:backdrop { + border-color: $selected_bg_color; + box-shadow: none; + } + &.indicator-discrete { + &.horizontal { margin: 0 1px; } + &.vertical { margin: 1px 0; } + } + &.level-high { + border-color: darken($success_color,10%); + background-color: $success_color; + &:backdrop { border-color: $success_color; } + } + &.level-low { + border-color: darken($warning_color,10%); + background-color: $warning_color; + &:backdrop { border-color: $warning_color; }; + } + &.empty-fill-block { + background-color: transparent; + border-color: if($variant=='light', transparentize($fg_color,0.8), + transparentize($fg_color,0.9)); + box-shadow: none; + &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); } + } + } +} + +.scale { + -GtkRange-slider-width: 16; + -GtkRange-trough-border: 1; + -GtkScale-slider-length: 16; + + padding: 0; + border-width: 1px; + border-radius: 2px; + outline-offset: -1px; +} + +.scale.slider { + border-radius: 8px; + background-color: shade($bg_color, 1.08); + background-image: none; + /* we will draw the border using box shadow for now */ + box-shadow: inset 1px 0 shade($bg_color, 0.8), + inset 0 1px shade($bg_color, 0.8), + inset -1px 0 shade($bg_color, 0.8), + inset 0 -1px shade($bg_color, 0.8); +} + +.scale.slider:hover { + box-shadow: inset 1px 0 shade($bg_color, 0.7), + inset 0 1px shade($bg_color, 0.7), + inset -1px 0 shade($bg_color, 0.7), + inset 0 -1px shade($bg_color, 0.7); +} + +.scale.slider:insensitive { + background-color: shade($bg_color, 0.9); + background-image: none; + box-shadow: inset 1px 0 shade($bg_color, 0.85), + inset 0 1px shade($bg_color, 0.85), + inset -1px 0 shade($bg_color, 0.85), + inset 0 -1px shade($bg_color, 0.85); +} + +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; +} + +.scale.mark { + border-color: shade($bg_color, 0.8); +} + +.scale.trough { + margin: 7px 0; + border-color: shade($bg_color, 0.8); + border-radius: 2px; + background-color: shade($bg_color, 1.08); + background-image: none; +} + +.scale.trough.vertical { + margin: 0 7px; +} + +.menuitem .scale.highlight.left, +.scale.highlight.left { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + background-image: none; +} + +.menuitem .scale.highlight.left:hover { + border-color: shade($selected_bg_color, 0.8); + background-color: shade($selected_bg_color, 0.8); +} + +.scale.highlight.bottom { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + background-image: none; +} + +.scale.trough:insensitive, +.scale.highlight.left:insensitive { + border-color: shade($bg_color, 0.85); + background-color: shade($bg_color, 0.9); + background-image: none; +} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index a4912a2..882f861 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -1,3 +1,4 @@ +@import "functions"; @import "colors"; @import "base"; @import "button"; @@ -8,4 +9,1441 @@ @import "sidebar"; @import "view"; @import "grid"; +@import "progress"; +@import "spinner"; @import "window"; + +/*********** +* calendar * +************/ +GtkCalendar { + padding: 4px; + outline-offset: -1px; +} + +GtkCalendar:inconsistent { + color: mix($fg_color, $bg_color, 0.5); +} + +GtkCalendar.view, +GtkCalendar.header, +GtkCalendar.button, +GtkCalendar.button:hover, +GtkCalendar.button:insensitive { + border-width: 0; + background-color: transparent; + background-image: none; +} + +.highlight, +GtkCalendar.highlight { + border-width: 0; + background-color: transparent; + color: $selected_bg_color; +} + +/*********** +* infobar * +***********/ +GtkInfoBar { + border-width: 0; + border-style: none; +} + +.info { + border-width: 1px; + border-style: solid; + border-color: shade($info_bg_color, 0.8); + background-color: $info_bg_color; + background-image: none; + color: $info_fg_color; +} + +.info .button { + border-top-color: shade($info_bg_color, 0.8); + border-right-color: shade($info_bg_color, 0.72); + border-left-color: shade($info_bg_color, 0.72); + border-bottom-color: shade($info_bg_color, 0.7); + background-color: shade($info_bg_color, 1.08); + color: $info_fg_color; +} + +.info .button:hover { + border-top-color: shade($info_bg_color, 0.85); + border-right-color: shade($info_bg_color, 0.78); + border-left-color: shade($info_bg_color, 0.78); + border-bottom-color: shade($info_bg_color, 0.7); + background-color: shade($info_bg_color, 1.10); +} + +.info .button:active { + border-color: shade($info_bg_color, 0.6); + background-color: shade($info_bg_color, 0.95); +} + +.info .button:active:hover { + border-top-color: shade($info_bg_color, 0.85); + border-right-color: shade($info_bg_color, 0.78); + border-left-color: shade($info_bg_color, 0.78); + border-bottom-color: shade($info_bg_color, 0.7); +} + +.info .button.close { + color: $info_fg_color; +} + +.info .button.close:hover { + background-color: alpha(white, 0.2); +} + +.info .button.close:active { + color: $info_fg_color; + background-color: alpha(black, 0.1); +} + +.warning { + border-width: 1px; + border-style: solid; + border-color: shade($warning_bg_color, 0.8); + background-color: $warning_bg_color; + background-image: none; + color: $warning_fg_color; +} + +.warning .button { + border-top-color: shade($warning_bg_color, 0.8); + border-right-color: shade($warning_bg_color, 0.72); + border-left-color: shade($warning_bg_color, 0.72); + border-bottom-color: shade($warning_bg_color, 0.7); + background-color: shade($warning_bg_color, 1.08); + color: $warning_fg_color; +} + +.warning .button:hover { + border-top-color: shade($warning_bg_color, 0.85); + border-right-color: shade($warning_bg_color, 0.78); + border-left-color: shade($warning_bg_color, 0.78); + border-bottom-color: shade($warning_bg_color, 0.7); + background-color: shade($warning_bg_color, 1.10); +} + +.warning .button:active { + border-color: shade($warning_bg_color, 0.6); + background-color: shade($warning_bg_color, 0.95); +} + +.warning .button:active:hover { + border-top-color: shade($warning_bg_color, 0.85); + border-right-color: shade($warning_bg_color, 0.78); + border-left-color: shade($warning_bg_color, 0.78); + border-bottom-color: shade($warning_bg_color, 0.7); +} + +.warning .button.close { + color: $warning_fg_color; +} + +.warning .button.close:hover { + background-color: alpha(white, 0.2); +} + +.warning .button.close:active { + color: $warning_fg_color; + background-color: alpha(black, 0.1); +} + +.question { + border-width: 1px; + border-style: solid; + border-color: shade($question_bg_color, 0.8); + background-color: $question_bg_color; + background-image: none; + color: $question_fg_color; +} + +.question .button { + border-top-color: shade($question_bg_color, 0.8); + border-right-color: shade($question_bg_color, 0.72); + border-left-color: shade($question_bg_color, 0.72); + border-bottom-color: shade($question_bg_color, 0.7); + background-color: shade($question_bg_color, 1.08); + color: $question_fg_color; +} + +.question .button:hover { + border-top-color: shade($question_bg_color, 0.85); + border-right-color: shade($question_bg_color, 0.78); + border-left-color: shade($question_bg_color, 0.78); + border-bottom-color: shade($question_bg_color, 0.7); + background-color: shade($question_bg_color, 1.10); +} + +.question .button:active { + border-color: shade($question_bg_color, 0.6); + background-color: shade($question_bg_color, 0.95); +} + +.question .button:active:hover { + border-top-color: shade($question_bg_color, 0.85); + border-right-color: shade($question_bg_color, 0.78); + border-left-color: shade($question_bg_color, 0.78); + border-bottom-color: shade($question_bg_color, 0.7); +} + +.question .button.close { + color: $question_fg_color; +} + +.question .button.close:hover { + background-color: alpha(white, 0.2); +} + +.question .button.close:active { + color: $question_fg_color; + background-color: alpha(black, 0.1); +} + +.error { + border-width: 1px; + border-style: solid; + border-color: shade($error_bg_color, 0.8); + background-color: $error_bg_color; + background-image: none; + color: $error_fg_color; +} + +.error .button { + border-top-color: shade($error_bg_color, 0.8); + border-right-color: shade($error_bg_color, 0.72); + border-left-color: shade($error_bg_color, 0.72); + border-bottom-color: shade($error_bg_color, 0.7); + background-color: shade($error_bg_color, 1.08); + color: $error_fg_color; +} + +.error .button:hover { + border-top-color: shade($error_bg_color, 0.85); + border-right-color: shade($error_bg_color, 0.78); + border-left-color: shade($error_bg_color, 0.78); + border-bottom-color: shade($error_bg_color, 0.7); + background-color: shade($error_bg_color, 1.10); +} + +.error .button:active { + border-color: shade($error_bg_color, 0.6); + background-color: shade($error_bg_color, 0.95); +} + +.error .button:active:hover { + border-top-color: shade($error_bg_color, 0.85); + border-right-color: shade($error_bg_color, 0.78); + border-left-color: shade($error_bg_color, 0.78); + border-bottom-color: shade($error_bg_color, 0.7); +} + +.error .button.close { + color: $error_fg_color; +} + +.error .button.close:hover { + background-color: alpha(white, 0.2); +} + +.error .button.close:active { + color: $error_fg_color; + background-color: alpha(black, 0.1); +} + +/***************** +* miscellaneous * +*****************/ +.floating-bar { + border-width: 1px; + border-style: solid; + border-color: shade($bg_color, 0.8); + border-radius: 2px; + background-color: $bg_color; + background-image: none; + color: $fg_color; +} + +.floating-bar.top { + border-top-width: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +.floating-bar.right { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.floating-bar.bottom { + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.floating-bar.left { + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} + +.floating-bar .button { + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 0; + + border-style: none; + background-color: transparent; + background-image: none; +} + + + +/************ +* notebook * +************/ +.notebook { + padding: 0; + border-width: 1px 0 0 0; + border-style: solid; + border-color: shade($base_color, 0.7); + border-radius: 0; + background-color: $base_color; + background-image: none; + background-clip: border-box; + + -GtkNotebook-initial-gap: 0; + -GtkNotebook-arrow-spacing: 5; + -GtkNotebook-tab-curvature: 0; + -GtkNotebook-tab-overlap: 1; + -GtkNotebook-has-tab-gap: false; +} + +.notebook.frame { + border-width: 1px; +} + +.notebook.header { + border-width: 0; + background-color: shade($base_color, 0.85); +} + +.notebook.header.frame { + border-color: shade($base_color, 0.75); +} + +.notebook.header.frame.top { + border-width: 1px 1px 0 1px; +} + +.notebook.header.frame.right { + border-width: 1px 1px 1px 0; +} + +.notebook.header.frame.bottom { + border-width: 0 1px 1px 1px; +} + +.notebook.header.frame.left { + border-width: 1px 0 1px 1px; +} + +.notebook GtkViewport { + border-width: 0; + background-color: $base_color; + color: $text_color; +} + +.notebook tab { + padding: 4px 6px; + border-style: solid; + border-width: 1px; + border-color: transparent; + background-color: transparent; + background-image: none; +} + +.notebook tab:active { + background-color: transparent; + background-image: none; +} + +.notebook tab.top { + border-bottom-width: 2px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.notebook tab.top:hover { + border-bottom-color: alpha($selected_bg_color, 0.3); +} + +.notebook tab.top:active { + border-bottom-color: $selected_bg_color; +} + +.notebook tab.right { + border-left-width: 2px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} + +.notebook tab.right:hover { + border-left-color: alpha($selected_bg_color, 0.3); +} + +.notebook tab.right:active { + border-left-color: $selected_bg_color; +} + +.notebook tab.bottom { + border-top-width: 2px; + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +.notebook tab.bottom:hover { + border-top-color: alpha($selected_bg_color, 0.3); +} + +.notebook tab.bottom:active { + border-top-color: $selected_bg_color; +} + +.notebook tab.left { + border-right-width: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.notebook tab.left:hover { + border-right-color: alpha($selected_bg_color, 0.3); +} + +.notebook tab.left:active { + border-right-color: $selected_bg_color; +} + +.notebook tab GtkLabel { + color: mix($text_color, $base_color, 0.3); +} + +.notebook .prelight-page, +.notebook .prelight-page GtkLabel { + color: mix($text_color, $base_color, 0.15); +} + +.notebook .active-page, +.notebook .active-page GtkLabel { + color: $text_color; +} + +.notebook tab.reorderable-page:hover { + background-color: shade($base_color, 0.85); + border-left: 0; + border-right: 0; + /* using box shadows instead of borders due to slanted edges */ + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); +} + +.notebook tab.reorderable-page:active { + background-color: shade($base_color, 0.90); + border-left: 0; + border-right: 0; + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); +} + +/* close button styling */ +.notebook tab .button, +.notebook tab .button:active, +.notebook tab .button:hover { + padding: 1px; + border-width: 1px; + border-radius: 2px; + border-style: solid; + border-color: transparent; + background-image: none; + background-color: transparent; + color: mix($text_color, $base_color, 0.5); +} + +.notebook tab .button:hover { + color: $text_color; + border-color: shade($base_color, 0.8); +} + +.notebook tab .button:active, +.notebook tab .button:active:hover { + border-color: shade($base_color, 0.7); + background-color: shade($base_color, 0.95); +} + + + +/************* +* scrollbar * +*************/ +.scrollbar { + border-width: 1px; + border-style: solid; + padding: 0; +} + +.scrollbars-junction, +.scrollbar.trough { + border-width: 0; + border-radius: 0; + background-color: $bg_color; + background-image: none; +} + +.scrollbar.button, +.scrollbar.button:active, +.scrollbar.button:active:hover { + border-width: 0; + border-radius: 0; + background-color: transparent; + background-image: none; + color: shade($bg_color, 0.6); +} + +.scrollbar.slider { + border-width: 1px; + border-color: mix(shade($bg_color, 0.87), $fg_color, 0.21); + border-radius: 0; + background-color: mix($bg_color, $fg_color, 0.21); +} + +.scrollbar.slider:hover, +.scrollbar.slider.vertical:hover { + border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31); + background-color: mix($bg_color, $fg_color, 0.31); +} + +.scrollbar.slider:active, +.scrollbar.slider.vertical:active { + border-color: shade($selected_bg_color, 0.9); + background-color: $selected_bg_color; +} + +.scrollbar.slider.fine-tune:prelight:active { + border-width: 2px; + border-color: transparent; +} + +/* overlay scrollbar */ +OsThumb { + color: shade($bg_color, 0.7); +} + +OsThumb:selected, +OsScrollbar:selected { + background-color: $selected_bg_color; +} + +OsThumb:active, +OsScrollbar:active { + background-color: $selected_bg_color; +} + +OsThumb:insensitive, +OsScrollbar:insensitive { + background-color: shade($bg_color, 0.9); +} + +/************* +* separator * +*************/ +.view.separator, +.separator { + border-width: 1px; + border-style: solid; + border-color: shade($bg_color, 0.9); + color: shade($bg_color, 0.9); +} + +.button .separator, +.button.separator { + border-color: shade($bg_color, 0.95); +} + +.button .separator:insensitive, +.button.separator:insensitive { + border-color: shade($bg_color, 0.85); +} + +.primary-toolbar GtkSeparatorToolItem, +.primary-toolbar .separator, +.primary-toolbar .separator:insensitive, +.toolbar GtkSeparatorToolItem, +.toolbar .separator, +.toolbar .separator:insensitive { + -GtkWidget-window-dragging: true; + + border-color: shade($toolbar_bg_color, 0.95); + color: shade($toolbar_bg_color, 0.95); +} + +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive, +.titlebar GtkSeparatorToolItem, +.titlebar .separator, +.titlebar .separator:insensitive { + -GtkWidget-window-dragging: true; + + border-color: shade($titlebar_bg_color, 0.95); + color: shade($titlebar_bg_color, 0.95); +} + +.primary-toolbar .button .separator, +.primary-toolbar .button.separator, +.toolbar .button .separator, +.toolbar .button.separator { + border-color: shade($toolbar_bg_color, 0.95); +} + +.header-bar .button .separator, +.header-bar .button.separator, +.titlebar .button .separator, +.titlebar .button.separator { + border-color: shade($titlebar_bg_color, 0.95); +} + +.primary-toolbar .button .separator:insensitive, +.primary-toolbar .button.separator:insensitive, +.toolbar .button .separator:insensitive, +.toolbar .button.separator:insensitive { + border-color: shade($toolbar_bg_color, 0.85); +} + +.header-bar .button .separator:insensitive, +.header-bar .button.separator:insensitive, +.titlebar .button .separator:insensitive, +.titlebar .button.separator:insensitive { + border-color: shade($titlebar_bg_color, 0.85); +} + +.menuitem.separator { + -GtkMenuItem-horizontal-padding: 0; + -GtkWidget-separator-height: 1; + + border-style: none; + color: shade($menu_bg_color, 0.9); +} + +GtkComboBox .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; + + border-style: none; +} + +/************** +* spinbutton * +**************/ +.spinbutton .button { + color: mix($text_color, $base_color, 0.4); + padding: 2px 4px; + border-width: 0; + border-radius: 0; + border-style: none; + background-color: transparent; + background-image: none; + box-shadow: inset 1px 0 shade($base_color, 0.9); +} + +.spinbutton .button:insensitive { + color: mix($text_color, $base_color, 0.7); + box-shadow: inset 1px 0 shade($bg_color, 0.95); +} + +.spinbutton .button:active, +.spinbutton .button:hover { + color: $fg_color; +} + +.spinbutton .button:first-child { + border-radius: 2px 0 0 2px; + box-shadow: none; +} + +.spinbutton .button:last-child { + border-radius: 0 2px 2px 0; +} + +.spinbutton .button:dir(rtl) { + box-shadow: inset -1px 0 shade($base_color, 0.9); +} + +.spinbutton.vertical .button { + border-width: 1px; + border-style: solid; + border-color: shade($bg_color, 0.8); + border-radius: 2px; + background-color: shade($bg_color, 1.08); + background-image: none; + color: $fg_color; + box-shadow: none; +} + +.spinbutton.vertical .button:hover { + border-color: shade($bg_color, 0.7); + background-color: shade($bg_color, 1.10); + background-image: none; +} + +.spinbutton.vertical .button:active { + border-color: shade($bg_color, 0.8); + background-color: shade($bg_color, 0.95); + background-image: none; +} + +.spinbutton.vertical .button:active:hover { + border-color: shade($bg_color, 0.7); +} + +.spinbutton.vertical .button:focus, +.spinbutton.vertical .button:hover:focus, +.spinbutton.vertical .button:active:focus, +.spinbutton.vertical .button:active:hover:focus { + border-color: shade($bg_color, 0.7); +} + +.spinbutton.vertical .button:insensitive { + border-color: shade($bg_color, 0.85); + background-color: shade($bg_color, 0.9); + background-image: none; +} + +.spinbutton.vertical .button:first-child { + border-width: 1px; + border-bottom-width: 0; + border-radius: 2px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.spinbutton.vertical .button:last-child { + border-width: 1px; + border-top-width: 0; + border-radius: 2px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +.spinbutton.vertical.entry { + border-width: 1px; + border-style: solid; + border-radius: 0; +} + + +/************* +* statusbar * +*************/ +GtkStatusbar { + padding: 4px; + color: $fg_color; +} + +/***************** +* color chooser * +*****************/ +GtkColorSwatch, +GtkColorSwatch:selected { + border-width: 1px; + border-style: solid; + border-color: alpha(black, 0.1); + border-radius: 1px; + background-color: transparent; + background-clip: border-box; +} + +GtkColorSwatch:hover, +GtkColorSwatch:selected:hover { + border-color: alpha(black, 0.3); +} + +GtkColorSwatch.color-dark:hover { +} + +GtkColorSwatch.color-light:hover { +} + +GtkColorSwatch.color-light:selected:hover, +GtkColorSwatch.color-dark:selected:hover { + background-image: none; +} + +GtkColorSwatch.left, +GtkColorSwatch:first-child { + border-top-left-radius: 2px; + border-bottom-left-radius: 2px; +} + +GtkColorSwatch.right, +GtkColorSwatch:last-child { + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; +} + +GtkColorSwatch:only-child { + border-radius: 2px; +} + +GtkColorSwatch.top { + border-top-left-radius: 2px; + border-top-right-radius: 2px; +} + +GtkColorSwatch.bottom { + border-bottom-left-radius: 2px; + border-bottom-right-radius: 2px; +} + +GtkColorChooserWidget #add-color-button { + background-clip: padding-box; + border-color: alpha(black, 0.1); + background-color: shade($bg_color, 0.95); + color: $fg_color; +} + +GtkColorChooserWidget #add-color-button:hover { + border-color: alpha(black, 0.3); + background-color: shade($bg_color, 0.90); + color: $fg_color; +} + +.color-active-badge, +.color-active-badge:selected { + border-width: 1px; + border-style: solid; + border-width: 2px; + background-color: transparent; +} + +.color-active-badge.color-light, +.color-active-badge.color-light:hover { + border-color: alpha(black, 0.3); + color: alpha(black, 0.3); +} + +.color-active-badge.color-dark, +.color-active-badge.color-dark:hover { + border-color: alpha(white, 0.3); + color: alpha(white, 0.3); +} + +GtkColorEditor GtkColorSwatch { + border-radius: 2px; +} + +GtkColorEditor GtkColorSwatch.color-dark:hover, +GtkColorEditor GtkColorSwatch.color-light:hover { + background-image: none; + border-color: alpha(black, 0.3); +} + +GtkColorButton.button { + padding: 2px; +} + +/*********** +* tooltip * +***********/ +.tooltip { + border-width: 1px; + border-style: solid; + border-color: shade($tooltip_bg_color, 0.8); + border-radius: 2px; + background-color: $tooltip_bg_color; + background-image: none; + color: $tooltip_fg_color; +} + +.tooltip * { + background-color: transparent; +} + + + +/************** +* action-bar * +**************/ +.action-bar { + padding: 4px; + border-width: 1px 0 0 0; + border-style: solid; + border-color: shade($bg_color, 0.8); + background-color: $bg_color; + background-image: none; + color: $fg_color; +} + +.action-bar .button.text-button { + padding: 4px; +} + +.action-bar .button.image-button { + padding: 6px; +} + +.action-bar .title { + font: bold; + padding: 0 12px; +} + +.action-bar .subtitle { + font: smaller; + padding: 0 12px; +} + +/*************** +* search bars * +***************/ +.search-bar { + border-width: 0 0 1px 0; + border-style: solid; + border-color: shade($bg_color, 0.8); + background-color: shade($bg_color, 0.98); +} + +.search-bar .button.close-button { + padding: 4px; +} + +/*********** +* dialogs * +***********/ +GtkMessageDialog, +.prompt { + -GtkDialog-content-area-border: 0; + -GtkDialog-action-area-border: 0; + -GtkDialog-button-spacing: 0; + + margin: 0; + padding: 0; +} + +/******************** +* various choosers * +********************/ +GtkFontButton .separator, +GtkFileChooserButton .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; +} + +GtkFontButton GtkLabel:last-child { + color: alpha(currentColor, 0.7); +} + +GtkFileChooserButton GtkImage:last-child { + color: alpha(currentColor, 0.7); +} + +GtkFileChooser .pane-separator, +GtkFileChooser .pane-separator:hover { + border-width: 0 1px 0 0; + border-style: solid; + border-color: shade($bg_color, 0.8); + background-color: $bg_color; + color: shade($bg_color, 0.9); +} + +/* for fallback when header bar not used */ +GtkFileChooser .dialog-action-box { + border-width: 1px 0 0; + border-style: solid; + border-color: shade($bg_color, 0.7); +} + +/********************* +* app notifications * +*********************/ +.app-notification { + border-style: solid; + border-color: shade($base_color, 0.8); + border-width: 0 1px 1px 1px; + border-radius: 0 0 2px 2px; + padding: 8px; + background-color: $base_color; + background-image: none; + color: $text_color; +} + +/******* +* osd * +*******/ +//.background.osd { +// color: $osd_fg; +// background-color: $osd_bg; +//} +// +//GtkOverlay.osd { +// background-color: transparent; +//} +// +//.osd.frame { +// background-clip: border-box; +// background-origin: border-box; +//} +// +//.osd.button, +//.osd .button { +// padding: 4px; +// border-width: 1px; +// border-style: solid; +// border-color: shade($osd_bg, 0.8); +// border-radius: 2px; +// background-color: shade($osd_bg, 1.08); +// background-image: none; +// color: $osd_fg; +//} +// +//.osd.button:prelight, +//.osd.button:hover, +//.osd .button:hover { +// border-color: shade($osd_bg, 0.7); +// background-color: shade($osd_bg, 1.10); +// background-image: none; +//} +// +//.osd.button:active, +//.osd .button:active, +//.osd GtkMenuButton.button:active { +// border-color: shade($osd_bg, 0.8); +// background-color: shade($osd_bg, 0.95); +// background-image: none; +//} +// +//.osd.button:active:hover, +//.osd .button:active:hover, +//.osd GtkMenuButton.button:active:hover { +// border-color: shade($osd_bg, 0.7); +//} +// +//.osd.button:insensitive, +//.osd .button:insensitive { +// border-color: shade($osd_bg, 0.85); +// background-color: shade($osd_bg, 0.9); +// background-image: none; +//} +// +//.osd.button:active *:insensitive, +//.osd .button:active *:insensitive { +// background-color: shade($osd_bg, 0.80); +// background-image: none; +//} +// +//.osd.toolbar { +// -GtkToolbar-button-relief: normal; +// +// padding: 4px; +// border-width: 1px; +// border-style: solid; +// border-radius: 2px; +// border-color: shade($osd_bg, 0.8); +// background-color: $osd_bg; +// background-image: none; +// color: $osd_fg; +//} +// +//.osd.toolbar .button { +// padding: 4px; +// border-width: 1px; +// border-style: solid; +// border-color: shade($osd_bg, 0.8); +// border-radius: 2px; +// background-color: shade($osd_bg, 1.08); +// background-image: none; +// color: $osd_fg; +//} +// +//.osd.toolbar .button:hover { +// border-color: shade($osd_bg, 0.7); +// background-color: shade($osd_bg, 1.10); +// background-image: none; +//} +// +//.osd.toolbar .button:active { +// border-color: shade($osd_bg, 0.8); +// background-color: shade($osd_bg, 0.95); +// background-image: none; +//} +// +//.osd.toolbar .button:active:hover { +// border-color: shade($osd_bg, 0.7); +//} +// +//.osd.toolbar .button:focus, +//.osd.toolbar .button:hover:focus, +//.osd.toolbar .button:active:focus, +//.osd.toolbar .button:active:hover:focus { +// border-color: shade($osd_bg, 0.7); +//} +// +//.osd.toolbar .button:insensitive { +// border-color: shade($osd_bg, 0.85); +// background-color: shade($osd_bg, 0.9); +// background-image: none; +//} +// +//.osd.toolbar .button:active *:insensitive { +// border-color: shade($osd_bg, 0.75); +// background-color: shade($osd_bg, 0.80); +// background-image: none; +//} +// +//.osd.toolbar .button:first-child { +// border-radius: 2px 0 0 2px; +// border-width: 1px 0 1px 1px; +// box-shadow: inset -1px 0 shade($osd_bg, 0.9); +//} +// +//.osd.toolbar .button:last-child { +// box-shadow: none; +// border-radius: 0 2px 2px 0; +// border-width: 1px 1px 1px 0; +//} +// +//.osd.toolbar .button:only-child, +//.osd.toolbar GtkToolButton .button, +//.osd.toolbar GtkToolButton:only-child .button, +//.osd.toolbar GtkToolButton:last-child .button, +//.osd.toolbar GtkToolButton:first-child .button { +// border-width: 1px; +// border-radius: 2px; +// border-style: solid; +//} +// +//.osd.toolbar .separator { +// color: shade($osd_bg, 0.9); +//} +// +///* used by gnome-settings-daemon's media-keys OSD */ +//.osd.trough { +// background-color: shade($osd_bg, 0.8); +//} +// +//.osd.progressbar { +// background-color: $osd_fg; +//} +// +//.osd .scale.slider { +// background-color: shade($osd_bg, 1.08); +// background-image: none; +// /* we will draw the border using box shadow for now */ +// box-shadow: inset 1px 0 shade($osd_bg, 0.8), +// inset 0 1px shade($osd_bg, 0.8), +// inset -1px 0 shade($osd_bg, 0.8), +// inset 0 -1px shade($osd_bg, 0.8); +//} +// +//.osd .scale.slider:hover { +// box-shadow: inset 1px 0 shade($osd_bg, 0.7), +// inset 0 1px shade($osd_bg, 0.7), +// inset -1px 0 shade($osd_bg, 0.7), +// inset 0 -1px shade($osd_bg, 0.7); +//} +// +//.osd .scale.slider:insensitive { +// background-color: shade($osd_bg, 0.9); +// background-image: none; +// box-shadow: inset 1px 0 shade($osd_bg, 0.85), +// inset 0 1px shade($osd_bg, 0.85), +// inset -1px 0 shade($osd_bg, 0.85), +// inset 0 -1px shade($osd_bg, 0.85); +//} +// +//.osd .scale.trough { +// border-color: shade($osd_bg, 0.8); +// background-color: shade($osd_bg, 1.08); +// background-image: none; +//} +// +//.osd .scale.trough.highlight { +// border-color: $selected_bg_color; +// background-color: $selected_bg_color; +// background-image: none; +//} +// +//.osd .scale.trough:insensitive, +//.osd .scale.trough.highlight:insensitive { +// border-color: shade($osd_bg, 0.85); +// background-color: shade($osd_bg, 0.9); +// background-image: none; +//} +// +//.osd GtkProgressBar, +//GtkProgressBar.osd { +// -GtkProgressBar-xspacing: 0; +// -GtkProgressBar-yspacing: 2px; +// -GtkProgressBar-min-horizontal-bar-height: 2px; +// +// padding: 0; +//} +// +//.osd GtkProgressBar.trough, +//GtkProgressBar.osd.trough { +// padding: 0; +// border-style: none; +// border-radius: 0; +// background-image: none; +// background-color: transparent; +//} +// +//.osd GtkProgressBar.progressbar, +//GtkProgressBar.osd.progressbar { +// border-style: none; +// border-radius: 0; +// background-color: $selected_bg_color; +// background-image: none; +//} +// +//.osd .view, +//.osd.view { +// background-color: $osd_base; +//} +// +//.osd .scrollbar.trough { +// background-color: $osd_bg; +//} +// +//.osd .scrollbar.slider { +// border-width: 1px; +// border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.21); +// border-radius: 0; +// background-color: mix($osd_base, $osd_fg, 0.21); +//} +// +//.osd .scrollbar.slider:hover { +// border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31); +// background-color: mix($osd_base, $osd_fg, 0.31); +//} +// +//.osd .scrollbar.slider:active { +// border-color: shade($selected_bg_color, 0.9); +// background-color: $selected_bg_color; +//} +// +//.osd GtkIconView.cell:selected, +//.osd GtkIconView.cell:selected:focus { +// background-color: transparent; +// border-style: solid; +// border-radius: 2px; +// border-width: 3px; +// border-color: $osd_fg; +// outline-color: transparent; +//} +// +///* used by Documents */ +//.osd .page-thumbnail { +// border-style: solid; +// border-width: 1px; +// border-color: shade($osd_bg, 0.9); +// /* when there's no pixbuf yet */ +// background-color: $osd_bg; +//} + +/****************************** +* destructive action buttons * +******************************/ +.destructive-action.button { + border-width: 1px; + border-style: solid; + border-color: shade($error_color, 0.8); + border-radius: 2px; + background-color: $error_color; + background-image: none; + color: mix($selected_fg_color, $error_color, 0.1); +} + +.destructive-action.button:hover { + border-color: shade($error_color, 0.7); + background-color: shade($error_color, 1.12); + background-image: none; +} + +.destructive-action.button:active { + border-color: shade($error_color, 0.8); + background-color: shade($error_color, 0.87); + background-image: none; +} + +.destructive-action.button:hover:active { + border-color: shade($error_color, 0.7); +} + +/****************************** +* suggested action buttons * +******************************/ +.suggested-action.button { + border-width: 1px; + border-style: solid; + border-color: shade($selected_bg_color, 0.9); + border-radius: 2px; + background-color: shade($selected_bg_color, 1.18); + background-image: none; + color: mix($selected_fg_color, $selected_bg_color, 0.1); +} + +.suggested-action.button:hover { + border-color: shade($selected_bg_color, 0.8); + background-color: shade($selected_bg_color, 1.20); + background-image: none; +} + +.suggested-action.button:active { + border-color: shade($selected_bg_color, 0.9); + background-color: shade($selected_bg_color, 1.05); + background-image: none; +} + +.suggested-action.button:hover:active { + border-color: shade($selected_bg_color, 0.8); +} + +/****************** +* selection mode * +******************/ +.selection-mode.header-bar, +.selection-mode.toolbar { + border-style: solid; + border-color: $selected_bg_color; + background-color: shade($selected_bg_color, 1.6); + background-image: none; + color: $selected_bg_color; +} + +.selection-mode.header-bar { + border-top-color: shade($selected_bg_color, 1.6); + border-bottom-color: $selected_bg_color; +} + +.selection-mode.toolbar { + padding: 4px; +} + +/* regular button */ +.selection-mode.header-bar .button, +.selection-mode.toolbar .button, +.selection-mode.toolbar GtkToolButton .button { + border-width: 1px; + border-style: solid; + border-color: $selected_bg_color; + border-radius: 2px; + background-color: shade($selected_bg_color, 1.68); + background-image: none; + color: shade($selected_bg_color, 0.8); +} + +.selection-mode.header-bar .button:hover, +.selection-mode.toolbar .button:hover, +.selection-mode.toolbar GtkToolButton .button:hover { + border-color: shade($selected_bg_color, 0.9); + background-color: shade($selected_bg_color, 1.70); + background-image: none; +} + +.selection-mode.header-bar .button:active, +.selection-mode.toolbar .button:active, +.selection-mode.toolbar GtkToolButton .button:active { + border-color: shade($selected_bg_color, 0.9); + background-color: shade($selected_bg_color, 1.55); + background-image: none; +} + +.selection-mode.header-bar .button:hover:active, +.selection-mode.toolbar .button:hover:active, +.selection-mode.toolbar GtkToolButton .button:hover:active { + border-color: shade($selected_bg_color, 0.8); +} + +/* suggested button */ +.selection-mode.header-bar .suggested-action.button, +.selection-mode.toolbar .suggested-action.button, +.selection-mode.toolbar GtkToolButton.suggested-action .button { + border-width: 1px; + border-style: solid; + border-color: shade($selected_bg_color, 0.9); + border-radius: 2px; + background-color: shade($selected_bg_color, 1.18); + background-image: none; + color: mix($selected_fg_color, $selected_bg_color, 0.1); +} + +.selection-mode.header-bar .suggested-action.button:hover, +.selection-mode.toolbar .suggested-action.button:hover, +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover { + border-color: shade($selected_bg_color, 0.8); + background-color: shade($selected_bg_color, 1.20); + background-image: none; +} + +.selection-mode.header-bar .suggested-action.button:active, +.selection-mode.toolbar .suggested-action.button:active, +.selection-mode.toolbar GtkToolButton.suggested-action:active { + border-color: shade($selected_bg_color, 0.9); + background-color: shade($selected_bg_color, 1.05); + background-image: none; +} + +.selection-mode.header-bar .suggested-action.button:hover:active, +.selection-mode.toolbar .suggested-action.button:hover:active, +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active { + border-color: shade($selected_bg_color, 0.8); +} + +/* menu button */ +.selection-mode.header-bar .selection-menu.button, +.selection-mode.toolbar .selection-menu.button { + border-style: none; + background-color: transparent; + background-image: none; + color: shade($selected_bg_color, 0.8); +} + +.selection-mode.toolbar .dim-label, +.selection-mode.toolbar .selection-menu.button .dim-label { + color: shade($selected_bg_color, 0.7); +} + +.selection-mode.header-bar .selection-menu.button:hover, +.selection-mode.toolbar .dim-label:hover, +.selection-mode.toolbar .selection-menu.button:hover, +.selection-mode.toolbar .selection-menu.button .dim-label:hover { + color: shade($selected_bg_color, 0.7); +} + +.selection-mode.header-bar .selection-menu.button:active, +.selection-mode.toolbar .selection-menu.button:active { + color: shade($selected_bg_color, 0.8); + box-shadow: none; +} + +/************************* +* touch text selections * +*************************/ +GtkBubbleWindow { + border-radius: 2px; + background-clip: border-box; +} + +GtkBubbleWindow.osd.background { + // background-color: $osd_bg; +} + +GtkBubbleWindow .toolbar { + background-color: transparent; +} From aaac3654c61ecd78920c273b3c9710b22b86eedc Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 15:33:34 +0530 Subject: [PATCH 16/73] Commented out progressbar stuff --- gtk-3.0/scss/_progress.scss | 258 ++++++++++++++++++------------------ 1 file changed, 129 insertions(+), 129 deletions(-) diff --git a/gtk-3.0/scss/_progress.scss b/gtk-3.0/scss/_progress.scss index 7f3ba02..6b72a09 100644 --- a/gtk-3.0/scss/_progress.scss +++ b/gtk-3.0/scss/_progress.scss @@ -74,132 +74,132 @@ GtkLevelBar { } } -.level-bar { - &.trough { - border: 1px solid shade($bg_color, 0.8); - background-color: shade($bg_color, 1.08); - background-image: none; - } - - &.fill-block { - // FIXME: it would be nice to set make fill blocks bigger, but we'd need - // :nth-child working on discrete indicators - border: 1px shade($selected_bg_color, 5%)); - background-color: $selected_bg_color; - box-shadow: 0 1px transparentize(black, 0.9); - border-radius: 1px; - &:backdrop { - border-color: $selected_bg_color; - box-shadow: none; - } - &.indicator-discrete { - &.horizontal { margin: 0 1px; } - &.vertical { margin: 1px 0; } - } - &.level-high { - border-color: darken($success_color,10%); - background-color: $success_color; - &:backdrop { border-color: $success_color; } - } - &.level-low { - border-color: darken($warning_color,10%); - background-color: $warning_color; - &:backdrop { border-color: $warning_color; }; - } - &.empty-fill-block { - background-color: transparent; - border-color: if($variant=='light', transparentize($fg_color,0.8), - transparentize($fg_color,0.9)); - box-shadow: none; - &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); } - } - } -} - -.scale { - -GtkRange-slider-width: 16; - -GtkRange-trough-border: 1; - -GtkScale-slider-length: 16; - - padding: 0; - border-width: 1px; - border-radius: 2px; - outline-offset: -1px; -} - -.scale.slider { - border-radius: 8px; - background-color: shade($bg_color, 1.08); - background-image: none; - /* we will draw the border using box shadow for now */ - box-shadow: inset 1px 0 shade($bg_color, 0.8), - inset 0 1px shade($bg_color, 0.8), - inset -1px 0 shade($bg_color, 0.8), - inset 0 -1px shade($bg_color, 0.8); -} - -.scale.slider:hover { - box-shadow: inset 1px 0 shade($bg_color, 0.7), - inset 0 1px shade($bg_color, 0.7), - inset -1px 0 shade($bg_color, 0.7), - inset 0 -1px shade($bg_color, 0.7); -} - -.scale.slider:insensitive { - background-color: shade($bg_color, 0.9); - background-image: none; - box-shadow: inset 1px 0 shade($bg_color, 0.85), - inset 0 1px shade($bg_color, 0.85), - inset -1px 0 shade($bg_color, 0.85), - inset 0 -1px shade($bg_color, 0.85); -} - -.scale.slider.fine-tune:active, -.scale.slider.fine-tune:active:hover, -.scale.slider.fine-tune.horizontal:active, -.scale.slider.fine-tune.horizontal:active:hover { - background-size: 50%; - background-repeat: no-repeat; - background-position: center; -} - -.scale.mark { - border-color: shade($bg_color, 0.8); -} - -.scale.trough { - margin: 7px 0; - border-color: shade($bg_color, 0.8); - border-radius: 2px; - background-color: shade($bg_color, 1.08); - background-image: none; -} - -.scale.trough.vertical { - margin: 0 7px; -} - -.menuitem .scale.highlight.left, -.scale.highlight.left { - border-color: $selected_bg_color; - background-color: $selected_bg_color; - background-image: none; -} - -.menuitem .scale.highlight.left:hover { - border-color: shade($selected_bg_color, 0.8); - background-color: shade($selected_bg_color, 0.8); -} - -.scale.highlight.bottom { - border-color: $selected_bg_color; - background-color: $selected_bg_color; - background-image: none; -} - -.scale.trough:insensitive, -.scale.highlight.left:insensitive { - border-color: shade($bg_color, 0.85); - background-color: shade($bg_color, 0.9); - background-image: none; -} +// TODO all stuff below +//.level-bar { +// &.trough { +// border: 1px solid shade($bg_color, 0.8); +// background-color: shade($bg_color, 1.08); +// background-image: none; +// } +// +// &.fill-block { +// // FIXME: it would be nice to set make fill blocks bigger, but we'd need +// // :nth-child working on discrete indicators +// border: 1px shade($selected_bg_color, 5%); +// background-color: $selected_bg_color; +// box-shadow: 0 1px transparentize(black, 0.9); +// border-radius: 1px; +// &:backdrop { +// border-color: $selected_bg_color; +// box-shadow: none; +// } +// &.indicator-discrete { +// &.horizontal { margin: 0 1px; } +// &.vertical { margin: 1px 0; } +// } +// &.level-high { +// border-color: darken($success_color,10%); +// background-color: $success_color; +// &:backdrop { border-color: $success_color; } +// } +// &.level-low { +// border-color: darken($warning_color,10%); +// background-color: $warning_color; +// &:backdrop { border-color: $warning_color; }; +// } +// &.empty-fill-block { +// background-color: transparent; +// border-color: transparentize($fg_color,0.9); +// box-shadow: none; +// &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); } +// } +// } +//} +// +//.scale { +// -GtkRange-slider-width: 16; +// -GtkRange-trough-border: 1; +// -GtkScale-slider-length: 16; +// +// padding: 0; +// border-width: 1px; +// border-radius: 2px; +// outline-offset: -1px; +//} +// +//.scale.slider { +// border-radius: 8px; +// background-color: shade($bg_color, 1.08); +// background-image: none; +// /* we will draw the border using box shadow for now */ +// box-shadow: inset 1px 0 shade($bg_color, 0.8), +// inset 0 1px shade($bg_color, 0.8), +// inset -1px 0 shade($bg_color, 0.8), +// inset 0 -1px shade($bg_color, 0.8); +//} +// +//.scale.slider:hover { +// box-shadow: inset 1px 0 shade($bg_color, 0.7), +// inset 0 1px shade($bg_color, 0.7), +// inset -1px 0 shade($bg_color, 0.7), +// inset 0 -1px shade($bg_color, 0.7); +//} +// +//.scale.slider:insensitive { +// background-color: shade($bg_color, 0.9); +// background-image: none; +// box-shadow: inset 1px 0 shade($bg_color, 0.85), +// inset 0 1px shade($bg_color, 0.85), +// inset -1px 0 shade($bg_color, 0.85), +// inset 0 -1px shade($bg_color, 0.85); +//} +// +//.scale.slider.fine-tune:active, +//.scale.slider.fine-tune:active:hover, +//.scale.slider.fine-tune.horizontal:active, +//.scale.slider.fine-tune.horizontal:active:hover { +// background-size: 50%; +// background-repeat: no-repeat; +// background-position: center; +//} +// +//.scale.mark { +// border-color: shade($bg_color, 0.8); +//} +// +//.scale.trough { +// margin: 7px 0; +// border-color: shade($bg_color, 0.8); +// border-radius: 2px; +// background-color: shade($bg_color, 1.08); +// background-image: none; +//} +// +//.scale.trough.vertical { +// margin: 0 7px; +//} +// +//.menuitem .scale.highlight.left, +//.scale.highlight.left { +// border-color: $selected_bg_color; +// background-color: $selected_bg_color; +// background-image: none; +//} +// +//.menuitem .scale.highlight.left:hover { +// border-color: shade($selected_bg_color, 0.8); +// background-color: shade($selected_bg_color, 0.8); +//} +// +//.scale.highlight.bottom { +// border-color: $selected_bg_color; +// background-color: $selected_bg_color; +// background-image: none; +//} +// +//.scale.trough:insensitive, +//.scale.highlight.left:insensitive { +// border-color: shade($bg_color, 0.85); +// background-color: shade($bg_color, 0.9); +// background-image: none; +//} From cc6022e72d2c55d27eb01dbf78740ec11a62e242 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 16:07:27 +0530 Subject: [PATCH 17/73] STyled progressbar and scale --- gtk-3.0/scss/_progress.scss | 262 +++++++++++++++++------------------- 1 file changed, 126 insertions(+), 136 deletions(-) diff --git a/gtk-3.0/scss/_progress.scss b/gtk-3.0/scss/_progress.scss index 6b72a09..f648f95 100644 --- a/gtk-3.0/scss/_progress.scss +++ b/gtk-3.0/scss/_progress.scss @@ -6,17 +6,15 @@ ! Progress bars * ******************/ -* { - -GtkProgressBar-min-horizontal-bar-height: 12; - -GtkProgressBar-min-vertical-bar-width: 12; -} - GtkProgressBar { padding: 0; - border-radius: 2px; + border-radius: $roundness; font-size: smaller; color: alpha($fg_color, 0.6); + -GtkProgressBar-min-horizontal-bar-height: 12; + -GtkProgressBar-min-vertical-bar-width: 12; + &.osd { -GtkProgressBar-xspacing: 0; -GtkProgressBar-yspacing: 0; @@ -24,7 +22,7 @@ GtkProgressBar { } &.trough { - border: 1px solid shade($bg_color, 0.8); + border: 1px solid alpha(border_normal($bg_color), 0.5); background-color: shade($bg_color, 1.08); background-image: none; } @@ -74,132 +72,124 @@ GtkLevelBar { } } -// TODO all stuff below -//.level-bar { -// &.trough { -// border: 1px solid shade($bg_color, 0.8); -// background-color: shade($bg_color, 1.08); -// background-image: none; -// } -// -// &.fill-block { -// // FIXME: it would be nice to set make fill blocks bigger, but we'd need -// // :nth-child working on discrete indicators -// border: 1px shade($selected_bg_color, 5%); -// background-color: $selected_bg_color; -// box-shadow: 0 1px transparentize(black, 0.9); -// border-radius: 1px; -// &:backdrop { -// border-color: $selected_bg_color; -// box-shadow: none; -// } -// &.indicator-discrete { -// &.horizontal { margin: 0 1px; } -// &.vertical { margin: 1px 0; } -// } -// &.level-high { -// border-color: darken($success_color,10%); -// background-color: $success_color; -// &:backdrop { border-color: $success_color; } -// } -// &.level-low { -// border-color: darken($warning_color,10%); -// background-color: $warning_color; -// &:backdrop { border-color: $warning_color; }; -// } -// &.empty-fill-block { -// background-color: transparent; -// border-color: transparentize($fg_color,0.9); -// box-shadow: none; -// &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); } -// } -// } -//} -// -//.scale { -// -GtkRange-slider-width: 16; -// -GtkRange-trough-border: 1; -// -GtkScale-slider-length: 16; -// -// padding: 0; -// border-width: 1px; -// border-radius: 2px; -// outline-offset: -1px; -//} -// -//.scale.slider { -// border-radius: 8px; -// background-color: shade($bg_color, 1.08); -// background-image: none; -// /* we will draw the border using box shadow for now */ -// box-shadow: inset 1px 0 shade($bg_color, 0.8), -// inset 0 1px shade($bg_color, 0.8), -// inset -1px 0 shade($bg_color, 0.8), -// inset 0 -1px shade($bg_color, 0.8); -//} -// -//.scale.slider:hover { -// box-shadow: inset 1px 0 shade($bg_color, 0.7), -// inset 0 1px shade($bg_color, 0.7), -// inset -1px 0 shade($bg_color, 0.7), -// inset 0 -1px shade($bg_color, 0.7); -//} -// -//.scale.slider:insensitive { -// background-color: shade($bg_color, 0.9); -// background-image: none; -// box-shadow: inset 1px 0 shade($bg_color, 0.85), -// inset 0 1px shade($bg_color, 0.85), -// inset -1px 0 shade($bg_color, 0.85), -// inset 0 -1px shade($bg_color, 0.85); -//} -// -//.scale.slider.fine-tune:active, -//.scale.slider.fine-tune:active:hover, -//.scale.slider.fine-tune.horizontal:active, -//.scale.slider.fine-tune.horizontal:active:hover { -// background-size: 50%; -// background-repeat: no-repeat; -// background-position: center; -//} -// -//.scale.mark { -// border-color: shade($bg_color, 0.8); -//} -// -//.scale.trough { -// margin: 7px 0; -// border-color: shade($bg_color, 0.8); -// border-radius: 2px; -// background-color: shade($bg_color, 1.08); -// background-image: none; -//} -// -//.scale.trough.vertical { -// margin: 0 7px; -//} -// -//.menuitem .scale.highlight.left, -//.scale.highlight.left { -// border-color: $selected_bg_color; -// background-color: $selected_bg_color; -// background-image: none; -//} -// -//.menuitem .scale.highlight.left:hover { -// border-color: shade($selected_bg_color, 0.8); -// background-color: shade($selected_bg_color, 0.8); -//} -// -//.scale.highlight.bottom { -// border-color: $selected_bg_color; -// background-color: $selected_bg_color; -// background-image: none; -//} -// -//.scale.trough:insensitive, -//.scale.highlight.left:insensitive { -// border-color: shade($bg_color, 0.85); -// background-color: shade($bg_color, 0.9); -// background-image: none; -//} +.level-bar { + &.trough { + border: 1px solid alpha(border_normal($bg_color), 0.5); + background-color: shade($bg_color, 1.08); + background-image: none; + border-radius: $roundness; + } + + &.fill-block { + // FIXME: it would be nice to set make fill blocks bigger, but we'd need + // :nth-child working on discrete indicators + background-color: $selected_bg_color; + border-color: transparent; + border-radius: 0; + + &.indicator-discrete { + &.horizontal { margin-right: 1px; } + &.vertical { margin-bottom: 1px; } + } + + &.level-high { + background-color: $success_color; + border-color: transparent; + } + + &.level-low { + background-color: $warning_color; + border-color: transparent; + } + + &.empty-fill-block { + background-color: transparent; + border-color: transparent; + box-shadow: none; + } + } +} + +.scale { + -GtkRange-slider-width: 16; + -GtkRange-trough-border: 1; + -GtkScale-slider-length: 16; + + padding: 0; + border-width: 1px; + border-radius: $roundness; + outline-offset: -1px; + + + &.slider { + border-radius: 8px; + background-color: shade($bg_color, 1.08); + background-image: none; + /* we will draw the border using box shadow for now */ + box-shadow: inset 1px 0 border_normal($bg_color), + inset 0 1px border_normal($bg_color), + inset -1px 0 border_normal($bg_color), + inset 0 -1px border_normal($bg_color); + + &:hover, &:focus { + box-shadow: inset 1px 0 border_focus($bg_color), + inset 0 1px border_focus($bg_color), + inset -1px 0 border_focus($bg_color), + inset 0 -1px border_focus($bg_color); + } + + &:active { + box-shadow: inset 1px 0 border_active($bg_color), + inset 0 1px border_active($bg_color), + inset -1px 0 border_active($bg_color), + inset 0 -1px border_active($bg_color); + } + + &:insensitive { + background-color: shade($bg_color, 0.9); + background-image: none; + box-shadow: inset 1px 0 border_insensitive($bg_color), + inset 0 1px border_insensitive($bg_color), + inset -1px 0 border_insensitive($bg_color), + inset 0 -1px border_insensitive($bg_color); + } + } + + &.fine-tune { + &, &.horizontal { + &:active, &:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; + } + } + } + + &.mark { border-color: alpha(border_normal($bg_color), 0.5); } + + + &.trough { + margin: 7px 0; + border: 1px solid alpha(border_normal($bg_color), 0.5); + border-radius: $roundness; + background-color: shade($bg_color, 1.08); + background-image: none; + + &:insensitive { background-color: shade($bg_color, 0.9); } + + &.vertical { margin: 0 7px; } + } + + &.highlight { + &, &.left, &.bottom { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + background-image: none; + + &:insensitive { + border-color: shade($bg_color, 0.7); + background-color: shade($bg_color, 0.8); + } + } + } +} From c7355235df9885822b6a1b130ab4fd6efd9c46e9 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 17:27:06 +0530 Subject: [PATCH 18/73] Added check and radios --- gtk-3.0/assets/checkbox-checked-dark.svg | 7 +++ .../checkbox-checked-insensitive-dark.svg | 9 +++ .../assets/checkbox-checked-insensitive.svg | 9 +++ gtk-3.0/assets/checkbox-checked.svg | 7 +++ gtk-3.0/assets/checkbox-mixed-dark.svg | 7 +++ .../checkbox-mixed-insensitive-dark.svg | 9 +++ gtk-3.0/assets/checkbox-mixed-insensitive.svg | 9 +++ gtk-3.0/assets/checkbox-mixed.svg | 7 +++ gtk-3.0/assets/checkbox-unchecked-dark.svg | 6 ++ .../checkbox-unchecked-insensitive-dark.svg | 6 ++ .../assets/checkbox-unchecked-insensitive.svg | 6 ++ gtk-3.0/assets/checkbox-unchecked.svg | 6 ++ .../assets/grid-selection-checked-dark.svg | 7 +++ gtk-3.0/assets/grid-selection-checked.svg | 7 +++ .../assets/grid-selection-unchecked-dark.svg | 6 ++ gtk-3.0/assets/grid-selection-unchecked.svg | 6 ++ .../menuitem-checkbox-checked-hover.svg | 5 ++ .../menuitem-checkbox-checked-insensitive.svg | 5 ++ gtk-3.0/assets/menuitem-checkbox-checked.svg | 5 ++ .../assets/menuitem-checkbox-mixed-hover.svg | 5 ++ .../menuitem-checkbox-mixed-insensitive.svg | 5 ++ .../menuitem-checkbox-mixed-selected.svg | 5 ++ gtk-3.0/assets/menuitem-checkbox-mixed.svg | 11 ++++ .../assets/menuitem-radio-checked-hover.svg | 5 ++ .../menuitem-radio-checked-insensitive.svg | 5 ++ gtk-3.0/assets/menuitem-radio-checked.svg | 5 ++ gtk-3.0/assets/radio-checked-dark.svg | 7 +++ .../assets/radio-checked-insensitive-dark.svg | 9 +++ gtk-3.0/assets/radio-checked-insensitive.svg | 9 +++ gtk-3.0/assets/radio-checked.svg | 7 +++ gtk-3.0/assets/radio-mixed-dark.svg | 7 +++ .../assets/radio-mixed-insensitive-dark.svg | 9 +++ gtk-3.0/assets/radio-mixed-insensitive.svg | 9 +++ gtk-3.0/assets/radio-mixed.svg | 7 +++ gtk-3.0/assets/radio-unchecked-dark.svg | 6 ++ .../radio-unchecked-insensitive-dark.svg | 6 ++ .../assets/radio-unchecked-insensitive.svg | 6 ++ gtk-3.0/assets/radio-unchecked.svg | 6 ++ gtk-3.0/scss/_sidebar.scss | 45 +++++++++++++++ gtk-3.0/scss/_toggle.scss | 55 ++++++++++++------- 40 files changed, 339 insertions(+), 19 deletions(-) create mode 100644 gtk-3.0/assets/checkbox-checked-dark.svg create mode 100644 gtk-3.0/assets/checkbox-checked-insensitive-dark.svg create mode 100644 gtk-3.0/assets/checkbox-checked-insensitive.svg create mode 100644 gtk-3.0/assets/checkbox-checked.svg create mode 100644 gtk-3.0/assets/checkbox-mixed-dark.svg create mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg create mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive.svg create mode 100644 gtk-3.0/assets/checkbox-mixed.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked-dark.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked.svg create mode 100644 gtk-3.0/assets/grid-selection-checked-dark.svg create mode 100644 gtk-3.0/assets/grid-selection-checked.svg create mode 100644 gtk-3.0/assets/grid-selection-unchecked-dark.svg create mode 100644 gtk-3.0/assets/grid-selection-unchecked.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-hover.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed.svg create mode 100644 gtk-3.0/assets/menuitem-radio-checked-hover.svg create mode 100644 gtk-3.0/assets/menuitem-radio-checked-insensitive.svg create mode 100644 gtk-3.0/assets/menuitem-radio-checked.svg create mode 100644 gtk-3.0/assets/radio-checked-dark.svg create mode 100644 gtk-3.0/assets/radio-checked-insensitive-dark.svg create mode 100644 gtk-3.0/assets/radio-checked-insensitive.svg create mode 100644 gtk-3.0/assets/radio-checked.svg create mode 100644 gtk-3.0/assets/radio-mixed-dark.svg create mode 100644 gtk-3.0/assets/radio-mixed-insensitive-dark.svg create mode 100644 gtk-3.0/assets/radio-mixed-insensitive.svg create mode 100644 gtk-3.0/assets/radio-mixed.svg create mode 100644 gtk-3.0/assets/radio-unchecked-dark.svg create mode 100644 gtk-3.0/assets/radio-unchecked-insensitive-dark.svg create mode 100644 gtk-3.0/assets/radio-unchecked-insensitive.svg create mode 100644 gtk-3.0/assets/radio-unchecked.svg diff --git a/gtk-3.0/assets/checkbox-checked-dark.svg b/gtk-3.0/assets/checkbox-checked-dark.svg new file mode 100644 index 0000000..ae01bea --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg new file mode 100644 index 0000000..c3219e2 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.svg b/gtk-3.0/assets/checkbox-checked-insensitive.svg new file mode 100644 index 0000000..4dbe967 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked.svg b/gtk-3.0/assets/checkbox-checked.svg new file mode 100644 index 0000000..0db2ab9 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-dark.svg b/gtk-3.0/assets/checkbox-mixed-dark.svg new file mode 100644 index 0000000..a181bc8 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg new file mode 100644 index 0000000..27e0ef1 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/gtk-3.0/assets/checkbox-mixed-insensitive.svg new file mode 100644 index 0000000..d408465 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed.svg b/gtk-3.0/assets/checkbox-mixed.svg new file mode 100644 index 0000000..8921521 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.svg b/gtk-3.0/assets/checkbox-unchecked-dark.svg new file mode 100644 index 0000000..36eeb4d --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg new file mode 100644 index 0000000..3488e66 --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive.svg new file mode 100644 index 0000000..f90aa4c --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-insensitive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked.svg b/gtk-3.0/assets/checkbox-unchecked.svg new file mode 100644 index 0000000..06176e3 --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/grid-selection-checked-dark.svg b/gtk-3.0/assets/grid-selection-checked-dark.svg new file mode 100644 index 0000000..4f6efb5 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-checked-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/grid-selection-checked.svg b/gtk-3.0/assets/grid-selection-checked.svg new file mode 100644 index 0000000..3b84ed6 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-checked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.svg b/gtk-3.0/assets/grid-selection-unchecked-dark.svg new file mode 100644 index 0000000..f925043 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-unchecked-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/grid-selection-unchecked.svg b/gtk-3.0/assets/grid-selection-unchecked.svg new file mode 100644 index 0000000..689da2d --- /dev/null +++ b/gtk-3.0/assets/grid-selection-unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg new file mode 100644 index 0000000..8ab7153 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg new file mode 100644 index 0000000..f570a1c --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked.svg b/gtk-3.0/assets/menuitem-checkbox-checked.svg new file mode 100644 index 0000000..66f6f59 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg new file mode 100644 index 0000000..d150f8f --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg new file mode 100644 index 0000000..fd8b0d4 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg new file mode 100644 index 0000000..d150f8f --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/gtk-3.0/assets/menuitem-checkbox-mixed.svg new file mode 100644 index 0000000..2b7b0ea --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked-hover.svg b/gtk-3.0/assets/menuitem-radio-checked-hover.svg new file mode 100644 index 0000000..afb9db2 --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg new file mode 100644 index 0000000..0bc947f --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked.svg b/gtk-3.0/assets/menuitem-radio-checked.svg new file mode 100644 index 0000000..7005212 --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/radio-checked-dark.svg b/gtk-3.0/assets/radio-checked-dark.svg new file mode 100644 index 0000000..b91357c --- /dev/null +++ b/gtk-3.0/assets/radio-checked-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark.svg b/gtk-3.0/assets/radio-checked-insensitive-dark.svg new file mode 100644 index 0000000..f5cfbe0 --- /dev/null +++ b/gtk-3.0/assets/radio-checked-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-checked-insensitive.svg b/gtk-3.0/assets/radio-checked-insensitive.svg new file mode 100644 index 0000000..e782ba6 --- /dev/null +++ b/gtk-3.0/assets/radio-checked-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-checked.svg b/gtk-3.0/assets/radio-checked.svg new file mode 100644 index 0000000..a89c1aa --- /dev/null +++ b/gtk-3.0/assets/radio-checked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-dark.svg b/gtk-3.0/assets/radio-mixed-dark.svg new file mode 100644 index 0000000..caf2123 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.svg b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg new file mode 100644 index 0000000..6b93fc4 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-insensitive.svg b/gtk-3.0/assets/radio-mixed-insensitive.svg new file mode 100644 index 0000000..9fa3659 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed.svg b/gtk-3.0/assets/radio-mixed.svg new file mode 100644 index 0000000..38c8a53 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-unchecked-dark.svg b/gtk-3.0/assets/radio-unchecked-dark.svg new file mode 100644 index 0000000..214ed94 --- /dev/null +++ b/gtk-3.0/assets/radio-unchecked-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg b/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg new file mode 100644 index 0000000..0fdfaf4 --- /dev/null +++ b/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unchecked-insensitive.svg b/gtk-3.0/assets/radio-unchecked-insensitive.svg new file mode 100644 index 0000000..a0f2168 --- /dev/null +++ b/gtk-3.0/assets/radio-unchecked-insensitive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unchecked.svg b/gtk-3.0/assets/radio-unchecked.svg new file mode 100644 index 0000000..2f05a0d --- /dev/null +++ b/gtk-3.0/assets/radio-unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/scss/_sidebar.scss b/gtk-3.0/scss/_sidebar.scss index 4cb626d..b6658a9 100755 --- a/gtk-3.0/scss/_sidebar.scss +++ b/gtk-3.0/scss/_sidebar.scss @@ -71,3 +71,48 @@ .highlight { font: bold; } } } + + +/*************** +! Pane separator +****************/ + +.pane-separator { + &, &.horizontal { + background-image: linear-gradient(to bottom, + shade($bg_color, 0.8) 0%, + shade($bg_color, 0.8) 20%, + transparent 20%, + transparent 45%, + shade($bg_color, 0.8) 45%, + shade($bg_color, 0.8) 55%, + transparent 55%, + transparent 80%, + shade($bg_color, 0.8) 80%, + shade($bg_color, 0.8) + ); + + background-size: 4px 10px; + background-repeat: no-repeat; + background-position: center center; + } + + &.vertical { + background-image: linear-gradient(to right, + shade($bg_color, 0.8) 0%, + shade($bg_color, 0.8) 20%, + transparent 20%, + transparent 45%, + shade($bg_color, 0.8) 45%, + shade($bg_color, 0.8) 55%, + transparent 55%, + transparent 80%, + shade($bg_color, 0.8) 80%, + shade($bg_color, 0.8) + ); + + background-size: 10px 4px; + background-repeat: no-repeat; + background-position: center center; + } +} diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/_toggle.scss index 4ef007a..43e0fc1 100755 --- a/gtk-3.0/scss/_toggle.scss +++ b/gtk-3.0/scss/_toggle.scss @@ -11,40 +11,57 @@ -GtkCheckMenuItem-indicator-size: 14; } -@mixin toggle($type, $bg, $fg) { - color: $fg; +@mixin toggle($type) { background-image: none; - -gtk-icon-source: -gtk-icontheme('#{$type}-symbolic'); + + -gtk-icon-source: url('../assets/#{$type}-unchecked.svg'); + + &:insensitive { -gtk-icon-source: url('../assets/#{$type}-unchecked-insensitive.svg'); } &:checked, &:active { - -gtk-icon-source: -gtk-icontheme('#{$type}-checked-symbolic'); + -gtk-icon-source: url('../assets/#{$type}-checked.svg'); + + &:insensitive { -gtk-icon-source: url('../assets/#{$type}-checked-insensitive.svg'); } } &:inconsistent { - -gtk-icon-source: -gtk-icontheme('#{$type}-mixed-symbolic'); + -gtk-icon-source: url('../assets/#{$type}-mixed.svg'); + + &:insensitive { -gtk-icon-source: url('../assets/#{$type}-mixed-insensitive.svg'); } } - &:focus, &:hover { - color: shade($fg, 1.2); - } + &.menuitem { + -gtk-icon-source: none; - &:active { - color: shade($fg, 0.8); - } + &:insensitive { -gtk-icon-source: none; } - &:insensitive { - color: mix($bg, $fg, .5); - } + &:checked, &:active { + -gtk-icon-source: url('../assets/menuitem-#{$type}-checked.svg'); - &:active *:insensitive { - color: mix($bg, $fg, .8); - } + &:hover { -gtk-icon-source: url('../assets/menuitem-#{$type}-checked-hover.svg'); } + &:insensitive { -gtk-icon-source: url('../assets/menuitem-#{$type}-checked-insensitive.svg'); } + } + + &:inconsistent { + -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed.svg'); + + &:hover { -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed-hover.svg'); } + + &:insensitive { -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed-insensitive.svg'); } + } + } } -.radio { @include toggle("radio", $bg_color, $fg_color); } +.radio { @include toggle("radio"); } -.check { @include toggle("checkbox", $bg_color, $fg_color); } +.check { @include toggle("checkbox"); } + +GtkIconView.content-view.cell.check { + -gtk-icon-source: url("assets/grid-selection-unchecked.svg"); + + &:active { -gtk-icon-source: url("assets/grid-selection-checked.svg"); } +} /******** From 005e5f8ee9b260e0cbf422e89247263958d2f47c Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 20:44:21 +0530 Subject: [PATCH 19/73] Don't use * for insensitive active buttons --- gtk-3.0/scss/_button.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index e548bc7..51c296f 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -66,8 +66,8 @@ &:last-child, &:only-child, &:insensitive:last-child, &:insensitive:only-child, - &:active *:insensitive:last-child, &:active *:insensitive:only-child, - &:checked *:insensitive:last-child, &:checked *:insensitive:only-child { box-shadow: none; } + &:active:insensitive:last-child, &:active:insensitive:only-child, + &:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } &:active:last-child, &:active:only-child, &:checked:last-child, &:checked:only-child { @@ -114,8 +114,8 @@ box-shadow: none; } - &:active *:insensitive, - &:checked *:insensitive { + &:active:insensitive, + &:checked:insensitive { @include linear-gradient(shade($bg, .8)); box-shadow: none; From cceeb065f8e9ddcda4ab45a865c9024b9c55c974 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Mon, 8 Dec 2014 23:58:57 +0530 Subject: [PATCH 20/73] Style info bar and calendar --- gtk-3.0/scss/_calendar.scss | 24 ++++ gtk-3.0/scss/_infobar.scss | 56 +++++++++ gtk-3.0/scss/widgets.scss | 242 +----------------------------------- 3 files changed, 82 insertions(+), 240 deletions(-) create mode 100644 gtk-3.0/scss/_calendar.scss create mode 100644 gtk-3.0/scss/_infobar.scss diff --git a/gtk-3.0/scss/_calendar.scss b/gtk-3.0/scss/_calendar.scss new file mode 100644 index 0000000..a1be572 --- /dev/null +++ b/gtk-3.0/scss/_calendar.scss @@ -0,0 +1,24 @@ +@import "functions"; +@import "global"; + + +/********** + ! Calendar +***********/ + +GtkCalendar { + padding: $spacing; + outline-offset: -1px; + + &:inconsistent { color: mix($fg_color, $bg_color, 0.5); } + + &.view, &.highlight, &.header, &.button { + &, &:hover, &:insensitive { + border: none; + background-color: transparent; + background-image: none; + } + } + + &.highlight { color: $selected_bg_color; } +} diff --git a/gtk-3.0/scss/_infobar.scss b/gtk-3.0/scss/_infobar.scss new file mode 100644 index 0000000..168a1d7 --- /dev/null +++ b/gtk-3.0/scss/_infobar.scss @@ -0,0 +1,56 @@ +@import "functions"; +@import "global"; + + +/********* + ! Infobar +**********/ + +GtkInfoBar { + border: none; + + $types: ( + info: ( $info_fg_color, $info_bg_color ), + warning: ( $warning_fg_color, $warning_bg_color ), + question: ( $question_fg_color, $question_bg_color ), + error: ( $error_fg_color, $error_bg_color ), + ); + + + @each $type, $colors in $types { + $fg_color: nth($colors, 1); + $bg_color: nth($colors, 2); + + &.#{$type} { + border: 1px solid shade($bg_color, 0.8); + background-color: $bg_color; + background-image: none; + color: $fg_color; + + .button { + @include button($bg_color, $fg_color); + + &.close { + border: 1px solid transparent; + background-color: transparent; + background-image: none; + box-shadow: none; + + &:focus, &:hover { + border: 1px solid alpha(black, 0.3); + background-color: alpha(white, 0.2); + background-image: none; + box-shadow: none; + } + + &:active, &:checked, &:active:hover, &:checked:hover { + border: 1px solid alpha(black, 0.3); + background-color: alpha(black, 0.1); + background-image: none; + box-shadow: none; + } + } + } + } + } +} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index 882f861..423bb4c 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -12,247 +12,9 @@ @import "progress"; @import "spinner"; @import "window"; +@import "calendar"; +@import "infobar"; -/*********** -* calendar * -************/ -GtkCalendar { - padding: 4px; - outline-offset: -1px; -} - -GtkCalendar:inconsistent { - color: mix($fg_color, $bg_color, 0.5); -} - -GtkCalendar.view, -GtkCalendar.header, -GtkCalendar.button, -GtkCalendar.button:hover, -GtkCalendar.button:insensitive { - border-width: 0; - background-color: transparent; - background-image: none; -} - -.highlight, -GtkCalendar.highlight { - border-width: 0; - background-color: transparent; - color: $selected_bg_color; -} - -/*********** -* infobar * -***********/ -GtkInfoBar { - border-width: 0; - border-style: none; -} - -.info { - border-width: 1px; - border-style: solid; - border-color: shade($info_bg_color, 0.8); - background-color: $info_bg_color; - background-image: none; - color: $info_fg_color; -} - -.info .button { - border-top-color: shade($info_bg_color, 0.8); - border-right-color: shade($info_bg_color, 0.72); - border-left-color: shade($info_bg_color, 0.72); - border-bottom-color: shade($info_bg_color, 0.7); - background-color: shade($info_bg_color, 1.08); - color: $info_fg_color; -} - -.info .button:hover { - border-top-color: shade($info_bg_color, 0.85); - border-right-color: shade($info_bg_color, 0.78); - border-left-color: shade($info_bg_color, 0.78); - border-bottom-color: shade($info_bg_color, 0.7); - background-color: shade($info_bg_color, 1.10); -} - -.info .button:active { - border-color: shade($info_bg_color, 0.6); - background-color: shade($info_bg_color, 0.95); -} - -.info .button:active:hover { - border-top-color: shade($info_bg_color, 0.85); - border-right-color: shade($info_bg_color, 0.78); - border-left-color: shade($info_bg_color, 0.78); - border-bottom-color: shade($info_bg_color, 0.7); -} - -.info .button.close { - color: $info_fg_color; -} - -.info .button.close:hover { - background-color: alpha(white, 0.2); -} - -.info .button.close:active { - color: $info_fg_color; - background-color: alpha(black, 0.1); -} - -.warning { - border-width: 1px; - border-style: solid; - border-color: shade($warning_bg_color, 0.8); - background-color: $warning_bg_color; - background-image: none; - color: $warning_fg_color; -} - -.warning .button { - border-top-color: shade($warning_bg_color, 0.8); - border-right-color: shade($warning_bg_color, 0.72); - border-left-color: shade($warning_bg_color, 0.72); - border-bottom-color: shade($warning_bg_color, 0.7); - background-color: shade($warning_bg_color, 1.08); - color: $warning_fg_color; -} - -.warning .button:hover { - border-top-color: shade($warning_bg_color, 0.85); - border-right-color: shade($warning_bg_color, 0.78); - border-left-color: shade($warning_bg_color, 0.78); - border-bottom-color: shade($warning_bg_color, 0.7); - background-color: shade($warning_bg_color, 1.10); -} - -.warning .button:active { - border-color: shade($warning_bg_color, 0.6); - background-color: shade($warning_bg_color, 0.95); -} - -.warning .button:active:hover { - border-top-color: shade($warning_bg_color, 0.85); - border-right-color: shade($warning_bg_color, 0.78); - border-left-color: shade($warning_bg_color, 0.78); - border-bottom-color: shade($warning_bg_color, 0.7); -} - -.warning .button.close { - color: $warning_fg_color; -} - -.warning .button.close:hover { - background-color: alpha(white, 0.2); -} - -.warning .button.close:active { - color: $warning_fg_color; - background-color: alpha(black, 0.1); -} - -.question { - border-width: 1px; - border-style: solid; - border-color: shade($question_bg_color, 0.8); - background-color: $question_bg_color; - background-image: none; - color: $question_fg_color; -} - -.question .button { - border-top-color: shade($question_bg_color, 0.8); - border-right-color: shade($question_bg_color, 0.72); - border-left-color: shade($question_bg_color, 0.72); - border-bottom-color: shade($question_bg_color, 0.7); - background-color: shade($question_bg_color, 1.08); - color: $question_fg_color; -} - -.question .button:hover { - border-top-color: shade($question_bg_color, 0.85); - border-right-color: shade($question_bg_color, 0.78); - border-left-color: shade($question_bg_color, 0.78); - border-bottom-color: shade($question_bg_color, 0.7); - background-color: shade($question_bg_color, 1.10); -} - -.question .button:active { - border-color: shade($question_bg_color, 0.6); - background-color: shade($question_bg_color, 0.95); -} - -.question .button:active:hover { - border-top-color: shade($question_bg_color, 0.85); - border-right-color: shade($question_bg_color, 0.78); - border-left-color: shade($question_bg_color, 0.78); - border-bottom-color: shade($question_bg_color, 0.7); -} - -.question .button.close { - color: $question_fg_color; -} - -.question .button.close:hover { - background-color: alpha(white, 0.2); -} - -.question .button.close:active { - color: $question_fg_color; - background-color: alpha(black, 0.1); -} - -.error { - border-width: 1px; - border-style: solid; - border-color: shade($error_bg_color, 0.8); - background-color: $error_bg_color; - background-image: none; - color: $error_fg_color; -} - -.error .button { - border-top-color: shade($error_bg_color, 0.8); - border-right-color: shade($error_bg_color, 0.72); - border-left-color: shade($error_bg_color, 0.72); - border-bottom-color: shade($error_bg_color, 0.7); - background-color: shade($error_bg_color, 1.08); - color: $error_fg_color; -} - -.error .button:hover { - border-top-color: shade($error_bg_color, 0.85); - border-right-color: shade($error_bg_color, 0.78); - border-left-color: shade($error_bg_color, 0.78); - border-bottom-color: shade($error_bg_color, 0.7); - background-color: shade($error_bg_color, 1.10); -} - -.error .button:active { - border-color: shade($error_bg_color, 0.6); - background-color: shade($error_bg_color, 0.95); -} - -.error .button:active:hover { - border-top-color: shade($error_bg_color, 0.85); - border-right-color: shade($error_bg_color, 0.78); - border-left-color: shade($error_bg_color, 0.78); - border-bottom-color: shade($error_bg_color, 0.7); -} - -.error .button.close { - color: $error_fg_color; -} - -.error .button.close:hover { - background-color: alpha(white, 0.2); -} - -.error .button.close:active { - color: $error_fg_color; - background-color: alpha(black, 0.1); -} /***************** * miscellaneous * From f34745f3da6bc65f328553ded0c0be2cd0e5e2d7 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Tue, 9 Dec 2014 00:42:07 +0530 Subject: [PATCH 21/73] Added styles for notebook and scrollbar --- gtk-3.0/scss/_button.scss | 21 ++++ gtk-3.0/scss/_infobar.scss | 22 +--- gtk-3.0/scss/_notebook.scss | 134 ++++++++++++++++++++ gtk-3.0/scss/_scrollbar.scss | 61 +++++++++ gtk-3.0/scss/_view.scss | 46 +++++++ gtk-3.0/scss/widgets.scss | 233 +---------------------------------- 6 files changed, 266 insertions(+), 251 deletions(-) create mode 100644 gtk-3.0/scss/_notebook.scss create mode 100644 gtk-3.0/scss/_scrollbar.scss diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index 51c296f..4baaf0f 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -145,6 +145,27 @@ .linked & { @include linked_button($bg, $dark_shadow); } } +%close_button { + border: 1px solid transparent; + background-color: transparent; + background-image: none; + box-shadow: none; + + &:focus, &:hover { + border: 1px solid alpha(black, 0.3); + background-color: alpha(white, 0.2); + background-image: none; + box-shadow: none; + } + + &:active, &:checked, &:active:hover, &:checked:hover { + border: 1px solid alpha(black, 0.3); + background-color: alpha(black, 0.1); + background-image: none; + box-shadow: none; + } +} + .button { @include button($bg_color, $fg_color); diff --git a/gtk-3.0/scss/_infobar.scss b/gtk-3.0/scss/_infobar.scss index 168a1d7..29a096b 100644 --- a/gtk-3.0/scss/_infobar.scss +++ b/gtk-3.0/scss/_infobar.scss @@ -1,5 +1,6 @@ @import "functions"; @import "global"; +@import "button"; /********* @@ -30,26 +31,7 @@ GtkInfoBar { .button { @include button($bg_color, $fg_color); - &.close { - border: 1px solid transparent; - background-color: transparent; - background-image: none; - box-shadow: none; - - &:focus, &:hover { - border: 1px solid alpha(black, 0.3); - background-color: alpha(white, 0.2); - background-image: none; - box-shadow: none; - } - - &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha(black, 0.3); - background-color: alpha(black, 0.1); - background-image: none; - box-shadow: none; - } - } + &.close { @extend %close_button; } } } } diff --git a/gtk-3.0/scss/_notebook.scss b/gtk-3.0/scss/_notebook.scss new file mode 100644 index 0000000..b16b0d6 --- /dev/null +++ b/gtk-3.0/scss/_notebook.scss @@ -0,0 +1,134 @@ +@import "functions"; +@import "global"; + +/********** + ! Notebook +***********/ + +.notebook { + padding: 0; + border-width: 1px 0 0 0; + border-style: solid; + border-color: border_normal($base_color); + border-radius: 0; + background-color: $base_color; + background-image: none; + background-clip: border-box; + color: $text_color; + + -GtkNotebook-initial-gap: 0; + -GtkNotebook-arrow-spacing: 5; + -GtkNotebook-tab-curvature: 0; + -GtkNotebook-tab-overlap: 1; + -GtkNotebook-has-tab-gap: false; + + &.frame { border-width: 1px; } + + &.header { + border-width: 0; + background-color: shade($base_color, 0.85); + + &.frame { + border-color: shade($base_color, 0.75); + + &.top { border-width: 1px 1px 0 1px; } + + &.right { border-width: 1px 1px 1px 0; } + + &.bottom { border-width: 0 1px 1px 1px; } + + &.left { border-width: 1px 0 1px 1px; } + } + } + + GtkViewport { + border-width: 0; + background-color: $base_color; + color: $text_color; + } + + tab { + padding: $spacing ($spacing * 2); + border: 1px solid transparent; + background-color: transparent; + background-image: none; + + &:active { + background-color: transparent; + background-image: none; + } + + &.top { + border-bottom-width: 2px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + + &:hover { border-bottom-color: alpha($selected_bg_color, 0.3); } + + &:active { border-bottom-color: $selected_bg_color; } + } + + &.right { + border-left-width: 2px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + + &:hover { border-left-color: alpha($selected_bg_color, 0.3); } + + &:active { border-left-color: $selected_bg_color; } + } + + + &.bottom { + border-top-width: 2px; + border-top-right-radius: 0; + border-top-left-radius: 0; + + &:hover { border-top-color: alpha($selected_bg_color, 0.3); } + + &:active { border-top-color: $selected_bg_color; } + } + + &.left { + border-right-width: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + + &:hover { border-right-color: alpha($selected_bg_color, 0.3); } + + &:active { border-right-color: $selected_bg_color; } + } + + GtkLabel { color: mix($text_color, $base_color, 0.3); } + + /* close button styling */ + .button { @extend %close_button; } + } + + .prelight-page { + &, GtkLabel { color: mix($text_color, $base_color, 0.15); } + } + + .active-page { + &, GtkLabel { color: $text_color; } + } + + .reorderable-page { + &:hover { + background-color: shade($base_color, 0.85); + border-left: 0; + border-right: 0; + /* using box shadows instead of borders due to slanted edges */ + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); + } + + &:active { + background-color: shade($base_color, 0.90); + border-left: 0; + border-right: 0; + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); + } + } +} diff --git a/gtk-3.0/scss/_scrollbar.scss b/gtk-3.0/scss/_scrollbar.scss new file mode 100644 index 0000000..8412d5d --- /dev/null +++ b/gtk-3.0/scss/_scrollbar.scss @@ -0,0 +1,61 @@ +@import "functions"; +@import "global"; + +/*********** + ! Scrollbar +************/ + +.scrollbar { + border: none; + padding: 0; + + &.button { + &, &:active, &:active:hover { + border-width: 0; + border-radius: 0; + background-color: transparent; + background-image: none; + color: shade($bg_color, 0.6); + } + } + + &.slider, &.slider.vertical { + border: 1px solid mix(shade($bg_color, 0.87), $fg_color, 0.21); + border-radius: 0; + background-color: mix($bg_color, $fg_color, 0.21); + + &:hover { + border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31); + background-color: mix($bg_color, $fg_color, 0.31); + } + + &:active { + border-color: shade($selected_bg_color, 0.9); + background-color: $selected_bg_color; + } + + &.fine-tune:prelight:active { + border-width: 2px; + border-color: transparent; + } + } +} + +.scrollbars-junction, +.scrollbar.trough { + border: none; + border-radius: 0; + background-color: $bg_color; + background-image: none; +} + +/* overlay scrollbar */ +OsThumb, OsScrollbar { + color: shade($bg_color, 0.7); + + &:selected { background-color: $selected_bg_color; } + + &:active { background-color: $selected_bg_color; } + + &:insensitive { background-color: shade($bg_color, 0.9); } +} diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index ea99496..e7c0155 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -219,3 +219,49 @@ GtkExpander { background-color: $bg_color; color: transparent; } + + +/**************** + ! Floating bar * +*****************/ + +.floating-bar { + border: 1px solid border_normal($bg_color); + border-radius: $roundness; + background-color: $bg_color; + background-image: none; + color: $fg_color; + + &.top { + border-top-width: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; + } + + &.right { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + + &.bottom { + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } + + &.left { + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } + + .button { + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 0; + + border: none; + background-color: transparent; + background-image: none; + } +} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index 423bb4c..c74514b 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -14,237 +14,8 @@ @import "window"; @import "calendar"; @import "infobar"; - - -/***************** -* miscellaneous * -*****************/ -.floating-bar { - border-width: 1px; - border-style: solid; - border-color: shade($bg_color, 0.8); - border-radius: 2px; - background-color: $bg_color; - background-image: none; - color: $fg_color; -} - -.floating-bar.top { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.floating-bar.right { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.floating-bar.bottom { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.floating-bar.left { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.floating-bar .button { - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; - - border-style: none; - background-color: transparent; - background-image: none; -} - - - -/************ -* notebook * -************/ -.notebook { - padding: 0; - border-width: 1px 0 0 0; - border-style: solid; - border-color: shade($base_color, 0.7); - border-radius: 0; - background-color: $base_color; - background-image: none; - background-clip: border-box; - - -GtkNotebook-initial-gap: 0; - -GtkNotebook-arrow-spacing: 5; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 1; - -GtkNotebook-has-tab-gap: false; -} - -.notebook.frame { - border-width: 1px; -} - -.notebook.header { - border-width: 0; - background-color: shade($base_color, 0.85); -} - -.notebook.header.frame { - border-color: shade($base_color, 0.75); -} - -.notebook.header.frame.top { - border-width: 1px 1px 0 1px; -} - -.notebook.header.frame.right { - border-width: 1px 1px 1px 0; -} - -.notebook.header.frame.bottom { - border-width: 0 1px 1px 1px; -} - -.notebook.header.frame.left { - border-width: 1px 0 1px 1px; -} - -.notebook GtkViewport { - border-width: 0; - background-color: $base_color; - color: $text_color; -} - -.notebook tab { - padding: 4px 6px; - border-style: solid; - border-width: 1px; - border-color: transparent; - background-color: transparent; - background-image: none; -} - -.notebook tab:active { - background-color: transparent; - background-image: none; -} - -.notebook tab.top { - border-bottom-width: 2px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.notebook tab.top:hover { - border-bottom-color: alpha($selected_bg_color, 0.3); -} - -.notebook tab.top:active { - border-bottom-color: $selected_bg_color; -} - -.notebook tab.right { - border-left-width: 2px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.notebook tab.right:hover { - border-left-color: alpha($selected_bg_color, 0.3); -} - -.notebook tab.right:active { - border-left-color: $selected_bg_color; -} - -.notebook tab.bottom { - border-top-width: 2px; - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.notebook tab.bottom:hover { - border-top-color: alpha($selected_bg_color, 0.3); -} - -.notebook tab.bottom:active { - border-top-color: $selected_bg_color; -} - -.notebook tab.left { - border-right-width: 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.notebook tab.left:hover { - border-right-color: alpha($selected_bg_color, 0.3); -} - -.notebook tab.left:active { - border-right-color: $selected_bg_color; -} - -.notebook tab GtkLabel { - color: mix($text_color, $base_color, 0.3); -} - -.notebook .prelight-page, -.notebook .prelight-page GtkLabel { - color: mix($text_color, $base_color, 0.15); -} - -.notebook .active-page, -.notebook .active-page GtkLabel { - color: $text_color; -} - -.notebook tab.reorderable-page:hover { - background-color: shade($base_color, 0.85); - border-left: 0; - border-right: 0; - /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); -} - -.notebook tab.reorderable-page:active { - background-color: shade($base_color, 0.90); - border-left: 0; - border-right: 0; - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); -} - -/* close button styling */ -.notebook tab .button, -.notebook tab .button:active, -.notebook tab .button:hover { - padding: 1px; - border-width: 1px; - border-radius: 2px; - border-style: solid; - border-color: transparent; - background-image: none; - background-color: transparent; - color: mix($text_color, $base_color, 0.5); -} - -.notebook tab .button:hover { - color: $text_color; - border-color: shade($base_color, 0.8); -} - -.notebook tab .button:active, -.notebook tab .button:active:hover { - border-color: shade($base_color, 0.7); - background-color: shade($base_color, 0.95); -} - +@import "notebook"; +@import "scrollbar"; /************* From 0163f1997a9ca3a33dcf61950a6b03c1231a26c9 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Tue, 9 Dec 2014 01:05:19 +0530 Subject: [PATCH 22/73] Wrap modules in exports mixin so they are included only once --- gtk-3.0/scss/_button.scss | 42 ++-- gtk-3.0/scss/_calendar.scss | 25 +-- gtk-3.0/scss/_entry.scss | 31 +-- gtk-3.0/scss/_grid.scss | 2 +- gtk-3.0/scss/_infobar.scss | 40 ++-- gtk-3.0/scss/_menu.scss | 340 ++++++++++++++++---------------- gtk-3.0/scss/_notebook.scss | 227 ++++++++++----------- gtk-3.0/scss/_progress.scss | 320 +++++++++++++++--------------- gtk-3.0/scss/_scrollbar.scss | 88 +++++---- gtk-3.0/scss/_sidebar.scss | 183 ++++++++--------- gtk-3.0/scss/_spinner.scss | 26 +-- gtk-3.0/scss/_toggle.scss | 78 ++++---- gtk-3.0/scss/_toolbar.scss | 104 +++++----- gtk-3.0/scss/_view.scss | 369 ++++++++++++++++++----------------- gtk-3.0/scss/_window.scss | 56 +++--- gtk-3.0/scss/widgets.scss | 72 ------- 16 files changed, 988 insertions(+), 1015 deletions(-) diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index 4baaf0f..44cbcd2 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -145,29 +145,31 @@ .linked & { @include linked_button($bg, $dark_shadow); } } -%close_button { - border: 1px solid transparent; - background-color: transparent; - background-image: none; - box-shadow: none; - - &:focus, &:hover { - border: 1px solid alpha(black, 0.3); - background-color: alpha(white, 0.2); +@include exports("button") { + %close_button { + border: 1px solid transparent; + background-color: transparent; background-image: none; box-shadow: none; + + &:focus, &:hover { + border: 1px solid alpha(black, 0.3); + background-color: alpha(white, 0.2); + background-image: none; + box-shadow: none; + } + + &:active, &:checked, &:active:hover, &:checked:hover { + border: 1px solid alpha(black, 0.3); + background-color: alpha(black, 0.1); + background-image: none; + box-shadow: none; + } } - &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha(black, 0.3); - background-color: alpha(black, 0.1); - background-image: none; - box-shadow: none; + .button { + @include button($bg_color, $fg_color); + + &.default { @include button($selected_bg_color, $selected_fg_color); } } } - -.button { - @include button($bg_color, $fg_color); - - &.default { @include button($selected_bg_color, $selected_fg_color); } -} diff --git a/gtk-3.0/scss/_calendar.scss b/gtk-3.0/scss/_calendar.scss index a1be572..6eacde0 100644 --- a/gtk-3.0/scss/_calendar.scss +++ b/gtk-3.0/scss/_calendar.scss @@ -6,19 +6,22 @@ ! Calendar ***********/ -GtkCalendar { - padding: $spacing; - outline-offset: -1px; +@include exports("calendar") { + GtkCalendar { + padding: $spacing; + outline-offset: -1px; - &:inconsistent { color: mix($fg_color, $bg_color, 0.5); } + &:inconsistent { color: mix($fg_color, $bg_color, 0.5); } - &.view, &.highlight, &.header, &.button { - &, &:hover, &:insensitive { - border: none; - background-color: transparent; - background-image: none; + &.view, &.highlight, &.header, &.button { + &, &:hover, &:insensitive { + border: none; + background-color: transparent; + background-image: none; + } } - } - &.highlight { color: $selected_bg_color; } + &.highlight { color: $selected_bg_color; } + } } + diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss index d099aff..7720308 100755 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/_entry.scss @@ -72,27 +72,32 @@ &.image.left { padding-right: $spacing; } } -.entry { @include entry($base_color, $text_color); } +@include exports("entry") { + .entry { @include entry($base_color, $text_color); } +} /****************** ! Combobox entry * *******************/ -GtkComboBox.combobox-entry { - .entry { - &, &:hover, &:focus, &:active, &:insensitive { - border-width: 1px 0 1px 1px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; +@include exports("comboboxentry") { + GtkComboBox.combobox-entry { + .entry { + &, &:hover, &:focus, &:active, &:insensitive { + border-width: 1px 0 1px 1px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } } - } - .button { - &, &:hover, &:focus, &:active, &:insensitive { - border-width: 1px 1px 1px 1px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; + .button { + &, &:hover, &:focus, &:active, &:insensitive { + border-width: 1px 1px 1px 1px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } } } } + diff --git a/gtk-3.0/scss/_grid.scss b/gtk-3.0/scss/_grid.scss index 1f60beb..a92ba9a 100644 --- a/gtk-3.0/scss/_grid.scss +++ b/gtk-3.0/scss/_grid.scss @@ -13,7 +13,7 @@ &-row { border: none; border-radius: 0; - padding: 3px; + padding: $spacing; background-image: none; background-color: transparent; diff --git a/gtk-3.0/scss/_infobar.scss b/gtk-3.0/scss/_infobar.scss index 29a096b..848c247 100644 --- a/gtk-3.0/scss/_infobar.scss +++ b/gtk-3.0/scss/_infobar.scss @@ -7,31 +7,33 @@ ! Infobar **********/ -GtkInfoBar { - border: none; +@include exports("infobar") { + GtkInfoBar { + border: none; - $types: ( - info: ( $info_fg_color, $info_bg_color ), - warning: ( $warning_fg_color, $warning_bg_color ), - question: ( $question_fg_color, $question_bg_color ), - error: ( $error_fg_color, $error_bg_color ), - ); + $types: ( + info: ( $info_fg_color, $info_bg_color ), + warning: ( $warning_fg_color, $warning_bg_color ), + question: ( $question_fg_color, $question_bg_color ), + error: ( $error_fg_color, $error_bg_color ), + ); - @each $type, $colors in $types { - $fg_color: nth($colors, 1); - $bg_color: nth($colors, 2); + @each $type, $colors in $types { + $fg_color: nth($colors, 1); + $bg_color: nth($colors, 2); - &.#{$type} { - border: 1px solid shade($bg_color, 0.8); - background-color: $bg_color; - background-image: none; - color: $fg_color; + &.#{$type} { + border: 1px solid shade($bg_color, 0.8); + background-color: $bg_color; + background-image: none; + color: $fg_color; - .button { - @include button($bg_color, $fg_color); + .button { + @include button($bg_color, $fg_color); - &.close { @extend %close_button; } + &.close { @extend %close_button; } + } } } } diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss index 44fd1bf..6fa1a44 100755 --- a/gtk-3.0/scss/_menu.scss +++ b/gtk-3.0/scss/_menu.scss @@ -7,30 +7,32 @@ ! Menubar **********/ -.menubar { - -GtkWidget-window-dragging: true; +@include exports("menubar") { + .menubar { + -GtkWidget-window-dragging: true; - border: none; - background-color: $menubar_bg_color; - background-image: none; - color: $menubar_fg_color; - - - &.menuitem, .menuitem { - padding: $spacing ($spacing * 2); - border: 1px solid transparent; - background-color: transparent; + border: none; + background-color: $menubar_bg_color; background-image: none; color: $menubar_fg_color; - &:hover { - border-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); - background-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); - background-image: none; - color: shade($menubar_fg_color, 1.08); - } - & *:hover { color: shade($menubar_fg_color, 1.08); } + &.menuitem, .menuitem { + padding: $spacing ($spacing * 2); + border: 1px solid transparent; + background-color: transparent; + background-image: none; + color: $menubar_fg_color; + + &:hover { + border-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); + background-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); + background-image: none; + color: shade($menubar_fg_color, 1.08); + } + + & *:hover { color: shade($menubar_fg_color, 1.08); } + } } } @@ -39,185 +41,189 @@ ! Menu *******/ -GtkTreeMenu, GtkMenuToolButton, GtkComboBox { - &.menu, .menu { - background-color: $menu_bg_color; - margin: $spacing; - } -} - -#toolbar-popup, .menu { - padding: 0; - border-radius: 0; - border-style: none; - background-color: $menu_bg_color; - color: $menu_fg_color; - - &:selected { background-color: $selected_bg_color; } - - .button { - &, &:hover, &:active, &:active *:insensitive, &:insensitive { - border-width: 0; - background-color: transparent; - background-image: none; +@include exports("menu") { + GtkTreeMenu, GtkMenuToolButton, GtkComboBox { + &.menu, .menu { + background-color: $menu_bg_color; + margin: $spacing; } } -} -.context-menu { font: initial; } - -.menuitem { - GtkTreeMenu & { + #toolbar-popup, .menu { padding: 0; - border-width: 0; - } - - &, .menu & { - margin: $spacing; - padding: $spacing; - border: none; border-radius: 0; - background-color: transparent; - background-image: none; - - -GtkMenuItem-arrow-scaling: 0.5; - - &:active, &:hover { - border: none; - background-color: $selected_bg_color; - background-image: none; - color: $selected_fg_color; - } - - & *:active, & *:hover { color: $selected_fg_color; } - - &:insensitive, & *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); } - } - - &.check, &.radio { - &, &:focus, &:hover, &:insensitive { background-image: none; } - - &, &:focus, &:hover, &:active, &:insensitive { - border-style: none; - background-color: transparent; - } - } - - &.separator { - -GtkMenuItem-horizontal-padding: 0; - -GtkWidget-separator-height: 1; - border-style: none; - color: shade($menu_bg_color, .9); - } + background-color: $menu_bg_color; + color: $menu_fg_color; - &.button { - &, &:focus, &:active, &:insensitive, &:active:insensitive { - background-color: transparent; - background-image: none; - border-color: transparent; - border-style: none; - box-shadow: none; - color: currentColor; - } - - &:hover, &:focus:hover, &:active:hover, &:selected { - background-color: $selected_bg_color; - background-image: none; - color: $selected_fg_color; - } - } - - GtkCalendar { - &:inconsistent { color: mix($menu_fg_color, $menu_bg_color, .5); } + &:selected { background-color: $selected_bg_color; } .button { - border-style: none; - background-color: transparent; - background-image: none; + &, &:hover, &:active, &:active *:insensitive, &:insensitive { + border-width: 0; + background-color: transparent; + background-image: none; + } } } - .accelerator { - color: alpha($menu_fg_color, .6); + .context-menu { font: initial; } - &:hover { color: alpha($selected_fg_color, .8); } + .menuitem { + GtkTreeMenu & { + padding: 0; + border-width: 0; + } - &:insensitive { color: alpha(mix($menu_fg_color, $menu_bg_color, .5), .4); } + &, .menu & { + margin: $spacing; + padding: $spacing; + border: none; + border-radius: 0; + background-color: transparent; + background-image: none; + + -GtkMenuItem-arrow-scaling: 0.5; + + &:active, &:hover { + border: none; + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + + & *:active, & *:hover { color: $selected_fg_color; } + + &:insensitive, & *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); } + } + + &.check, &.radio { + &, &:focus, &:hover, &:insensitive { background-image: none; } + + &, &:focus, &:hover, &:active, &:insensitive { + border-style: none; + background-color: transparent; + } + } + + &.separator { + -GtkMenuItem-horizontal-padding: 0; + -GtkWidget-separator-height: 1; + + border-style: none; + color: shade($menu_bg_color, .9); + } + + &.button { + &, &:focus, &:active, &:insensitive, &:active:insensitive { + background-color: transparent; + background-image: none; + border-color: transparent; + border-style: none; + box-shadow: none; + color: currentColor; + } + + &:hover, &:focus:hover, &:active:hover, &:selected { + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + } + + GtkCalendar { + &:inconsistent { color: mix($menu_fg_color, $menu_bg_color, .5); } + + .button { + border-style: none; + background-color: transparent; + background-image: none; + } + } + + .accelerator { + color: alpha($menu_fg_color, .6); + + &:hover { color: alpha($selected_fg_color, .8); } + + &:insensitive { color: alpha(mix($menu_fg_color, $menu_bg_color, .5), .4); } + } + + .entry { @include entry($menu_bg_color, $menu_fg_color); } } - .entry { @include entry($menu_bg_color, $menu_fg_color); } + GtkModelMenuItem GtkBox GtkImage { padding-right: $spacing; } } -GtkModelMenuItem GtkBox GtkImage { padding-right: $spacing; } - /********* ! Popover **********/ -GtkPopover { - @include border($menu_bg_color); +@include exports("popover") { + GtkPopover { + @include border($menu_bg_color); - margin: 10px; - padding: $spacing; - border-radius: $roundness; - border-width: 1px; - border-style: solid; - background-clip: border-box; - background-color: $menu_bg_color; - background-image: none; - color: $menu_fg_color; - box-shadow: 0 2px 3px alpha(black, .5); - - &.background { - background-image: none; + margin: 10px; + padding: $spacing; + border-radius: $roundness; + border-width: 1px; + border-style: solid; + background-clip: border-box; background-color: $menu_bg_color; + background-image: none; color: $menu_fg_color; - } + box-shadow: 0 2px 3px alpha(black, .5); - &:backdrop { box-shadow: none; } - - &.osd { - box-shadow: 0 2px 7px 3px alpha(black, .5); - - > .toolbar .button { - border-radius: 0; - border-width: 0; + &.background { background-image: none; - background-color: transparent; - } - } - - > .list, > .view, > .toolbar { background-color: transparent; } - - .separator { - border: 0; - background-color: transparent; - color: alpha($menu_bg_color, .5); - font-size: 80%; - font-weight: bold; - } -} - -GtkModelButton.button { - &, &:focus, &:active, &:insensitive, &:active:insensitive { - &, &:backdrop { - background-color: transparent; - background-image: none; - border-color: transparent; - border-image: none; - border-style: none; - box-shadow: none; + background-color: $menu_bg_color; color: $menu_fg_color; } + + &:backdrop { box-shadow: none; } + + &.osd { + box-shadow: 0 2px 7px 3px alpha(black, .5); + + > .toolbar .button { + border-radius: 0; + border-width: 0; + background-image: none; + background-color: transparent; + } + } + + > .list, > .view, > .toolbar { background-color: transparent; } + + .separator { + border: 0; + background-color: transparent; + color: alpha($menu_bg_color, .5); + font-size: 80%; + font-weight: bold; + } } - &:focus:hover, &:active:hover, &:hover, &:selected { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - border: none; - border-radius: 2px; + GtkModelButton.button { + &, &:focus, &:active, &:insensitive, &:active:insensitive { + &, &:backdrop { + background-color: transparent; + background-image: none; + border-color: transparent; + border-image: none; + border-style: none; + box-shadow: none; + color: $menu_fg_color; + } + } + + &:focus:hover, &:active:hover, &:hover, &:selected { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + border: none; + border-radius: 2px; + } } } diff --git a/gtk-3.0/scss/_notebook.scss b/gtk-3.0/scss/_notebook.scss index b16b0d6..defac44 100644 --- a/gtk-3.0/scss/_notebook.scss +++ b/gtk-3.0/scss/_notebook.scss @@ -1,134 +1,137 @@ @import "functions"; @import "global"; + /********** ! Notebook ***********/ -.notebook { - padding: 0; - border-width: 1px 0 0 0; - border-style: solid; - border-color: border_normal($base_color); - border-radius: 0; - background-color: $base_color; - background-image: none; - background-clip: border-box; - color: $text_color; - - -GtkNotebook-initial-gap: 0; - -GtkNotebook-arrow-spacing: 5; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 1; - -GtkNotebook-has-tab-gap: false; - - &.frame { border-width: 1px; } - - &.header { - border-width: 0; - background-color: shade($base_color, 0.85); - - &.frame { - border-color: shade($base_color, 0.75); - - &.top { border-width: 1px 1px 0 1px; } - - &.right { border-width: 1px 1px 1px 0; } - - &.bottom { border-width: 0 1px 1px 1px; } - - &.left { border-width: 1px 0 1px 1px; } - } - } - - GtkViewport { - border-width: 0; +@include exports("notebook") { + .notebook { + padding: 0; + border-width: 1px 0 0 0; + border-style: solid; + border-color: border_normal($base_color); + border-radius: 0; background-color: $base_color; - color: $text_color; - } - - tab { - padding: $spacing ($spacing * 2); - border: 1px solid transparent; - background-color: transparent; background-image: none; + background-clip: border-box; + color: $text_color; - &:active { + -GtkNotebook-initial-gap: 0; + -GtkNotebook-arrow-spacing: 5; + -GtkNotebook-tab-curvature: 0; + -GtkNotebook-tab-overlap: 1; + -GtkNotebook-has-tab-gap: false; + + &.frame { border-width: 1px; } + + &.header { + border-width: 0; + background-color: shade($base_color, 0.85); + + &.frame { + border-color: shade($base_color, 0.75); + + &.top { border-width: 1px 1px 0 1px; } + + &.right { border-width: 1px 1px 1px 0; } + + &.bottom { border-width: 0 1px 1px 1px; } + + &.left { border-width: 1px 0 1px 1px; } + } + } + + GtkViewport { + border-width: 0; + background-color: $base_color; + color: $text_color; + } + + tab { + padding: $spacing ($spacing * 2); + border: 1px solid transparent; background-color: transparent; background-image: none; + + &:active { + background-color: transparent; + background-image: none; + } + + &.top { + border-bottom-width: 2px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + + &:hover { border-bottom-color: alpha($selected_bg_color, 0.3); } + + &:active { border-bottom-color: $selected_bg_color; } + } + + &.right { + border-left-width: 2px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + + &:hover { border-left-color: alpha($selected_bg_color, 0.3); } + + &:active { border-left-color: $selected_bg_color; } + } + + + &.bottom { + border-top-width: 2px; + border-top-right-radius: 0; + border-top-left-radius: 0; + + &:hover { border-top-color: alpha($selected_bg_color, 0.3); } + + &:active { border-top-color: $selected_bg_color; } + } + + &.left { + border-right-width: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + + &:hover { border-right-color: alpha($selected_bg_color, 0.3); } + + &:active { border-right-color: $selected_bg_color; } + } + + GtkLabel { color: mix($text_color, $base_color, 0.3); } + + /* close button styling */ + .button { @extend %close_button; } } - &.top { - border-bottom-width: 2px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - - &:hover { border-bottom-color: alpha($selected_bg_color, 0.3); } - - &:active { border-bottom-color: $selected_bg_color; } + .prelight-page { + &, GtkLabel { color: mix($text_color, $base_color, 0.15); } } - &.right { - border-left-width: 2px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - - &:hover { border-left-color: alpha($selected_bg_color, 0.3); } - - &:active { border-left-color: $selected_bg_color; } + .active-page { + &, GtkLabel { color: $text_color; } } + .reorderable-page { + &:hover { + background-color: shade($base_color, 0.85); + border-left: 0; + border-right: 0; + /* using box shadows instead of borders due to slanted edges */ + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); + } - &.bottom { - border-top-width: 2px; - border-top-right-radius: 0; - border-top-left-radius: 0; - - &:hover { border-top-color: alpha($selected_bg_color, 0.3); } - - &:active { border-top-color: $selected_bg_color; } - } - - &.left { - border-right-width: 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - - &:hover { border-right-color: alpha($selected_bg_color, 0.3); } - - &:active { border-right-color: $selected_bg_color; } - } - - GtkLabel { color: mix($text_color, $base_color, 0.3); } - - /* close button styling */ - .button { @extend %close_button; } - } - - .prelight-page { - &, GtkLabel { color: mix($text_color, $base_color, 0.15); } - } - - .active-page { - &, GtkLabel { color: $text_color; } - } - - .reorderable-page { - &:hover { - background-color: shade($base_color, 0.85); - border-left: 0; - border-right: 0; - /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); - } - - &:active { - background-color: shade($base_color, 0.90); - border-left: 0; - border-right: 0; - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); + &:active { + background-color: shade($base_color, 0.90); + border-left: 0; + border-right: 0; + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); + } } } } diff --git a/gtk-3.0/scss/_progress.scss b/gtk-3.0/scss/_progress.scss index f648f95..b5ccb30 100644 --- a/gtk-3.0/scss/_progress.scss +++ b/gtk-3.0/scss/_progress.scss @@ -6,189 +6,191 @@ ! Progress bars * ******************/ -GtkProgressBar { - padding: 0; - border-radius: $roundness; - font-size: smaller; - color: alpha($fg_color, 0.6); +@include exports("progressbar") { + GtkProgressBar { + padding: 0; + border-radius: $roundness; + font-size: smaller; + color: alpha($fg_color, 0.6); - -GtkProgressBar-min-horizontal-bar-height: 12; - -GtkProgressBar-min-vertical-bar-width: 12; + -GtkProgressBar-min-horizontal-bar-height: 12; + -GtkProgressBar-min-vertical-bar-width: 12; - &.osd { - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 0; - -GtkProgressBar-min-horizontal-bar-height: 3; + &.osd { + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 0; + -GtkProgressBar-min-horizontal-bar-height: 3; + } + + &.trough { + border: 1px solid alpha(border_normal($bg_color), 0.5); + background-color: shade($bg_color, 1.08); + background-image: none; + } } - &.trough { - border: 1px solid alpha(border_normal($bg_color), 0.5); - background-color: shade($bg_color, 1.08); - background-image: none; - } -} - -.progressbar { - background-image: none; - background-color: $selected_bg_color; - border-radius: 0; - box-shadow: none; - - &.left { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } - - &.right { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - &.left.right { box-shadow: none; } - - &.vertical { + .progressbar { background-image: none; background-color: $selected_bg_color; + border-radius: 0; + box-shadow: none; - &.bottom { + &.left { + border-top-left-radius: $roundness; border-bottom-left-radius: $roundness; + } + + &.right { + border-top-right-radius: $roundness; border-bottom-right-radius: $roundness; } - &.top { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; - } - } -} + &.left.right { box-shadow: none; } -GtkLevelBar { - -GtkLevelBar-min-block-width: 34; - -GtkLevelBar-min-block-height: 3; - - &.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; - } -} - -.level-bar { - &.trough { - border: 1px solid alpha(border_normal($bg_color), 0.5); - background-color: shade($bg_color, 1.08); - background-image: none; - border-radius: $roundness; - } - - &.fill-block { - // FIXME: it would be nice to set make fill blocks bigger, but we'd need - // :nth-child working on discrete indicators - background-color: $selected_bg_color; - border-color: transparent; - border-radius: 0; - - &.indicator-discrete { - &.horizontal { margin-right: 1px; } - &.vertical { margin-bottom: 1px; } - } - - &.level-high { - background-color: $success_color; - border-color: transparent; - } - - &.level-low { - background-color: $warning_color; - border-color: transparent; - } - - &.empty-fill-block { - background-color: transparent; - border-color: transparent; - box-shadow: none; - } - } -} - -.scale { - -GtkRange-slider-width: 16; - -GtkRange-trough-border: 1; - -GtkScale-slider-length: 16; - - padding: 0; - border-width: 1px; - border-radius: $roundness; - outline-offset: -1px; - - - &.slider { - border-radius: 8px; - background-color: shade($bg_color, 1.08); - background-image: none; - /* we will draw the border using box shadow for now */ - box-shadow: inset 1px 0 border_normal($bg_color), - inset 0 1px border_normal($bg_color), - inset -1px 0 border_normal($bg_color), - inset 0 -1px border_normal($bg_color); - - &:hover, &:focus { - box-shadow: inset 1px 0 border_focus($bg_color), - inset 0 1px border_focus($bg_color), - inset -1px 0 border_focus($bg_color), - inset 0 -1px border_focus($bg_color); - } - - &:active { - box-shadow: inset 1px 0 border_active($bg_color), - inset 0 1px border_active($bg_color), - inset -1px 0 border_active($bg_color), - inset 0 -1px border_active($bg_color); - } - - &:insensitive { - background-color: shade($bg_color, 0.9); + &.vertical { background-image: none; - box-shadow: inset 1px 0 border_insensitive($bg_color), - inset 0 1px border_insensitive($bg_color), - inset -1px 0 border_insensitive($bg_color), - inset 0 -1px border_insensitive($bg_color); - } - } + background-color: $selected_bg_color; - &.fine-tune { - &, &.horizontal { - &:active, &:active:hover { - background-size: 50%; - background-repeat: no-repeat; - background-position: center; + &.bottom { + border-bottom-left-radius: $roundness; + border-bottom-right-radius: $roundness; + } + + &.top { + border-top-left-radius: $roundness; + border-top-right-radius: $roundness; } } } - &.mark { border-color: alpha(border_normal($bg_color), 0.5); } + GtkLevelBar { + -GtkLevelBar-min-block-width: 34; + -GtkLevelBar-min-block-height: 3; - - &.trough { - margin: 7px 0; - border: 1px solid alpha(border_normal($bg_color), 0.5); - border-radius: $roundness; - background-color: shade($bg_color, 1.08); - background-image: none; - - &:insensitive { background-color: shade($bg_color, 0.9); } - - &.vertical { margin: 0 7px; } + &.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; + } } - &.highlight { - &, &.left, &.bottom { - border-color: $selected_bg_color; - background-color: $selected_bg_color; + .level-bar { + &.trough { + border: 1px solid alpha(border_normal($bg_color), 0.5); + background-color: shade($bg_color, 1.08); background-image: none; + border-radius: $roundness; + } + + &.fill-block { + // FIXME: it would be nice to set make fill blocks bigger, but we'd need + // :nth-child working on discrete indicators + background-color: $selected_bg_color; + border-color: transparent; + border-radius: 0; + + &.indicator-discrete { + &.horizontal { margin-right: 1px; } + &.vertical { margin-bottom: 1px; } + } + + &.level-high { + background-color: $success_color; + border-color: transparent; + } + + &.level-low { + background-color: $warning_color; + border-color: transparent; + } + + &.empty-fill-block { + background-color: transparent; + border-color: transparent; + box-shadow: none; + } + } + } + + .scale { + -GtkRange-slider-width: 16; + -GtkRange-trough-border: 1; + -GtkScale-slider-length: 16; + + padding: 0; + border-width: 1px; + border-radius: $roundness; + outline-offset: -1px; + + + &.slider { + border-radius: 8px; + background-color: shade($bg_color, 1.08); + background-image: none; + /* we will draw the border using box shadow for now */ + box-shadow: inset 1px 0 border_normal($bg_color), + inset 0 1px border_normal($bg_color), + inset -1px 0 border_normal($bg_color), + inset 0 -1px border_normal($bg_color); + + &:hover, &:focus { + box-shadow: inset 1px 0 border_focus($bg_color), + inset 0 1px border_focus($bg_color), + inset -1px 0 border_focus($bg_color), + inset 0 -1px border_focus($bg_color); + } + + &:active { + box-shadow: inset 1px 0 border_active($bg_color), + inset 0 1px border_active($bg_color), + inset -1px 0 border_active($bg_color), + inset 0 -1px border_active($bg_color); + } &:insensitive { - border-color: shade($bg_color, 0.7); - background-color: shade($bg_color, 0.8); + background-color: shade($bg_color, 0.9); + background-image: none; + box-shadow: inset 1px 0 border_insensitive($bg_color), + inset 0 1px border_insensitive($bg_color), + inset -1px 0 border_insensitive($bg_color), + inset 0 -1px border_insensitive($bg_color); + } + } + + &.fine-tune { + &, &.horizontal { + &:active, &:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; + } + } + } + + &.mark { border-color: alpha(border_normal($bg_color), 0.5); } + + + &.trough { + margin: 7px 0; + border: 1px solid alpha(border_normal($bg_color), 0.5); + border-radius: $roundness; + background-color: shade($bg_color, 1.08); + background-image: none; + + &:insensitive { background-color: shade($bg_color, 0.9); } + + &.vertical { margin: 0 7px; } + } + + &.highlight { + &, &.left, &.bottom { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + background-image: none; + + &:insensitive { + border-color: shade($bg_color, 0.7); + background-color: shade($bg_color, 0.8); + } } } } diff --git a/gtk-3.0/scss/_scrollbar.scss b/gtk-3.0/scss/_scrollbar.scss index 8412d5d..7777280 100644 --- a/gtk-3.0/scss/_scrollbar.scss +++ b/gtk-3.0/scss/_scrollbar.scss @@ -5,57 +5,59 @@ ! Scrollbar ************/ -.scrollbar { - border: none; - padding: 0; +@include exports("scrollbar") { + .scrollbar { + border: none; + padding: 0; - &.button { - &, &:active, &:active:hover { - border-width: 0; + &.button { + &, &:active, &:active:hover { + border-width: 0; + border-radius: 0; + background-color: transparent; + background-image: none; + color: shade($bg_color, 0.6); + } + } + + &.slider, &.slider.vertical { + border: 1px solid mix(shade($bg_color, 0.87), $fg_color, 0.21); border-radius: 0; - background-color: transparent; - background-image: none; - color: shade($bg_color, 0.6); + background-color: mix($bg_color, $fg_color, 0.21); + + &:hover { + border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31); + background-color: mix($bg_color, $fg_color, 0.31); + } + + &:active { + border-color: shade($selected_bg_color, 0.9); + background-color: $selected_bg_color; + } + + &.fine-tune:prelight:active { + border-width: 2px; + border-color: transparent; + } } } - &.slider, &.slider.vertical { - border: 1px solid mix(shade($bg_color, 0.87), $fg_color, 0.21); + .scrollbars-junction, + .scrollbar.trough { + border: none; border-radius: 0; - background-color: mix($bg_color, $fg_color, 0.21); + background-color: $bg_color; + background-image: none; + } - &:hover { - border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31); - background-color: mix($bg_color, $fg_color, 0.31); - } + /* overlay scrollbar */ + OsThumb, OsScrollbar { + color: shade($bg_color, 0.7); - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - } + &:selected { background-color: $selected_bg_color; } - &.fine-tune:prelight:active { - border-width: 2px; - border-color: transparent; - } + &:active { background-color: $selected_bg_color; } + + &:insensitive { background-color: shade($bg_color, 0.9); } } } - -.scrollbars-junction, -.scrollbar.trough { - border: none; - border-radius: 0; - background-color: $bg_color; - background-image: none; -} - -/* overlay scrollbar */ -OsThumb, OsScrollbar { - color: shade($bg_color, 0.7); - - &:selected { background-color: $selected_bg_color; } - - &:active { background-color: $selected_bg_color; } - - &:insensitive { background-color: shade($bg_color, 0.9); } -} diff --git a/gtk-3.0/scss/_sidebar.scss b/gtk-3.0/scss/_sidebar.scss index b6658a9..78e1b89 100755 --- a/gtk-3.0/scss/_sidebar.scss +++ b/gtk-3.0/scss/_sidebar.scss @@ -6,69 +6,71 @@ ! Sidebar **********/ -.sidebar { - &, &.view, & .view, & GtkScrolledWindow { - background-color: $bg_color; - color: mix($fg_color, $bg_color, 0.1); +@include exports("sidebar") { + .sidebar { + &, &.view, & .view, & GtkScrolledWindow { + background-color: $bg_color; + color: mix($fg_color, $bg_color, 0.1); - &.separator { - &, &:hover, &:focus { - border-width: 1px; - border-style: solid; - border-color: shade($bg_color, 0.9); - color: shade($bg_color, 0.9); + &.separator { + &, &:hover, &:focus { + border-width: 1px; + border-style: solid; + border-color: shade($bg_color, 0.9); + color: shade($bg_color, 0.9); + } } } - } - row, .view row { - &:selected { - &, &:hover, &:focus { - border: none; - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; + row, .view row { + &:selected { + &, &:hover, &:focus { + border: none; + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + &:prelight { + border: none; + background-image: none; + background-color: shade($selected_bg_color, 1.05); + color: $selected_fg_color; + } } - &:prelight { - border: none; - background-image: none; - background-color: shade($selected_bg_color, 1.05); - color: $selected_fg_color; - } - } - - &:prelight { - border: none; - background-image: none; - background-color: shade($bg_color, 0.95); - color: $fg_color; - } - } - - .frame { border-width: 0; } - - GtkAssistant & { - padding: 4px; - border-width: 0 1px 0 0; - border-style: solid; - border-right-color: border_normal($bg_color); - border-radius: 0; - background-color: $bg_color; - color: mix($fg_color, $bg_color, 0.1); - - &:dir(ltr) { border-width: 0 1px 0 0; } - &:dir(rtl) { border-width: 0 0 0 1px; } - - GtkLabel { - padding: $spacing ($spacing * 2); - - &.highlight { background-color: mix($bg_color, $fg_color, 0.80); } + &:prelight { + border: none; + background-image: none; + background-color: shade($bg_color, 0.95); + color: $fg_color; + } } - &.csd .sidebar { border-top-style: none; } + .frame { border-width: 0; } - .highlight { font: bold; } + GtkAssistant & { + padding: 4px; + border-width: 0 1px 0 0; + border-style: solid; + border-right-color: border_normal($bg_color); + border-radius: 0; + background-color: $bg_color; + color: mix($fg_color, $bg_color, 0.1); + + &:dir(ltr) { border-width: 0 1px 0 0; } + &:dir(rtl) { border-width: 0 0 0 1px; } + + GtkLabel { + padding: $spacing ($spacing * 2); + + &.highlight { background-color: mix($bg_color, $fg_color, 0.80); } + } + + &.csd .sidebar { border-top-style: none; } + + .highlight { font: bold; } + } } } @@ -77,42 +79,47 @@ ! Pane separator ****************/ -.pane-separator { - &, &.horizontal { - background-image: linear-gradient(to bottom, - shade($bg_color, 0.8) 0%, - shade($bg_color, 0.8) 20%, - transparent 20%, - transparent 45%, - shade($bg_color, 0.8) 45%, - shade($bg_color, 0.8) 55%, - transparent 55%, - transparent 80%, - shade($bg_color, 0.8) 80%, - shade($bg_color, 0.8) - ); +@include exports("paneseparator") { + .pane-separator { + background-color: $bg_color; + color: transparent; - background-size: 4px 10px; - background-repeat: no-repeat; - background-position: center center; - } + &, &.horizontal { + background-image: linear-gradient(to bottom, + shade($bg_color, 0.8) 0%, + shade($bg_color, 0.8) 20%, + transparent 20%, + transparent 45%, + shade($bg_color, 0.8) 45%, + shade($bg_color, 0.8) 55%, + transparent 55%, + transparent 80%, + shade($bg_color, 0.8) 80%, + shade($bg_color, 0.8) + ); - &.vertical { - background-image: linear-gradient(to right, - shade($bg_color, 0.8) 0%, - shade($bg_color, 0.8) 20%, - transparent 20%, - transparent 45%, - shade($bg_color, 0.8) 45%, - shade($bg_color, 0.8) 55%, - transparent 55%, - transparent 80%, - shade($bg_color, 0.8) 80%, - shade($bg_color, 0.8) - ); + background-size: 4px 10px; + background-repeat: no-repeat; + background-position: center center; + } - background-size: 10px 4px; - background-repeat: no-repeat; - background-position: center center; + &.vertical { + background-image: linear-gradient(to right, + shade($bg_color, 0.8) 0%, + shade($bg_color, 0.8) 20%, + transparent 20%, + transparent 45%, + shade($bg_color, 0.8) 45%, + shade($bg_color, 0.8) 55%, + transparent 55%, + transparent 80%, + shade($bg_color, 0.8) 80%, + shade($bg_color, 0.8) + ); + + background-size: 10px 4px; + background-repeat: no-repeat; + background-position: center center; + } } } diff --git a/gtk-3.0/scss/_spinner.scss b/gtk-3.0/scss/_spinner.scss index f8b00e7..ee50103 100644 --- a/gtk-3.0/scss/_spinner.scss +++ b/gtk-3.0/scss/_spinner.scss @@ -6,21 +6,23 @@ ! Spinner animation ********************/ -@keyframes spin { - to { -gtk-icon-transform: rotate(1turn); } -} +@include exports("spinner") { + @keyframes spin { + to { -gtk-icon-transform: rotate(1turn); } + } -.spinner { - background-image: none; - background-color: $selected_bg_color; - opacity: 0; // non spinning spinner makes no sense + .spinner { + background-image: none; + background-color: $selected_bg_color; + opacity: 0; // non spinning spinner makes no sense - -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); - &:active { - opacity: 1; - animation: spin 1s linear infinite; + &:active { + opacity: 1; + animation: spin 1s linear infinite; - &:insensitive { opacity: 0.5; } + &:insensitive { opacity: 0.5; } + } } } diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/_toggle.scss index 43e0fc1..4e0199a 100755 --- a/gtk-3.0/scss/_toggle.scss +++ b/gtk-3.0/scss/_toggle.scss @@ -6,11 +6,6 @@ ! Check and Radio items ************************/ -* { - -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 14; -} - @mixin toggle($type) { background-image: none; @@ -53,14 +48,21 @@ } } -.radio { @include toggle("radio"); } +@include exports("checkradio") { + * { + -GtkCheckButton-indicator-size: 16; + -GtkCheckMenuItem-indicator-size: 14; + } -.check { @include toggle("checkbox"); } + .radio { @include toggle("radio"); } -GtkIconView.content-view.cell.check { - -gtk-icon-source: url("assets/grid-selection-unchecked.svg"); + .check { @include toggle("checkbox"); } - &:active { -gtk-icon-source: url("assets/grid-selection-checked.svg"); } + GtkIconView.content-view.cell.check { + -gtk-icon-source: url("assets/grid-selection-unchecked.svg"); + + &:active { -gtk-icon-source: url("assets/grid-selection-checked.svg"); } + } } @@ -68,37 +70,39 @@ GtkIconView.content-view.cell.check { ! Switch *********/ -GtkSwitch { - padding: 0; - border-radius: $roundness; - font: bold condensed; - outline-offset: -4px; +@include exports("switch") { + GtkSwitch { + padding: 0; + border-radius: $roundness; + font: bold condensed; + outline-offset: -4px; - &.slider { - border: 1px solid shade($bg_color, 0.8); - background-color: shade($bg_color, 1.08); + &.slider { + border: 1px solid shade($bg_color, 0.8); + background-color: shade($bg_color, 1.08); - &:insensitive { - border-color: shade($bg_color, 0.85); - background-color: shade($bg_color, 0.9); - } - } - - &.trough { - border-color: shade($bg_color, 0.8); - background-color: shade($bg_color, 0.95); - color: $fg_color; - - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - color: $selected_fg_color; + &:insensitive { + border-color: shade($bg_color, 0.85); + background-color: shade($bg_color, 0.9); + } } - &:insensitive { - border-color: shade($bg_color, 0.85); - background-color: shade($bg_color, 0.9); - color: mix($fg_color, $bg_color, 0.5); + &.trough { + border-color: shade($bg_color, 0.8); + background-color: shade($bg_color, 0.95); + color: $fg_color; + + &:active { + border-color: shade($selected_bg_color, 0.9); + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + &:insensitive { + border-color: shade($bg_color, 0.85); + background-color: shade($bg_color, 0.9); + color: mix($fg_color, $bg_color, 0.5); + } } } } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index 4721a6d..79ca6c1 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -49,67 +49,69 @@ .menubar { -GtkToolbar-button-relief: normal; } } -.toolbar { - @include toolbar($bg_color, $fg_color); +@include exports("toolbar") { + .toolbar { + @include toolbar($bg_color, $fg_color); - border-style: none; -} + border-style: none; + } -.header-bar { - @include toolbar($titlebar_bg_color, $titlebar_fg_color); + .header-bar { + @include toolbar($titlebar_bg_color, $titlebar_fg_color); - border-width: 0 0 1px 0; - border-style: solid; -} + border-width: 0 0 1px 0; + border-style: solid; + } -.titlebar { - @include linear-gradient($titlebar_bg_color); - - border-radius: $roundness $roundness 0 0; - color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - - &:backdrop { + .titlebar { @include linear-gradient($titlebar_bg_color); - color: mix($titlebar_fg_color, $titlebar_bg_color, .6); - text-shadow: none; - } - - &.default-decoration { - border: none; - box-shadow: none; - } - - .tiled &, .maximized & { border-radius: 0; } - - .title { font: bold; } - - .titlebutton { - padding: $spacing; - border: none; - background-image: none; - background-color: transparent; + border-radius: $roundness $roundness 0 0; color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - box-shadow: none; - - &:hover, &:hover:focus { - background-image: none; - background-color: transparent; - color: $selected_bg_color; - box-shadow: none; - } - - &:active, &:active:hover { - background-image: none; - background-color: transparent; - color: darken($selected_bg_color, 10%); - box-shadow: none; - } &:backdrop { - background: none; + @include linear-gradient($titlebar_bg_color); + color: mix($titlebar_fg_color, $titlebar_bg_color, .6); - icon-shadow: none; + text-shadow: none; + } + + &.default-decoration { + border: none; + box-shadow: none; + } + + .tiled &, .maximized & { border-radius: 0; } + + .title { font: bold; } + + .titlebutton { + padding: $spacing; + border: none; + background-image: none; + background-color: transparent; + color: mix($titlebar_fg_color, $titlebar_bg_color, .1); + box-shadow: none; + + &:hover, &:hover:focus { + background-image: none; + background-color: transparent; + color: $selected_bg_color; + box-shadow: none; + } + + &:active, &:active:hover { + background-image: none; + background-color: transparent; + color: darken($selected_bg_color, 10%); + box-shadow: none; + } + + &:backdrop { + background: none; + color: mix($titlebar_fg_color, $titlebar_bg_color, .6); + icon-shadow: none; + } } } } diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index e7c0155..cf5e5d9 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -6,125 +6,128 @@ ! Generic views ****************/ -.view { - color: $text_color; - background-color: $base_color; - - &:insensitive, &:insensitive:insensitive { - background-color: shade($base_color, 0.9); - color: mix($text_color, $base_color, 0.5); - } - - &:selected, &:selected:focus { @extend %selected_items; } -} - -.cell { - border-width: 0; - border-radius: 0; - - &:selected, &:selected:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } -} - -row { - &:selected { - &, &:hover, &:focus { - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; - - border: none; - background-color: $selected_bg_color; - background-image: none; - color: $selected_fg_color; - } - } -} - -.content-view { - &.view { +@include exports("view") { + .view { + color: $text_color; background-color: $base_color; - &:prelight { background-color: alpha($selected_bg_color, 0.6); } - - &:selected, &:active { background-color: $selected_bg_color; } - - &:insensitive { background-color: shade($base_color, 0.9); } - - &.check { - &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } + &:insensitive, &:insensitive:insensitive { + background-color: shade($base_color, 0.9); + color: mix($text_color, $base_color, 0.5); } + + &:selected, &:selected:focus { @extend %selected_items; } } - .subtitle { - font: smaller; - padding: 0 12px; - } -} + .cell { + border-width: 0; + border-radius: 0; -GtkIconView { - &.content-view.check { @extend .content-view.check; } - - &.view.cell { &:selected, &:selected:focus { - border: none; - border-radius: 2px; - background-image: none; background-color: $selected_bg_color; color: $selected_fg_color; } } -} -.dim-label { - &, &.view { color: alpha(currentColor, 0.5); } -} + row { + &:selected { + &, &:hover, &:focus { + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; -.dnd { border: 1px solid $selected_bg_color; } + border: none; + background-color: $selected_bg_color; + background-image: none; + color: $selected_fg_color; + } + } + } -.grip { background-color: transparent; } + .content-view { + &.view { + background-color: $base_color; -.arrow { color: alpha(currentColor, 0.7); } + &:prelight { background-color: alpha($selected_bg_color, 0.6); } -.rubberband { - &, &.view, &.content-view.view { - border: 1px solid $selected_bg_color; - border-radius: 0; - background-color: alpha($selected_bg_color, 0.3); + &:selected, &:active { background-color: $selected_bg_color; } + + &:insensitive { background-color: shade($base_color, 0.9); } + + &.check { + &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } + } + } + + .subtitle { + font: smaller; + padding: 0 12px; + } + } + + GtkIconView { + &.content-view.check { @extend .content-view.check; } + + &.view.cell { + &:selected, &:selected:focus { + border: none; + border-radius: 2px; + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + } + + .dim-label { + &, &.view { color: alpha(currentColor, 0.5); } + } + + .dnd { border: 1px solid $selected_bg_color; } + + .grip { background-color: transparent; } + + .arrow { color: alpha(currentColor, 0.7); } + + .rubberband { + &, &.view, &.content-view.view { + border: 1px solid $selected_bg_color; + border-radius: 0; + background-color: alpha($selected_bg_color, 0.3); + } + } + + /* used by GtkScrolledWindow, shown when content is touch-dragged past boundaries. */ + .overshoot { background-color: alpha($selected_bg_color, 0.3); } + + GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } + + /* this will get overridden by .view, needed by gedit line numbers */ + GtkTextView { background-color: mix($bg_color, $base_color, 0.50); } + + GtkDrawingArea, GtkHTML { + @extend .view; + + &:insensitive { background-color: shade($base_color, 0.9); } } } -/* used by GtkScrolledWindow, shown when content is touch-dragged past boundaries. */ -.overshoot { background-color: alpha($selected_bg_color, 0.3); } - -GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } - -/* this will get overridden by .view, needed by gedit line numbers */ -GtkTextView { background-color: mix($bg_color, $base_color, 0.50); } - -GtkDrawingArea, GtkHTML { - @extend .view; - - &:insensitive { background-color: shade($base_color, 0.9); } -} - - /************ ! Treeview * *************/ -GtkTreeView { - -GtkTreeView-vertical-separator: 0; +@include exports("treeview") { + GtkTreeView { + -GtkTreeView-vertical-separator: 0; - outline-offset: -1px; + outline-offset: -1px; - &.dnd { border: 1px solid $selected_bg_color; } + &.dnd { border: 1px solid $selected_bg_color; } - .entry { - border-radius: 0; - background-color: $base_color; - background-image: none; + .entry { + border-radius: 0; + background-color: $base_color; + background-image: none; + } } } @@ -133,28 +136,30 @@ GtkTreeView { ! Column view headers **********************/ -column-header { - .button { - &, &:active { - border-width: 0 1px 1px 0; - border-radius: 0; - } +@include exports("columnheader") { + column-header { + .button { + &, &:active { + border-width: 0 1px 1px 0; + border-radius: 0; + } - &, &:active, &:focus, &:active:focus { - border-color: shade($base_color, 0.9); - border-bottom-color: shade($base_color, 0.8); - background-color: shade($base_color, 0.97); - background-image: none; - } + &, &:active, &:focus, &:active:focus { + border-color: shade($base_color, 0.9); + border-bottom-color: shade($base_color, 0.8); + background-color: shade($base_color, 0.97); + background-image: none; + } - &:hover, &:active:hover, &:hover:focus, &:active:hover:focus { - border-color: shade($base_color, 0.9); - border-bottom-color: shade($base_color, 0.8); - background-color: shade($base_color, 0.99); - background-image: none; - } + &:hover, &:active:hover, &:hover:focus, &:active:hover:focus { + border-color: shade($base_color, 0.9); + border-bottom-color: shade($base_color, 0.8); + background-color: shade($base_color, 0.99); + background-image: none; + } - &:last-child .button { border-width: 0 0 1px 0; } + &:last-child .button { border-width: 0 0 1px 0; } + } } } @@ -163,13 +168,15 @@ column-header { ! Frames * ***********/ -.frame { border: none; } +@include exports("frame") { + .frame { border: none; } -GtkScrolledWindow { - &.frame { border: 1px solid border_normal($bg_color); } + GtkScrolledWindow { + &.frame { border: 1px solid border_normal($bg_color); } - /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ - GtkViewport.frame { border: none; } + /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ + GtkViewport.frame { border: none; } + } } @@ -177,23 +184,25 @@ GtkScrolledWindow { ! Expanders * **************/ -GtkExpander { - padding: $spacing; - outline-offset: 1px; -} - -.expander { - color: alpha(currentColor, 0.7); - border: alpha(currentColor, 0.7); - - &:hover { - color: alpha(currentColor, 0.8); - border-color: alpha(currentColor, 0.8); +@include exports("expander") { + GtkExpander { + padding: $spacing; + outline-offset: 1px; } - &:active { - color: alpha(currentColor, 0.9); - border-color: alpha(currentColor, 0.9); + .expander { + color: alpha(currentColor, 0.7); + border: alpha(currentColor, 0.7); + + &:hover { + color: alpha(currentColor, 0.8); + border-color: alpha(currentColor, 0.8); + } + + &:active { + color: alpha(currentColor, 0.9); + border-color: alpha(currentColor, 0.9); + } } } @@ -202,22 +211,14 @@ GtkExpander { ! Symbolic images * ********************/ -.image { - color: alpha(currentColor, 0.5); +@include exports("symbolicimage") { + .image { + color: alpha(currentColor, 0.5); - &:hover { color: alpha(currentColor, 0.9); } + &:hover { color: alpha(currentColor, 0.9); } - &:selected, &:selected:hover { color: $selected_fg_color; } -} - - -/****************** - ! Pane separator * -*******************/ - -.pane-separator { - background-color: $bg_color; - color: transparent; + &:selected, &:selected:hover { color: $selected_fg_color; } + } } @@ -225,43 +226,45 @@ GtkExpander { ! Floating bar * *****************/ -.floating-bar { - border: 1px solid border_normal($bg_color); - border-radius: $roundness; - background-color: $bg_color; - background-image: none; - color: $fg_color; - - &.top { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; - } - - &.right { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - &.bottom { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } - - &.left { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } - - .button { - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; - - border: none; - background-color: transparent; +@include exports("floatingbar") { + .floating-bar { + border: 1px solid border_normal($bg_color); + border-radius: $roundness; + background-color: $bg_color; background-image: none; + color: $fg_color; + + &.top { + border-top-width: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; + } + + &.right { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + + &.bottom { + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } + + &.left { + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } + + .button { + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 0; + + border: none; + background-color: transparent; + background-image: none; + } } } diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/_window.scss index fc31783..0be7a63 100755 --- a/gtk-3.0/scss/_window.scss +++ b/gtk-3.0/scss/_window.scss @@ -6,38 +6,40 @@ ! Window frame ***************/ -.window-frame { - border: none; - border-radius: $roundness $roundness 0 0; - box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); +@include exports("window") { + .window-frame { + border: none; + border-radius: $roundness $roundness 0 0; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); - /* this is used for the resize cursor area */ - margin: $spacing * 3; + /* this is used for the resize cursor area */ + margin: $spacing * 3; - &:backdrop { - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); - } - - &.tiled { border-radius: 0; } - - &.csd { - &.popup { - border-radius: 0; - box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); + &:backdrop { + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); } - &.tooltip { - border-radius: $roundness; - box-shadow: none; - } + &.tiled { border-radius: 0; } - &.message-dialog { - border-radius: $roundness; - box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); + &.csd { + &.popup { + border-radius: 0; + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); + } + + &.tooltip { + border-radius: $roundness; + box-shadow: none; + } + + &.message-dialog { + border-radius: $roundness; + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), + 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); + } } } } diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index c74514b..81844c9 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -17,78 +17,6 @@ @import "notebook"; @import "scrollbar"; - -/************* -* scrollbar * -*************/ -.scrollbar { - border-width: 1px; - border-style: solid; - padding: 0; -} - -.scrollbars-junction, -.scrollbar.trough { - border-width: 0; - border-radius: 0; - background-color: $bg_color; - background-image: none; -} - -.scrollbar.button, -.scrollbar.button:active, -.scrollbar.button:active:hover { - border-width: 0; - border-radius: 0; - background-color: transparent; - background-image: none; - color: shade($bg_color, 0.6); -} - -.scrollbar.slider { - border-width: 1px; - border-color: mix(shade($bg_color, 0.87), $fg_color, 0.21); - border-radius: 0; - background-color: mix($bg_color, $fg_color, 0.21); -} - -.scrollbar.slider:hover, -.scrollbar.slider.vertical:hover { - border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31); - background-color: mix($bg_color, $fg_color, 0.31); -} - -.scrollbar.slider:active, -.scrollbar.slider.vertical:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; -} - -.scrollbar.slider.fine-tune:prelight:active { - border-width: 2px; - border-color: transparent; -} - -/* overlay scrollbar */ -OsThumb { - color: shade($bg_color, 0.7); -} - -OsThumb:selected, -OsScrollbar:selected { - background-color: $selected_bg_color; -} - -OsThumb:active, -OsScrollbar:active { - background-color: $selected_bg_color; -} - -OsThumb:insensitive, -OsScrollbar:insensitive { - background-color: shade($bg_color, 0.9); -} - /************* * separator * *************/ From 4680d4f189640f88ec7ce64d8bb5a46d8a5e4392 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Tue, 9 Dec 2014 01:17:23 +0530 Subject: [PATCH 23/73] Tweaks --- gtk-3.0/scss/_button.scss | 3 +- gtk-3.0/scss/_entry.scss | 37 ++++++++----- gtk-3.0/scss/_view.scss | 12 +++++ gtk-3.0/scss/widgets.scss | 107 ++++---------------------------------- 4 files changed, 47 insertions(+), 112 deletions(-) diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index 44cbcd2..caae335 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -130,13 +130,14 @@ border: none; background-color: transparent; background-image: none; + box-shadow: none; } // TODO } &.separator, .separator { - color: shade($bg, .95); + color: shade($bg, ($contrast + .05)); border: 1px solid currentColor; &:insensitive { color: shade($bg, .85); } diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss index 7720308..bd00cf1 100755 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/_entry.scss @@ -81,22 +81,33 @@ ! Combobox entry * *******************/ -@include exports("comboboxentry") { - GtkComboBox.combobox-entry { - .entry { - &, &:hover, &:focus, &:active, &:insensitive { - border-width: 1px 0 1px 1px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; +@include exports("combobox") { + GtkComboBox { + &.combobox-entry { + .entry { + &, &:hover, &:focus, &:active, &:insensitive { + border-width: 1px 0 1px 1px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + } + + .button { + &, &:hover, &:focus, &:active, &:insensitive { + border-width: 1px 1px 1px 1px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } } } - .button { - &, &:hover, &:focus, &:active, &:insensitive { - border-width: 1px 1px 1px 1px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } + .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; + + border-style: none; } } } diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index cf5e5d9..e2e0c4c 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -132,6 +132,18 @@ } +/*********** + ! Separator +************/ + +@include exports("separator") { + .view.separator, .separator { + color: shade($bg_color, ($contrast + .10)); + border: 1px solid currentColor; + } +} + + /********************* ! Column view headers **********************/ diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index 81844c9..a357096 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -2,110 +2,21 @@ @import "colors"; @import "base"; @import "button"; -@import "toggle"; @import "entry"; -@import "menu"; -@import "toolbar"; -@import "sidebar"; -@import "view"; -@import "grid"; -@import "progress"; -@import "spinner"; -@import "window"; @import "calendar"; +@import "grid"; @import "infobar"; +@import "menu"; @import "notebook"; +@import "progress"; @import "scrollbar"; +@import "sidebar"; +@import "spinner"; +@import "toggle"; +@import "toolbar"; +@import "view"; +@import "window"; -/************* -* separator * -*************/ -.view.separator, -.separator { - border-width: 1px; - border-style: solid; - border-color: shade($bg_color, 0.9); - color: shade($bg_color, 0.9); -} - -.button .separator, -.button.separator { - border-color: shade($bg_color, 0.95); -} - -.button .separator:insensitive, -.button.separator:insensitive { - border-color: shade($bg_color, 0.85); -} - -.primary-toolbar GtkSeparatorToolItem, -.primary-toolbar .separator, -.primary-toolbar .separator:insensitive, -.toolbar GtkSeparatorToolItem, -.toolbar .separator, -.toolbar .separator:insensitive { - -GtkWidget-window-dragging: true; - - border-color: shade($toolbar_bg_color, 0.95); - color: shade($toolbar_bg_color, 0.95); -} - -.header-bar GtkSeparatorToolItem, -.header-bar .separator, -.header-bar .separator:insensitive, -.titlebar GtkSeparatorToolItem, -.titlebar .separator, -.titlebar .separator:insensitive { - -GtkWidget-window-dragging: true; - - border-color: shade($titlebar_bg_color, 0.95); - color: shade($titlebar_bg_color, 0.95); -} - -.primary-toolbar .button .separator, -.primary-toolbar .button.separator, -.toolbar .button .separator, -.toolbar .button.separator { - border-color: shade($toolbar_bg_color, 0.95); -} - -.header-bar .button .separator, -.header-bar .button.separator, -.titlebar .button .separator, -.titlebar .button.separator { - border-color: shade($titlebar_bg_color, 0.95); -} - -.primary-toolbar .button .separator:insensitive, -.primary-toolbar .button.separator:insensitive, -.toolbar .button .separator:insensitive, -.toolbar .button.separator:insensitive { - border-color: shade($toolbar_bg_color, 0.85); -} - -.header-bar .button .separator:insensitive, -.header-bar .button.separator:insensitive, -.titlebar .button .separator:insensitive, -.titlebar .button.separator:insensitive { - border-color: shade($titlebar_bg_color, 0.85); -} - -.menuitem.separator { - -GtkMenuItem-horizontal-padding: 0; - -GtkWidget-separator-height: 1; - - border-style: none; - color: shade($menu_bg_color, 0.9); -} - -GtkComboBox .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; - - border-style: none; -} /************** * spinbutton * From fbca03b4a169b618fd8112731c3729ae4452b6a5 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Tue, 9 Dec 2014 01:38:40 +0530 Subject: [PATCH 24/73] Spin button styling --- gtk-3.0/scss/_button.scss | 82 +++++++++++++++++++++++++++++ gtk-3.0/scss/widgets.scss | 108 -------------------------------------- 2 files changed, 82 insertions(+), 108 deletions(-) diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index caae335..606ca80 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -172,5 +172,87 @@ @include button($bg_color, $fg_color); &.default { @include button($selected_bg_color, $selected_fg_color); } + + .spinbutton & { + color: mix($text_color, $base_color, 0.4); + padding: 2px 4px; + border-width: 0; + border-radius: 0; + border-style: none; + background-color: transparent; + background-image: none; + box-shadow: inset 1px 0 shade($base_color, 0.9); + + &:insensitive { + color: mix($text_color, $base_color, 0.7); + box-shadow: inset 1px 0 shade($base_color, 0.95); + } + + &:active, &:checked, &:hover { color: $text_color; } + + &:first-child { + border-radius: $roundness 0 0 $roundness; + box-shadow: none; + } + + &:last-child { border-radius: 0 $roundness $roundness 0; } + + &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, 0.9); } + } + + .spinbutton.vertical & { + border: 1px solid shade($bg_color, 0.8); + border-radius: $roundness; + background-color: shade($bg_color, 1.08); + background-image: none; + color: $fg_color; + box-shadow: none; + + &:hover { + border-color: shade($bg_color, 0.7); + background-color: shade($bg_color, 1.10); + background-image: none; + } + + &:active, &:checked { + border-color: shade($bg_color, 0.8); + background-color: shade($bg_color, 0.95); + background-image: none; + } + + &:active:hover, &:checked:hover { + border-color: shade($bg_color, 0.7); + } + + &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, 0.7); } + + &:insensitive { + border-color: shade($bg_color, 0.85); + background-color: shade($bg_color, 0.9); + background-image: none; + } + + &:first-child { + border-width: 1px; + border-bottom-width: 0; + border-radius: $roundness; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } + + &:last-child { + border-width: 1px; + border-top-width: 0; + border-radius: $roundness; + border-top-left-radius: 0; + border-top-right-radius: 0; + } + } + + .spinbutton.vertical.entry { + border-width: 1px; + border-style: solid; + border-radius: 0; + } } } diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index a357096..c0159c9 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -18,114 +18,6 @@ @import "window"; -/************** -* spinbutton * -**************/ -.spinbutton .button { - color: mix($text_color, $base_color, 0.4); - padding: 2px 4px; - border-width: 0; - border-radius: 0; - border-style: none; - background-color: transparent; - background-image: none; - box-shadow: inset 1px 0 shade($base_color, 0.9); -} - -.spinbutton .button:insensitive { - color: mix($text_color, $base_color, 0.7); - box-shadow: inset 1px 0 shade($bg_color, 0.95); -} - -.spinbutton .button:active, -.spinbutton .button:hover { - color: $fg_color; -} - -.spinbutton .button:first-child { - border-radius: 2px 0 0 2px; - box-shadow: none; -} - -.spinbutton .button:last-child { - border-radius: 0 2px 2px 0; -} - -.spinbutton .button:dir(rtl) { - box-shadow: inset -1px 0 shade($base_color, 0.9); -} - -.spinbutton.vertical .button { - border-width: 1px; - border-style: solid; - border-color: shade($bg_color, 0.8); - border-radius: 2px; - background-color: shade($bg_color, 1.08); - background-image: none; - color: $fg_color; - box-shadow: none; -} - -.spinbutton.vertical .button:hover { - border-color: shade($bg_color, 0.7); - background-color: shade($bg_color, 1.10); - background-image: none; -} - -.spinbutton.vertical .button:active { - border-color: shade($bg_color, 0.8); - background-color: shade($bg_color, 0.95); - background-image: none; -} - -.spinbutton.vertical .button:active:hover { - border-color: shade($bg_color, 0.7); -} - -.spinbutton.vertical .button:focus, -.spinbutton.vertical .button:hover:focus, -.spinbutton.vertical .button:active:focus, -.spinbutton.vertical .button:active:hover:focus { - border-color: shade($bg_color, 0.7); -} - -.spinbutton.vertical .button:insensitive { - border-color: shade($bg_color, 0.85); - background-color: shade($bg_color, 0.9); - background-image: none; -} - -.spinbutton.vertical .button:first-child { - border-width: 1px; - border-bottom-width: 0; - border-radius: 2px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.spinbutton.vertical .button:last-child { - border-width: 1px; - border-top-width: 0; - border-radius: 2px; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.spinbutton.vertical.entry { - border-width: 1px; - border-style: solid; - border-radius: 0; -} - - -/************* -* statusbar * -*************/ -GtkStatusbar { - padding: 4px; - color: $fg_color; -} - /***************** * color chooser * *****************/ From dd5eb36ecf04dc4a755d96725c7f4316b0224267 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 13 Dec 2014 17:36:16 +0530 Subject: [PATCH 25/73] Add choosers and other styles --- gtk-3.0/scss/_choosers.scss | 129 +++++++++++++++++++++++ gtk-3.0/scss/_colors.scss | 10 +- gtk-3.0/scss/_global.scss | 7 ++ gtk-3.0/scss/_misc.scss | 159 ++++++++++++++++++++++++++++ gtk-3.0/scss/_toggle.scss | 8 +- gtk-3.0/scss/_view.scss | 89 ---------------- gtk-3.0/scss/widgets.scss | 201 +----------------------------------- 7 files changed, 306 insertions(+), 297 deletions(-) create mode 100644 gtk-3.0/scss/_choosers.scss create mode 100644 gtk-3.0/scss/_misc.scss diff --git a/gtk-3.0/scss/_choosers.scss b/gtk-3.0/scss/_choosers.scss new file mode 100644 index 0000000..2d1a1cf --- /dev/null +++ b/gtk-3.0/scss/_choosers.scss @@ -0,0 +1,129 @@ +@import "functions"; +@import "global"; + + +/*************** + ! Color chooser +****************/ + +@include exports("colorchooser") { + GtkColorSwatch { + &, &:selected { + border: 1px solid alpha(black, 0.1); + border-radius: $roundness - 1px; + background-color: transparent; + background-clip: border-box; + + &:hover { border-color: alpha(black, 0.3); } + } + + &.color-light:selected:hover, &.color-dark:selected:hover { background-image: none; } + + &.left, &:first-child { + border-top-left-radius: $roundness; + border-bottom-left-radius: $roundness; + } + + &.right, &:last-child { + border-top-right-radius: $roundness; + border-bottom-right-radius: $roundness; + } + + &:only-child { border-radius: $roundness; } + + &.top { + border-top-left-radius: $roundness; + border-top-right-radius: $roundness; + } + + &.bottom { + border-bottom-left-radius: $roundness; + border-bottom-right-radius: $roundness; + } + + GtkColorEditor & { + border-radius: $roundness; + + &.color-dark:hover, &.color-light:hover { + background-image: none; + border-color: alpha(black, 0.3); + } + } + } + + GtkColorChooserWidget #add-color-button { + background-clip: padding-box; + border-color: alpha(black, 0.1); + background-color: shade($bg_color, 0.95); + color: $fg_color; + + &:hover { + border-color: alpha(black, 0.3); + background-color: shade($bg_color, 0.90); + color: $fg_color; + } + } + + .color-active-badge { + &, &:selected { + border-width: 2px; + border-style: solid; + background-color: transparent; + } + + &.color-light { + &, &:hover { + border-color: alpha(black, 0.3); + color: alpha(black, 0.3); + } + } + + &.color-dark { + &, &:hover { + border-color: alpha(white, 0.3); + color: alpha(white, 0.3); + } + } + } + + GtkColorButton.button { padding: $spacing; } +} + + +/*********************** +! Font and file choosers +************************/ + +@include exports("miscchoosers") { + GtkFontButton, GtkFileChooserButton { + .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; + } + + GtkLabel:last-child { color: alpha(currentColor, 0.7); } + + GtkImage:last-child { color: alpha(currentColor, 0.7); } + } + + GtkFileChooser { + .pane-separator { + &, &:hover { + border-width: 0 1px 0 0; + border-style: solid; + border-color: currentColor; + background-color: $bg_color; + color: border_normal($bg_color); + } + } + + /* for fallback when header bar not used */ + .dialog-action-box { + border-width: 1px 0 0; + border-style: solid; + border-color: shade($bg_color, 0.7); + } + } +} diff --git a/gtk-3.0/scss/_colors.scss b/gtk-3.0/scss/_colors.scss index 37ab130..f00aaba 100755 --- a/gtk-3.0/scss/_colors.scss +++ b/gtk-3.0/scss/_colors.scss @@ -45,13 +45,13 @@ @define-color panel_fg_color @dark_fg_color; /* osd */ -@define-color osd_base @dark_bg_color; -@define-color osd_fg @dark_fg_color; -@define-color osd_bg alpha(@osd_base, 0.8); +@define-color osd_base #{"" + $osd_base}; +@define-color osd_fg #{"" + $osd_fg}; +@define-color osd_bg #{"" + $osd_bg}; /* lightdm greeter colors */ -@define-color lightdm_bg_color @dark_bg_color; -@define-color lightdm_fg_color @dark_fg_color; +@define-color lightdm_bg_color #{"" + $lightdm_bg_color}; +@define-color lightdm_fg_color #{"" + $lightdm_fg_color}; /* window manager colors */ @define-color wm_bg @titlebar_bg_color; diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index f6bbff4..bbb300f 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -42,6 +42,13 @@ $menu_fg_color: $dark_fg_color; $menubar_bg_color: $dark_bg_color; $menubar_fg_color: $dark_fg_color; +$osd_base: $dark_bg_color; +$osd_fg: $dark_fg_color; +$osd_bg: fade-out($dark_fg_color, 0.8); + +$lightdm_bg_color: $dark_bg_color; +$lightdm_fg_color: $dark_fg_color; + // widget styles $roundness: 2px; $spacing: 5px; diff --git a/gtk-3.0/scss/_misc.scss b/gtk-3.0/scss/_misc.scss new file mode 100644 index 0000000..35a271c --- /dev/null +++ b/gtk-3.0/scss/_misc.scss @@ -0,0 +1,159 @@ +@import "functions"; +@import "global"; + + +/*********** + ! Tooltip * +************/ + +@include exports("tooltip") { + .tooltip { + border: none; + border-radius: $roundness; + background-color: $tooltip_bg_color; + background-image: none; + color: $tooltip_fg_color; + + * { background-color: transparent; } + } +} + + +/*********** + ! Dialogs * +************/ + +@include exports("dialogs") { + GtkMessageDialog, .prompt { + -GtkDialog-content-area-border: 0; + -GtkDialog-action-area-border: 0; + -GtkDialog-button-spacing: 0; + + margin: 0; + padding: 0; + } +} + + +/********************* + ! App notifications * +**********************/ + +@include exports("notifications") { + .app-notification { + border-style: solid; + border-color: border_normal($base_color); + border-width: 0 1px 1px 1px; + border-radius: 0 0 $roundness $roundness; + padding: $spacing * 3; + background-color: $base_color; + background-image: none; + color: $text_color; + } +} + + +/************* + ! Expanders * +**************/ + +@include exports("expander") { + GtkExpander { + padding: $spacing; + outline-offset: 1px; + } + + .expander { + color: alpha(currentColor, 0.7); + border: alpha(currentColor, 0.7); + + &:hover { + color: alpha(currentColor, 0.8); + border-color: alpha(currentColor, 0.8); + } + + &:active { + color: alpha(currentColor, 0.9); + border-color: alpha(currentColor, 0.9); + } + } +} + + +/******************* + ! Symbolic images * +********************/ + +@include exports("symbolicimage") { + .image { + color: alpha(currentColor, 0.5); + + &:hover { color: alpha(currentColor, 0.9); } + + &:selected, &:selected:hover { color: $selected_fg_color; } + } +} + + +/**************** + ! Floating bar * +*****************/ + +@include exports("floatingbar") { + .floating-bar { + border: 1px solid border_normal($bg_color); + border-radius: $roundness; + background-color: $bg_color; + background-image: none; + color: $fg_color; + + &.top { + border-top-width: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; + } + + &.right { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + + &.bottom { + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } + + &.left { + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } + + .button { + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 0; + + border: none; + background-color: transparent; + background-image: none; + } + } +} + + +/************************* + ! Touch text selections * +**************************/ + +@include exports("touchbubble") { + GtkBubbleWindow { + border-radius: $roundness; + background-clip: border-box; + + &.osd.background { background-color: $osd_bg; } + + .toolbar { background-color: transparent; } + } +} diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/_toggle.scss index 4e0199a..70c1f39 100755 --- a/gtk-3.0/scss/_toggle.scss +++ b/gtk-3.0/scss/_toggle.scss @@ -78,17 +78,17 @@ outline-offset: -4px; &.slider { - border: 1px solid shade($bg_color, 0.8); + border: 1px solid border_normal($bg_color); background-color: shade($bg_color, 1.08); &:insensitive { - border-color: shade($bg_color, 0.85); + border-color: border_insensitive($bg_color); background-color: shade($bg_color, 0.9); } } &.trough { - border-color: shade($bg_color, 0.8); + border: 1px solid border_normal($bg_color); background-color: shade($bg_color, 0.95); color: $fg_color; @@ -99,7 +99,7 @@ } &:insensitive { - border-color: shade($bg_color, 0.85); + border-color: border_insensitive($bg_color); background-color: shade($bg_color, 0.9); color: mix($fg_color, $bg_color, 0.5); } diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index e2e0c4c..aee0d6b 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -191,92 +191,3 @@ } } - -/************* - ! Expanders * -**************/ - -@include exports("expander") { - GtkExpander { - padding: $spacing; - outline-offset: 1px; - } - - .expander { - color: alpha(currentColor, 0.7); - border: alpha(currentColor, 0.7); - - &:hover { - color: alpha(currentColor, 0.8); - border-color: alpha(currentColor, 0.8); - } - - &:active { - color: alpha(currentColor, 0.9); - border-color: alpha(currentColor, 0.9); - } - } -} - - -/******************* - ! Symbolic images * -********************/ - -@include exports("symbolicimage") { - .image { - color: alpha(currentColor, 0.5); - - &:hover { color: alpha(currentColor, 0.9); } - - &:selected, &:selected:hover { color: $selected_fg_color; } - } -} - - -/**************** - ! Floating bar * -*****************/ - -@include exports("floatingbar") { - .floating-bar { - border: 1px solid border_normal($bg_color); - border-radius: $roundness; - background-color: $bg_color; - background-image: none; - color: $fg_color; - - &.top { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; - } - - &.right { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - &.bottom { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } - - &.left { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } - - .button { - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; - - border: none; - background-color: transparent; - background-image: none; - } - } -} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index c0159c9..562273c 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -4,9 +4,11 @@ @import "button"; @import "entry"; @import "calendar"; +@import "choosers"; @import "grid"; @import "infobar"; @import "menu"; +@import "misc"; @import "notebook"; @import "progress"; @import "scrollbar"; @@ -18,127 +20,6 @@ @import "window"; -/***************** -* color chooser * -*****************/ -GtkColorSwatch, -GtkColorSwatch:selected { - border-width: 1px; - border-style: solid; - border-color: alpha(black, 0.1); - border-radius: 1px; - background-color: transparent; - background-clip: border-box; -} - -GtkColorSwatch:hover, -GtkColorSwatch:selected:hover { - border-color: alpha(black, 0.3); -} - -GtkColorSwatch.color-dark:hover { -} - -GtkColorSwatch.color-light:hover { -} - -GtkColorSwatch.color-light:selected:hover, -GtkColorSwatch.color-dark:selected:hover { - background-image: none; -} - -GtkColorSwatch.left, -GtkColorSwatch:first-child { - border-top-left-radius: 2px; - border-bottom-left-radius: 2px; -} - -GtkColorSwatch.right, -GtkColorSwatch:last-child { - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; -} - -GtkColorSwatch:only-child { - border-radius: 2px; -} - -GtkColorSwatch.top { - border-top-left-radius: 2px; - border-top-right-radius: 2px; -} - -GtkColorSwatch.bottom { - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; -} - -GtkColorChooserWidget #add-color-button { - background-clip: padding-box; - border-color: alpha(black, 0.1); - background-color: shade($bg_color, 0.95); - color: $fg_color; -} - -GtkColorChooserWidget #add-color-button:hover { - border-color: alpha(black, 0.3); - background-color: shade($bg_color, 0.90); - color: $fg_color; -} - -.color-active-badge, -.color-active-badge:selected { - border-width: 1px; - border-style: solid; - border-width: 2px; - background-color: transparent; -} - -.color-active-badge.color-light, -.color-active-badge.color-light:hover { - border-color: alpha(black, 0.3); - color: alpha(black, 0.3); -} - -.color-active-badge.color-dark, -.color-active-badge.color-dark:hover { - border-color: alpha(white, 0.3); - color: alpha(white, 0.3); -} - -GtkColorEditor GtkColorSwatch { - border-radius: 2px; -} - -GtkColorEditor GtkColorSwatch.color-dark:hover, -GtkColorEditor GtkColorSwatch.color-light:hover { - background-image: none; - border-color: alpha(black, 0.3); -} - -GtkColorButton.button { - padding: 2px; -} - -/*********** -* tooltip * -***********/ -.tooltip { - border-width: 1px; - border-style: solid; - border-color: shade($tooltip_bg_color, 0.8); - border-radius: 2px; - background-color: $tooltip_bg_color; - background-image: none; - color: $tooltip_fg_color; -} - -.tooltip * { - background-color: transparent; -} - - - /************** * action-bar * **************/ @@ -184,68 +65,6 @@ GtkColorButton.button { padding: 4px; } -/*********** -* dialogs * -***********/ -GtkMessageDialog, -.prompt { - -GtkDialog-content-area-border: 0; - -GtkDialog-action-area-border: 0; - -GtkDialog-button-spacing: 0; - - margin: 0; - padding: 0; -} - -/******************** -* various choosers * -********************/ -GtkFontButton .separator, -GtkFileChooserButton .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; -} - -GtkFontButton GtkLabel:last-child { - color: alpha(currentColor, 0.7); -} - -GtkFileChooserButton GtkImage:last-child { - color: alpha(currentColor, 0.7); -} - -GtkFileChooser .pane-separator, -GtkFileChooser .pane-separator:hover { - border-width: 0 1px 0 0; - border-style: solid; - border-color: shade($bg_color, 0.8); - background-color: $bg_color; - color: shade($bg_color, 0.9); -} - -/* for fallback when header bar not used */ -GtkFileChooser .dialog-action-box { - border-width: 1px 0 0; - border-style: solid; - border-color: shade($bg_color, 0.7); -} - -/********************* -* app notifications * -*********************/ -.app-notification { - border-style: solid; - border-color: shade($base_color, 0.8); - border-width: 0 1px 1px 1px; - border-radius: 0 0 2px 2px; - padding: 8px; - background-color: $base_color; - background-image: none; - color: $text_color; -} - /******* * osd * *******/ @@ -695,19 +514,3 @@ GtkFileChooser .dialog-action-box { color: shade($selected_bg_color, 0.8); box-shadow: none; } - -/************************* -* touch text selections * -*************************/ -GtkBubbleWindow { - border-radius: 2px; - background-clip: border-box; -} - -GtkBubbleWindow.osd.background { - // background-color: $osd_bg; -} - -GtkBubbleWindow .toolbar { - background-color: transparent; -} From fd2a390954ec287bf794c99efe6f78c18e6e5cd2 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 13 Dec 2014 18:23:59 +0530 Subject: [PATCH 26/73] Added OSD styles --- gtk-3.0/scss/_colors.scss | 3 +- gtk-3.0/scss/_global.scss | 3 +- gtk-3.0/scss/_osd.scss | 152 +++++++++++++++++++++ gtk-3.0/scss/widgets.scss | 275 +------------------------------------- 4 files changed, 156 insertions(+), 277 deletions(-) create mode 100644 gtk-3.0/scss/_osd.scss diff --git a/gtk-3.0/scss/_colors.scss b/gtk-3.0/scss/_colors.scss index f00aaba..dcb562c 100755 --- a/gtk-3.0/scss/_colors.scss +++ b/gtk-3.0/scss/_colors.scss @@ -45,9 +45,8 @@ @define-color panel_fg_color @dark_fg_color; /* osd */ -@define-color osd_base #{"" + $osd_base}; -@define-color osd_fg #{"" + $osd_fg}; @define-color osd_bg #{"" + $osd_bg}; +@define-color osd_fg #{"" + $osd_fg}; /* lightdm greeter colors */ @define-color lightdm_bg_color #{"" + $lightdm_bg_color}; diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index bbb300f..844731c 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -42,9 +42,8 @@ $menu_fg_color: $dark_fg_color; $menubar_bg_color: $dark_bg_color; $menubar_fg_color: $dark_fg_color; -$osd_base: $dark_bg_color; +$osd_bg: $dark_bg_color; $osd_fg: $dark_fg_color; -$osd_bg: fade-out($dark_fg_color, 0.8); $lightdm_bg_color: $dark_bg_color; $lightdm_fg_color: $dark_fg_color; diff --git a/gtk-3.0/scss/_osd.scss b/gtk-3.0/scss/_osd.scss new file mode 100644 index 0000000..a2d3e5a --- /dev/null +++ b/gtk-3.0/scss/_osd.scss @@ -0,0 +1,152 @@ +@import "functions"; +@import "global"; +@import "button"; + + +/******* + ! OSD * +********/ + +GtkOverlay.osd { + background-color: transparent; +} + +.osd { + &.background { + background-color: alpha($osd_bg, 0.8); + color: $osd_fg; + } + + &.frame { + background-clip: border-box; + background-origin: border-box; + } + + &.button, .button { @include button($osd_bg, $osd_fg); } + + + &.toolbar { + -GtkToolbar-button-relief: normal; + + padding: $spacing; + border-width: 1px solid border_normal($osd_bg); + border-radius: $roundness; + background-color: $osd_bg; + background-image: none; + color: $osd_fg; + + .separator { color: shade($osd_bg, 0.9); } + } + + /* used by gnome-settings-daemon's media-keys OSD */ + &.trough { background-color: shade($osd_bg, 0.8); } + + &.progressbar { background-color: $osd_fg; } + + .scale { + &.slider { + background-color: shade($osd_bg, 1.08); + background-image: none; + /* we will draw the border using box shadow for now */ + box-shadow: inset 1px 0 shade($osd_bg, 0.8), + inset 0 1px shade($osd_bg, 0.8), + inset -1px 0 shade($osd_bg, 0.8), + inset 0 -1px shade($osd_bg, 0.8); + + &:hover { + box-shadow: inset 1px 0 shade($osd_bg, 0.7), + inset 0 1px shade($osd_bg, 0.7), + inset -1px 0 shade($osd_bg, 0.7), + inset 0 -1px shade($osd_bg, 0.7); + } + + &:insensitive { + background-color: shade($osd_bg, 0.9); + background-image: none; + box-shadow: inset 1px 0 shade($osd_bg, 0.85), + inset 0 1px shade($osd_bg, 0.85), + inset -1px 0 shade($osd_bg, 0.85), + inset 0 -1px shade($osd_bg, 0.85); + } + } + + &.trough { + border-color: shade($osd_bg, 0.8); + background-color: shade($osd_bg, 1.08); + background-image: none; + + &.highlight { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + background-image: none; + } + + &:insensitive, &.highlight:insensitive { + border-color: shade($osd_bg, 0.85); + background-color: shade($osd_bg, 0.9); + background-image: none; + } + } + } + + &.view, .view { background-color: $osd_bg; } + + .scrollbar { + .trough { background-color: $osd_bg; } + + .slider { + border: 1px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + border-radius: 0; + background-color: mix($osd_bg, $osd_fg, 0.21); + + &:hover { + border-color: mix(shade($osd_bg, 0.87), $osd_fg, 0.31); + background-color: mix($osd_bg, $osd_fg, 0.31); + } + + &:active { + border-color: shade($selected_bg_color, 0.9); + background-color: $selected_bg_color; + } + } + } + + GtkIconView.cell { + &:selected, &:selected:focus { + background-color: transparent; + border: 3px solid solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + border-radius: $roundness; + outline-color: transparent; + } + } + + /* used by Documents */ + .page-thumbnail { + border: 1px solid shade($osd_bg, 0.9); + /* when there's no pixbuf yet */ + background-color: $osd_bg; + } +} + +.osd GtkProgressBar, GtkProgressBar.osd { + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 2px; + -GtkProgressBar-min-horizontal-bar-height: 2px; + + padding: 0; + + &.trough { + padding: 0; + border-style: none; + border-radius: 0; + background-image: none; + background-color: transparent; + } + + &.progressbar { + border-style: none; + border-radius: 0; + background-color: $selected_bg_color; + background-image: none; + } +} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index 562273c..e5613bf 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -10,6 +10,7 @@ @import "menu"; @import "misc"; @import "notebook"; +@import "osd"; @import "progress"; @import "scrollbar"; @import "sidebar"; @@ -65,279 +66,7 @@ padding: 4px; } -/******* -* osd * -*******/ -//.background.osd { -// color: $osd_fg; -// background-color: $osd_bg; -//} -// -//GtkOverlay.osd { -// background-color: transparent; -//} -// -//.osd.frame { -// background-clip: border-box; -// background-origin: border-box; -//} -// -//.osd.button, -//.osd .button { -// padding: 4px; -// border-width: 1px; -// border-style: solid; -// border-color: shade($osd_bg, 0.8); -// border-radius: 2px; -// background-color: shade($osd_bg, 1.08); -// background-image: none; -// color: $osd_fg; -//} -// -//.osd.button:prelight, -//.osd.button:hover, -//.osd .button:hover { -// border-color: shade($osd_bg, 0.7); -// background-color: shade($osd_bg, 1.10); -// background-image: none; -//} -// -//.osd.button:active, -//.osd .button:active, -//.osd GtkMenuButton.button:active { -// border-color: shade($osd_bg, 0.8); -// background-color: shade($osd_bg, 0.95); -// background-image: none; -//} -// -//.osd.button:active:hover, -//.osd .button:active:hover, -//.osd GtkMenuButton.button:active:hover { -// border-color: shade($osd_bg, 0.7); -//} -// -//.osd.button:insensitive, -//.osd .button:insensitive { -// border-color: shade($osd_bg, 0.85); -// background-color: shade($osd_bg, 0.9); -// background-image: none; -//} -// -//.osd.button:active *:insensitive, -//.osd .button:active *:insensitive { -// background-color: shade($osd_bg, 0.80); -// background-image: none; -//} -// -//.osd.toolbar { -// -GtkToolbar-button-relief: normal; -// -// padding: 4px; -// border-width: 1px; -// border-style: solid; -// border-radius: 2px; -// border-color: shade($osd_bg, 0.8); -// background-color: $osd_bg; -// background-image: none; -// color: $osd_fg; -//} -// -//.osd.toolbar .button { -// padding: 4px; -// border-width: 1px; -// border-style: solid; -// border-color: shade($osd_bg, 0.8); -// border-radius: 2px; -// background-color: shade($osd_bg, 1.08); -// background-image: none; -// color: $osd_fg; -//} -// -//.osd.toolbar .button:hover { -// border-color: shade($osd_bg, 0.7); -// background-color: shade($osd_bg, 1.10); -// background-image: none; -//} -// -//.osd.toolbar .button:active { -// border-color: shade($osd_bg, 0.8); -// background-color: shade($osd_bg, 0.95); -// background-image: none; -//} -// -//.osd.toolbar .button:active:hover { -// border-color: shade($osd_bg, 0.7); -//} -// -//.osd.toolbar .button:focus, -//.osd.toolbar .button:hover:focus, -//.osd.toolbar .button:active:focus, -//.osd.toolbar .button:active:hover:focus { -// border-color: shade($osd_bg, 0.7); -//} -// -//.osd.toolbar .button:insensitive { -// border-color: shade($osd_bg, 0.85); -// background-color: shade($osd_bg, 0.9); -// background-image: none; -//} -// -//.osd.toolbar .button:active *:insensitive { -// border-color: shade($osd_bg, 0.75); -// background-color: shade($osd_bg, 0.80); -// background-image: none; -//} -// -//.osd.toolbar .button:first-child { -// border-radius: 2px 0 0 2px; -// border-width: 1px 0 1px 1px; -// box-shadow: inset -1px 0 shade($osd_bg, 0.9); -//} -// -//.osd.toolbar .button:last-child { -// box-shadow: none; -// border-radius: 0 2px 2px 0; -// border-width: 1px 1px 1px 0; -//} -// -//.osd.toolbar .button:only-child, -//.osd.toolbar GtkToolButton .button, -//.osd.toolbar GtkToolButton:only-child .button, -//.osd.toolbar GtkToolButton:last-child .button, -//.osd.toolbar GtkToolButton:first-child .button { -// border-width: 1px; -// border-radius: 2px; -// border-style: solid; -//} -// -//.osd.toolbar .separator { -// color: shade($osd_bg, 0.9); -//} -// -///* used by gnome-settings-daemon's media-keys OSD */ -//.osd.trough { -// background-color: shade($osd_bg, 0.8); -//} -// -//.osd.progressbar { -// background-color: $osd_fg; -//} -// -//.osd .scale.slider { -// background-color: shade($osd_bg, 1.08); -// background-image: none; -// /* we will draw the border using box shadow for now */ -// box-shadow: inset 1px 0 shade($osd_bg, 0.8), -// inset 0 1px shade($osd_bg, 0.8), -// inset -1px 0 shade($osd_bg, 0.8), -// inset 0 -1px shade($osd_bg, 0.8); -//} -// -//.osd .scale.slider:hover { -// box-shadow: inset 1px 0 shade($osd_bg, 0.7), -// inset 0 1px shade($osd_bg, 0.7), -// inset -1px 0 shade($osd_bg, 0.7), -// inset 0 -1px shade($osd_bg, 0.7); -//} -// -//.osd .scale.slider:insensitive { -// background-color: shade($osd_bg, 0.9); -// background-image: none; -// box-shadow: inset 1px 0 shade($osd_bg, 0.85), -// inset 0 1px shade($osd_bg, 0.85), -// inset -1px 0 shade($osd_bg, 0.85), -// inset 0 -1px shade($osd_bg, 0.85); -//} -// -//.osd .scale.trough { -// border-color: shade($osd_bg, 0.8); -// background-color: shade($osd_bg, 1.08); -// background-image: none; -//} -// -//.osd .scale.trough.highlight { -// border-color: $selected_bg_color; -// background-color: $selected_bg_color; -// background-image: none; -//} -// -//.osd .scale.trough:insensitive, -//.osd .scale.trough.highlight:insensitive { -// border-color: shade($osd_bg, 0.85); -// background-color: shade($osd_bg, 0.9); -// background-image: none; -//} -// -//.osd GtkProgressBar, -//GtkProgressBar.osd { -// -GtkProgressBar-xspacing: 0; -// -GtkProgressBar-yspacing: 2px; -// -GtkProgressBar-min-horizontal-bar-height: 2px; -// -// padding: 0; -//} -// -//.osd GtkProgressBar.trough, -//GtkProgressBar.osd.trough { -// padding: 0; -// border-style: none; -// border-radius: 0; -// background-image: none; -// background-color: transparent; -//} -// -//.osd GtkProgressBar.progressbar, -//GtkProgressBar.osd.progressbar { -// border-style: none; -// border-radius: 0; -// background-color: $selected_bg_color; -// background-image: none; -//} -// -//.osd .view, -//.osd.view { -// background-color: $osd_base; -//} -// -//.osd .scrollbar.trough { -// background-color: $osd_bg; -//} -// -//.osd .scrollbar.slider { -// border-width: 1px; -// border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.21); -// border-radius: 0; -// background-color: mix($osd_base, $osd_fg, 0.21); -//} -// -//.osd .scrollbar.slider:hover { -// border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31); -// background-color: mix($osd_base, $osd_fg, 0.31); -//} -// -//.osd .scrollbar.slider:active { -// border-color: shade($selected_bg_color, 0.9); -// background-color: $selected_bg_color; -//} -// -//.osd GtkIconView.cell:selected, -//.osd GtkIconView.cell:selected:focus { -// background-color: transparent; -// border-style: solid; -// border-radius: 2px; -// border-width: 3px; -// border-color: $osd_fg; -// outline-color: transparent; -//} -// -///* used by Documents */ -//.osd .page-thumbnail { -// border-style: solid; -// border-width: 1px; -// border-color: shade($osd_bg, 0.9); -// /* when there's no pixbuf yet */ -// background-color: $osd_bg; -//} + /****************************** * destructive action buttons * From 1bd02efcdaf76a661111a00e7a9cb86e3bbfbea0 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 13 Dec 2014 19:47:53 +0530 Subject: [PATCH 27/73] Fix linked button issues --- gtk-3.0/scss/_base.scss | 5 -- gtk-3.0/scss/_button.scss | 97 ++++++++++++++++++++++---------------- gtk-3.0/scss/_misc.scss | 10 ++++ gtk-3.0/scss/_osd.scss | 4 +- gtk-3.0/scss/_toolbar.scss | 2 + 5 files changed, 70 insertions(+), 48 deletions(-) diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/_base.scss index 1407017..0080480 100755 --- a/gtk-3.0/scss/_base.scss +++ b/gtk-3.0/scss/_base.scss @@ -125,8 +125,3 @@ GtkLabel { &:insensitive { color: mix($fg_color, $bg_color, 0.50); } } - -.dim-label { - opacity: 0.5; - text-shadow: none; -} diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index 606ca80..d8900a2 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -6,13 +6,33 @@ ! Buttons **********/ -@mixin linked_button($bg, $shadow) { - border: 1px solid border_normal($bg); +%button { + padding: ($spacing - 1px) ($spacing + 1px); + border-width: 1px; + border-style: solid; + border-radius: $roundness; + transition: 100ms ease; + + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; + + &.flat { + color: inherit; + border: none; + background-color: transparent; + background-image: none; + box-shadow: none; + } + + &.separator, .separator { border: 1px solid currentColor; } +} + +%linked_button { + border-width: 1px; + border-style: solid; border-radius: 0; border-right-style: none; border-left-style: none; - box-shadow: inset -1px 0 border_normal($bg), - 0 1px 2px -1px alpha($shadow, .3); &:first-child { border-width: 1px; @@ -42,14 +62,22 @@ } } - &:only-child { + &:only-child, &:first-child:only-child { border-width: 1px; + border-style: solid; border-radius: $roundness; } +} + +@mixin linked_button($bg) { + @extend %linked_button; + + box-shadow: inset -1px 0 border_normal($bg), + 0 1px 2px -1px alpha($dark_shadow, .3); &:focus, &:hover { box-shadow: inset -1px 0 border_focus($bg), - 0 1px 2px -1px alpha($shadow, .3); + 0 1px 2px -1px alpha($dark_shadow, .3); } &:active, &:active:hover, @@ -57,9 +85,9 @@ &:checked, &:checked:hover, &:checked:focus, &:checked:hover:focus { box-shadow: inset -1px 0 border_active($bg), - inset 1px 0 alpha($shadow, .07), - inset 0 1px alpha($shadow, .08), - inset 0 -1px alpha($shadow, .05); + inset 1px 0 alpha($dark_shadow, .07), + inset 0 1px alpha($dark_shadow, .08), + inset 0 -1px alpha($dark_shadow, .05); } &:insensitive { box-shadow: inset -1px 0 border_insensitive($bg); } @@ -70,37 +98,39 @@ &:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } &:active:last-child, &:active:only-child, - &:checked:last-child, &:checked:only-child { - box-shadow: inset 1px 0 alpha($shadow, .07), - inset 0 1px alpha($shadow, .08), - inset -1px 0 alpha($shadow, .07); + &:active:last-child:focus, &:active:only-child:focus, + &:active:last-child:hover, &:active:only-child:hover, + &:active:last-child:hover:focus, &:active:only-child:hover:focus, + &:checked:last-child, &:checked:only-child, + &:checked:last-child:focus, &:checked:only-child:focus, + &:checked:last-child:hover, &:checked:only-child:hover, + &:checked:last-child:hover:focus, &:checked:only-child:hover:focus { + box-shadow: inset 1px 0 alpha($dark_shadow, .07), + inset 0 1px alpha($dark_shadow, .08), + inset -1px 0 alpha($dark_shadow, .07); } } @mixin button($bg, $fg) { @include linear-gradient(shade($bg, 1.05)); @include border(shade($bg, 1.05)); + @extend %button; - padding: ($spacing - 1px) ($spacing + 1px); - border-width: 1px; - border-radius: $roundness; - border-style: solid; + border-color: border_normal($bg); color: $fg; - transition: 100ms ease; box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; - &:focus, &:hover { @include linear-gradient(shade($bg, 1.1)); + border-color: border_focus($bg); box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5); } &:checked, &:active { @include linear-gradient(shade($bg, .95)); + border-color: border_active($bg); box-shadow: inset 1px 0 alpha($dark_shadow, .07), inset 0 1px alpha($dark_shadow, .08), inset -1px 0 alpha($dark_shadow, .07), @@ -110,6 +140,7 @@ &:insensitive { @include linear-gradient(shade($bg, .95)); + border-color: border_insensitive($bg); color: mix($bg, $fg, .5); box-shadow: none; } @@ -121,29 +152,11 @@ box-shadow: none; } - &.flat { - color: inherit; - - &, &:hover, &:focus, - &:active, &:active:hover, &:active:focus, - &:checked, &:checked:hover, &:checked:focus { - border: none; - background-color: transparent; - background-image: none; - box-shadow: none; - } - - // TODO - } - &.separator, .separator { color: shade($bg, ($contrast + .05)); - border: 1px solid currentColor; &:insensitive { color: shade($bg, .85); } } - - .linked & { @include linked_button($bg, $dark_shadow); } } @include exports("button") { @@ -173,10 +186,12 @@ &.default { @include button($selected_bg_color, $selected_fg_color); } + .linked & { @include linked_button($bg_color); } + .spinbutton & { color: mix($text_color, $base_color, 0.4); - padding: 2px 4px; - border-width: 0; + padding: $spacing ($spacing * 2); + border: none; border-radius: 0; border-style: none; background-color: transparent; diff --git a/gtk-3.0/scss/_misc.scss b/gtk-3.0/scss/_misc.scss index 35a271c..ee3644f 100644 --- a/gtk-3.0/scss/_misc.scss +++ b/gtk-3.0/scss/_misc.scss @@ -2,6 +2,16 @@ @import "global"; +/*************** +! Dimmed label * +****************/ + +.dim-label { + opacity: 0.5; + text-shadow: none; +} + + /*********** ! Tooltip * ************/ diff --git a/gtk-3.0/scss/_osd.scss b/gtk-3.0/scss/_osd.scss index a2d3e5a..673a262 100644 --- a/gtk-3.0/scss/_osd.scss +++ b/gtk-3.0/scss/_osd.scss @@ -29,7 +29,7 @@ GtkOverlay.osd { -GtkToolbar-button-relief: normal; padding: $spacing; - border-width: 1px solid border_normal($osd_bg); + border: 1px solid border_normal($osd_bg); border-radius: $roundness; background-color: $osd_bg; background-image: none; @@ -114,7 +114,7 @@ GtkOverlay.osd { GtkIconView.cell { &:selected, &:selected:focus { background-color: transparent; - border: 3px solid solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + border: 3px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); border-radius: $roundness; outline-color: transparent; } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index 79ca6c1..cea024a 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -31,6 +31,8 @@ .button { @include button($bg, $fg); } + .linked .button { @include linked_button($bg); } + GtkComboBox, .button { padding: $spacing - 1px; From e8f4bef04cd2f0c5e0ad8562458bb439e05c04bc Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 13 Dec 2014 20:05:09 +0530 Subject: [PATCH 28/73] Fix flat buttons --- gtk-3.0/scss/_button.scss | 64 +++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index d8900a2..c834f43 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -15,16 +15,6 @@ -GtkWidget-focus-padding: 1; -GtkWidget-focus-line-width: 0; - - &.flat { - color: inherit; - border: none; - background-color: transparent; - background-image: none; - box-shadow: none; - } - - &.separator, .separator { border: 1px solid currentColor; } } %linked_button { @@ -113,46 +103,54 @@ @mixin button($bg, $fg) { @include linear-gradient(shade($bg, 1.05)); - @include border(shade($bg, 1.05)); @extend %button; - border-color: border_normal($bg); color: $fg; box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); - &:focus, &:hover { - @include linear-gradient(shade($bg, 1.1)); - - border-color: border_focus($bg); - box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5); - } - - &:checked, &:active { - @include linear-gradient(shade($bg, .95)); - - border-color: border_active($bg); - box-shadow: inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), - inset -1px 0 alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - } - &:insensitive { @include linear-gradient(shade($bg, .95)); - border-color: border_insensitive($bg); color: mix($bg, $fg, .5); box-shadow: none; } - &:active:insensitive, - &:checked:insensitive { - @include linear-gradient(shade($bg, .8)); + &, &.flat { + @include border(shade($bg, 1.05)); + &:focus, &:hover { + @include linear-gradient(shade($bg, 1.1)); + + box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5); + } + + &:checked, &:active { + @include linear-gradient(shade($bg, .95)); + + box-shadow: inset 1px 0 alpha($dark_shadow, .07), + inset 0 1px alpha($dark_shadow, .08), + inset -1px 0 alpha($dark_shadow, .07), + inset 0 -1px alpha($dark_shadow, .05); + } + + &:active:insensitive, + &:checked:insensitive { + @include linear-gradient(shade($bg, .8)); + + box-shadow: none; + } + } + + &.flat { + color: inherit; + border-color: transparent; + background-color: transparent; + background-image: none; box-shadow: none; } &.separator, .separator { + border: 1px solid currentColor; color: shade($bg, ($contrast + .05)); &:insensitive { color: shade($bg, .85); } From da340ddb79b33b380ae51d5471f37a5ab5ee58d1 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 13 Dec 2014 20:09:58 +0530 Subject: [PATCH 29/73] Fix list-row --- gtk-3.0/scss/_grid.scss | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/gtk-3.0/scss/_grid.scss b/gtk-3.0/scss/_grid.scss index a92ba9a..403e592 100644 --- a/gtk-3.0/scss/_grid.scss +++ b/gtk-3.0/scss/_grid.scss @@ -11,22 +11,25 @@ color: $fg_color; &-row { - border: none; - border-radius: 0; - padding: $spacing; - background-image: none; - background-color: transparent; - - &:hover { + &, &.button { + border: none; + border-radius: 0; + padding: $spacing; background-image: none; - background-color: shade($bg_color, 1.02); - } + background-color: transparent; + box-shadow: none; - &:selected { - &, &:hover, &:focus { + &:hover { background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; + background-color: shade($bg_color, 1.02); + } + + &:selected { + &, &:hover, &:focus { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } } } } From 63b89ba1f0e18c3d8df42190f2f3872b13070b03 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 14 Dec 2014 17:17:14 +0530 Subject: [PATCH 30/73] Fix frame borders --- gtk-3.0/scss/_base.scss | 4 +- gtk-3.0/scss/_button.scss | 115 ++++++++++++++++++----------------- gtk-3.0/scss/_functions.scss | 6 +- gtk-3.0/scss/_toolbar.scss | 2 +- gtk-3.0/scss/_view.scss | 12 ++-- 5 files changed, 71 insertions(+), 68 deletions(-) diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/_base.scss index 0080480..e9afca8 100755 --- a/gtk-3.0/scss/_base.scss +++ b/gtk-3.0/scss/_base.scss @@ -43,8 +43,8 @@ outline-color: alpha($selected_bg_color, 0.5); outline-style: dashed; outline-width: 1px; - outline-offset: -2px; - outline-radius: 2px; + outline-offset: -1px; + outline-radius: $roundness; } diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss index c834f43..f5ff5c6 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/_button.scss @@ -6,56 +6,59 @@ ! Buttons **********/ -%button { - padding: ($spacing - 1px) ($spacing + 1px); - border-width: 1px; - border-style: solid; - border-radius: $roundness; - transition: 100ms ease; - - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; -} - -%linked_button { - border-width: 1px; - border-style: solid; - border-radius: 0; - border-right-style: none; - border-left-style: none; - - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: solid; - border-right-style: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - - &:dir(rtl) { - border-left-style: none; - border-right-style: solid; - } - } - - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: none; - border-right-style: solid; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - - &:dir(rtl) { - border-left-style: solid; - border-right-style: none; - } - } - - &:only-child, &:first-child:only-child { +@include exports("button_extends") { + %button { + padding: ($spacing - 1px) ($spacing + 1px); border-width: 1px; border-style: solid; border-radius: $roundness; + transition: 100ms ease; + outline-color: transparent; + + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; + } + + %linked_button { + border-width: 1px; + border-style: solid; + border-radius: 0; + border-right-style: none; + border-left-style: none; + + &:first-child { + border-width: 1px; + border-radius: $roundness; + border-left-style: solid; + border-right-style: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + + &:dir(rtl) { + border-left-style: none; + border-right-style: solid; + } + } + + &:last-child { + border-width: 1px; + border-radius: $roundness; + border-left-style: none; + border-right-style: solid; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + + &:dir(rtl) { + border-left-style: solid; + border-right-style: none; + } + } + + &:only-child, &:first-child:only-child { + border-width: 1px; + border-style: solid; + border-radius: $roundness; + } } } @@ -184,7 +187,7 @@ &.default { @include button($selected_bg_color, $selected_fg_color); } - .linked & { @include linked_button($bg_color); } + &.linked, .linked & { @include linked_button($bg_color); } .spinbutton & { color: mix($text_color, $base_color, 0.4); @@ -198,7 +201,7 @@ &:insensitive { color: mix($text_color, $base_color, 0.7); - box-shadow: inset 1px 0 shade($base_color, 0.95); + box-shadow: inset 1px 0 shade($base_color, 0.85); } &:active, &:checked, &:hover { color: $text_color; } @@ -214,12 +217,12 @@ } .spinbutton.vertical & { - border: 1px solid shade($bg_color, 0.8); - border-radius: $roundness; - background-color: shade($bg_color, 1.08); - background-image: none; - color: $fg_color; - box-shadow: none; + border: 1px solid shade($bg_color, 0.8); + border-radius: $roundness; + background-color: shade($bg_color, 1.08); + background-image: none; + color: $fg_color; + box-shadow: none; &:hover { border-color: shade($bg_color, 0.7); @@ -248,7 +251,6 @@ &:first-child { border-width: 1px; border-bottom-width: 0; - border-radius: $roundness; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } @@ -256,7 +258,6 @@ &:last-child { border-width: 1px; border-top-width: 0; - border-radius: $roundness; border-top-left-radius: 0; border-top-right-radius: 0; } diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index 0c81dcd..a072ca0 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -65,9 +65,11 @@ $modules: () !default; &:focus, &:hover { border-color: border_focus($color); } &:active, &:active:hover, - &:active:focus, &:active:hover:focus { border-color: border_active($color); } + &:active:focus, &:active:hover:focus, + &:checked, &:checked:hover, + &:checked:focus, &:checked:hover:focus { border-color: border_active($color); } &:insensitive { border-color: border_insensitive($color); } - &:active *:insensitive { border-color: border_normal($color); } + &:active:insensitive, &:checked:insensitive { border-color: border_normal($color); } } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index cea024a..96b44b7 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -31,7 +31,7 @@ .button { @include button($bg, $fg); } - .linked .button { @include linked_button($bg); } + .button.linked, .linked .button { @include linked_button($bg); } GtkComboBox, .button { padding: $spacing - 1px; diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss index aee0d6b..a8cf5b4 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/_view.scss @@ -181,13 +181,13 @@ ***********/ @include exports("frame") { - .frame { border: none; } + .frame { + border: 1px solid border_normal($bg_color); - GtkScrolledWindow { - &.frame { border: 1px solid border_normal($bg_color); } - - /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ - GtkViewport.frame { border: none; } + &.flat { border: none; } } + + /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ + GtkScrolledWindow GtkViewport.frame { border: none; } } From e2dc6ca7cc02d410c65bc265944805343f58524b Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 14 Dec 2014 17:52:13 +0530 Subject: [PATCH 31/73] Tweak things --- gtk-3.0/scss/_entry.scss | 11 ++++++----- gtk-3.0/scss/_functions.scss | 28 +++++++++++++--------------- gtk-3.0/scss/_global.scss | 10 +++++----- gtk-3.0/scss/_infobar.scss | 4 ++-- gtk-3.0/scss/_misc.scss | 8 ++++---- gtk-3.0/scss/_progress.scss | 36 +++++++++++++++++++----------------- gtk-3.0/scss/_toolbar.scss | 4 ++-- 7 files changed, 51 insertions(+), 50 deletions(-) diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss index bd00cf1..445fd55 100755 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/_entry.scss @@ -35,13 +35,14 @@ } @mixin entry($bg, $fg) { - @include linear-gradient($bg); @include border(shade($bg, .9)); - padding: ($spacing - 1px) ($spacing + 1px); + padding: ($spacing - 1px) $spacing; border-width: 1px; border-style: solid; border-radius: $roundness; + background-color: $bg; + background-image: none; transition: border 100ms ease; box-shadow: inset 1px 0 alpha($dark_shadow, .1), inset 0 1px alpha($dark_shadow, .12), @@ -55,8 +56,8 @@ } &:insensitive { - @include linear-gradient(shade($bg, .9)); - + background-color: shade($bg, .9); + background-image: none; color: mix($bg, $fg, .5); box-shadow: none; } @@ -69,7 +70,7 @@ color: $selected_fg_color; } - &.image.left { padding-right: $spacing; } + &.image.left { padding-right: ($spacing / 2); } } @include exports("entry") { diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index a072ca0..6abc15c 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -5,6 +5,7 @@ $modules: () !default; @mixin exports($name) { @if (not index($modules, $name)) { $modules: append($modules, $name) !global; + @content; } } @@ -18,15 +19,7 @@ $modules: () !default; } @function shade($color, $amount) { -// @if type-of($color) == "color" { -// @if $amount < 1 { -// @return darken($color, ((1 - $amount) * 100)); -// } @else { -// @return lighten($color, (($amount - 1) * 100)); -// } -// } @else { - @return unquote("shade(#{$color},#{$amount})"); -// } + @return unquote("shade(#{$color},#{$amount})"); } @function mix($color1, $color2, $amount) { @@ -50,13 +43,18 @@ $modules: () !default; } @mixin linear-gradient($color, $direction: to bottom) { - $amount: $gradient / 2; + @if $gradient == 0 { + background-color: $color; + background-image: none; + } @else { + $amount: $gradient / 2; - background-color: $color; - background-image: linear-gradient($direction, - shade($color, (1 + $amount)), - shade($color, (1 - $amount)) - ); + background-color: $color; + background-image: linear-gradient($direction, + shade($color, (1 + $amount)), + shade($color, (1 - $amount)) + ); + } } @mixin border($color) { diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index 844731c..c1d6911 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -1,15 +1,15 @@ // default color scheme $bg_color: #eee; -$fg_color: #444; +$fg_color: #333; $base_color: #fff; -$text_color: #444; +$text_color: #333; $selected_bg_color: #f06860; $selected_fg_color: #fff; -$tooltip_bg_color: #444; +$tooltip_bg_color: #333; $tooltip_fg_color: #eee; // dark colors -$dark_bg_color: #444; +$dark_bg_color: #333; $dark_fg_color: #eee; // shadows @@ -50,6 +50,6 @@ $lightdm_fg_color: $dark_fg_color; // widget styles $roundness: 2px; -$spacing: 5px; +$spacing: 6px; $gradient: 0; $contrast: .7; diff --git a/gtk-3.0/scss/_infobar.scss b/gtk-3.0/scss/_infobar.scss index 848c247..c5cec55 100644 --- a/gtk-3.0/scss/_infobar.scss +++ b/gtk-3.0/scss/_infobar.scss @@ -24,9 +24,9 @@ $bg_color: nth($colors, 2); &.#{$type} { + @include linear-gradient($bg_color); + border: 1px solid shade($bg_color, 0.8); - background-color: $bg_color; - background-image: none; color: $fg_color; .button { diff --git a/gtk-3.0/scss/_misc.scss b/gtk-3.0/scss/_misc.scss index ee3644f..73ac894 100644 --- a/gtk-3.0/scss/_misc.scss +++ b/gtk-3.0/scss/_misc.scss @@ -18,10 +18,10 @@ @include exports("tooltip") { .tooltip { + @include linear-gradient($tooltip_bg_color); + border: none; border-radius: $roundness; - background-color: $tooltip_bg_color; - background-image: none; color: $tooltip_fg_color; * { background-color: transparent; } @@ -111,10 +111,10 @@ @include exports("floatingbar") { .floating-bar { + @include linear-gradient($bg_color); + border: 1px solid border_normal($bg_color); border-radius: $roundness; - background-color: $bg_color; - background-image: none; color: $fg_color; &.top { diff --git a/gtk-3.0/scss/_progress.scss b/gtk-3.0/scss/_progress.scss index b5ccb30..1bb9636 100644 --- a/gtk-3.0/scss/_progress.scss +++ b/gtk-3.0/scss/_progress.scss @@ -30,8 +30,8 @@ } .progressbar { - background-image: none; - background-color: $selected_bg_color; + @include linear-gradient($selected_bg_color); + border-radius: 0; box-shadow: none; @@ -48,8 +48,7 @@ &.left.right { box-shadow: none; } &.vertical { - background-image: none; - background-color: $selected_bg_color; + @include linear-gradient($selected_bg_color, to right); &.bottom { border-bottom-left-radius: $roundness; @@ -75,16 +74,17 @@ .level-bar { &.trough { + @include linear-gradient(shade($bg_color, 1.08), to top); + border: 1px solid alpha(border_normal($bg_color), 0.5); - background-color: shade($bg_color, 1.08); - background-image: none; border-radius: $roundness; } &.fill-block { + @include linear-gradient($selected_bg_color); + // FIXME: it would be nice to set make fill blocks bigger, but we'd need // :nth-child working on discrete indicators - background-color: $selected_bg_color; border-color: transparent; border-radius: 0; @@ -123,9 +123,10 @@ &.slider { + @include linear-gradient(shade($bg_color, 1.08)); + border-radius: 8px; - background-color: shade($bg_color, 1.08); - background-image: none; + /* we will draw the border using box shadow for now */ box-shadow: inset 1px 0 border_normal($bg_color), inset 0 1px border_normal($bg_color), @@ -147,8 +148,8 @@ } &:insensitive { - background-color: shade($bg_color, 0.9); - background-image: none; + @include linear-gradient(shade($bg_color, 0.9)); + box-shadow: inset 1px 0 border_insensitive($bg_color), inset 0 1px border_insensitive($bg_color), inset -1px 0 border_insensitive($bg_color), @@ -170,26 +171,27 @@ &.trough { + @include linear-gradient(shade($bg_color, 1.08)); + margin: 7px 0; border: 1px solid alpha(border_normal($bg_color), 0.5); border-radius: $roundness; - background-color: shade($bg_color, 1.08); - background-image: none; - &:insensitive { background-color: shade($bg_color, 0.9); } + &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } &.vertical { margin: 0 7px; } } &.highlight { &, &.left, &.bottom { + @include linear-gradient($selected_bg_color); + border-color: $selected_bg_color; - background-color: $selected_bg_color; - background-image: none; &:insensitive { + @include linear-gradient(shade($bg_color, 0.8)); + border-color: shade($bg_color, 0.7); - background-color: shade($bg_color, 0.8); } } } diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/_toolbar.scss index 96b44b7..094d398 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/_toolbar.scss @@ -14,7 +14,7 @@ color: $fg; &:insensitive { - @include linear-gradient(darken($bg, 10%)); + @include linear-gradient(shade($bg, .9)); color: mix($fg, $bg, .5); } @@ -105,7 +105,7 @@ &:active, &:active:hover { background-image: none; background-color: transparent; - color: darken($selected_bg_color, 10%); + color: shade($selected_bg_color, .9); box-shadow: none; } From bd613155754e1b8be42934cd75d3268637afb3b3 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 14 Dec 2014 18:16:10 +0530 Subject: [PATCH 32/73] Popover fixes --- gtk-3.0/scss/_entry.scss | 4 +-- gtk-3.0/scss/_menu.scss | 57 ++++++++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss index 445fd55..b0a3474 100755 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/_entry.scss @@ -48,7 +48,7 @@ inset 0 1px alpha($dark_shadow, .12), inset -1px 0 alpha($dark_shadow, .1), inset 0 -1px alpha($dark_shadow, .05), - 0 1px 2px -1px shade($bg_color, 1.4); + 0 1px 2px -1px shade($bg, 1.4); &:selected, &:selected:focus { background-color: $selected_bg_color; @@ -70,7 +70,7 @@ color: $selected_fg_color; } - &.image.left { padding-right: ($spacing / 2); } + &.image.left { padding-right: $spacing; } } @include exports("entry") { diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/_menu.scss index 6fa1a44..49aae6c 100755 --- a/gtk-3.0/scss/_menu.scss +++ b/gtk-3.0/scss/_menu.scss @@ -118,8 +118,7 @@ &, &:focus, &:active, &:insensitive, &:active:insensitive { background-color: transparent; background-image: none; - border-color: transparent; - border-style: none; + border: none; box-shadow: none; color: currentColor; } @@ -189,11 +188,39 @@ > .toolbar .button { border-radius: 0; border-width: 0; - background-image: none; background-color: transparent; + background-image: none; } } + .list { + background-color: transparent; + background-image: none; + } + + .list-row { + &, &.button { + background-color: transparent; + background-image: none; + color: $menu_fg_color; + + &:focus, &:hover, &:active { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + } + + .frame { + border-color: border_normal($menu_bg_color); + border-radius: $roundness; + } + + .entry { @include entry($menu_bg_color, $menu_fg_color); } + + .button { @include button($menu_bg_color, $menu_fg_color); } + > .list, > .view, > .toolbar { background-color: transparent; } .separator { @@ -206,24 +233,14 @@ } GtkModelButton.button { - &, &:focus, &:active, &:insensitive, &:active:insensitive { - &, &:backdrop { - background-color: transparent; - background-image: none; - border-color: transparent; - border-image: none; - border-style: none; - box-shadow: none; - color: $menu_fg_color; - } - } + &, &:backdrop { + @include button(transparent, currentColor); - &:focus:hover, &:active:hover, &:hover, &:selected { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - border: none; - border-radius: 2px; + &:focus:hover, &:active:hover, &:hover, &:selected { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } } } } From 9613c83bdc8455ffbe33da0152468b805a9756a0 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 00:58:35 +0530 Subject: [PATCH 33/73] Consistent colors througout --- gtk-2.0/gtkrc | 4 ++-- metacity-1/metacity-theme-2.xml | 20 ++++++++++---------- metacity-1/metacity-theme-3.xml | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 830ae2d..0f86d59 100755 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,6 +1,6 @@ # Numix GTK Theme -gtk-color-scheme = "bg_color:#dedede\nfg_color:#555555\nbase_color:#f9f9f9\ntext_color:#333333\nselected_bg_color:#d64937\nselected_fg_color:#f9f9f9\ntooltip_bg_color:#2d2d2d\ntooltip_fg_color:#dedede\ntitlebar_bg_color:#2d2d2d\ntitlebar_fg_color:#dcdcdc\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d" +gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#333333\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#d64937\nselected_fg_color:#ffffff\ntooltip_bg_color:#333333\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#333333\ntitlebar_fg_color:#eeeeee\nmenubar_bg_color:#333333\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#333333\nmenu_bg_color:#333333\nmenu_fg_color:#eeeeee\npanel_bg_color:#333333\npanel_fg_color:#eeeeee\nlink_color:#f06860" # Default Style @@ -470,7 +470,7 @@ class "PanelToplevel*" style "murrine-panel" widget_class "*PanelToplevel*" style "murrine-panel" widget_class "*notif*" style "murrine-panel" widget_class "*Notif*" style "murrine-panel" -widget_class "*Tray*" style "murrine-panel" +widget_class "*Tray*" style "murrine-panel" widget_class "*tray*" style "murrine-panel" widget_class "*computertemp*" style "murrine-panel" widget_class "*Applet*Tomboy*" style "murrine-panel" diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml index 8d8f3c8..93b3861 100755 --- a/metacity-1/metacity-theme-2.xml +++ b/metacity-1/metacity-theme-2.xml @@ -9,12 +9,12 @@ - + - + - + @@ -721,15 +721,15 @@ - - - @@ -737,16 +737,16 @@ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5" color="C_icons_focused_pressed" /> - - + diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml index 3ec1eb3..a5fbae8 100755 --- a/metacity-1/metacity-theme-3.xml +++ b/metacity-1/metacity-theme-3.xml @@ -9,12 +9,12 @@ - + - + - + @@ -733,15 +733,15 @@ - - - @@ -749,16 +749,16 @@ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5" color="C_icons_focused_pressed" /> - - + From aab802efc32d0405de2b1488f718111f0fe8aa12 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 01:00:29 +0530 Subject: [PATCH 34/73] Recolor openbox theme --- openbox-3/themerc | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/openbox-3/themerc b/openbox-3/themerc index 7d5663f..b29bd09 100755 --- a/openbox-3/themerc +++ b/openbox-3/themerc @@ -4,21 +4,21 @@ # Menu -menu.border.color: #2d2d2d +menu.border.color: #333333 menu.title.bg: flat solid -menu.title.bg.color: #2d2d2d -menu.title.text.color: #dcdcdc +menu.title.bg.color: #333333 +menu.title.text.color: #eeeeee menu.title.text.justify: center menu.items.bg: flat solid -menu.items.bg.color: #2d2d2d -menu.items.text.color: #dcdcdc +menu.items.bg.color: #333333 +menu.items.text.color: #eeeeee menu.items.disabled.text.color: #888888 menu.items.active.bg: flat solid -menu.items.active.bg.color: #d64937 -menu.items.active.text.color: #f9f9f9 +menu.items.active.bg.color: #f06860 +menu.items.active.text.color: #ffffff menu.separator.color: #262626 menu.separator.width: 1 @@ -30,29 +30,29 @@ menu.separator.padding.height: 4 window.active.border.color: #484848 window.active.title.bg: flat solid -window.active.title.bg.color: #2d2d2d -window.active.title.separator.color: #2d2d2d +window.active.title.bg.color: #333333 +window.active.title.separator.color: #333333 window.active.text.justify: center window.active.label.bg: parentrelative -window.active.label.text.color: #dcdcdc +window.active.label.text.color: #eeeeee window.active.handle.bg: flat solid -window.active.handle.bg.color: #2d2d2d +window.active.handle.bg.color: #333333 window.active.grip.bg: flat solid -window.active.grip.bg.color: #2d2d2d +window.active.grip.bg.color: #333333 window.active.button.unpressed.bg: flat solid -window.active.button.unpressed.bg.color: #2d2d2d -window.active.button.unpressed.image.color: #dcdcdc +window.active.button.unpressed.bg.color: #333333 +window.active.button.unpressed.image.color: #eeeeee window.active.button.pressed.bg: flat solid -window.active.button.pressed.bg.color: #2d2d2d -window.active.button.pressed.image.color: #d64937 +window.active.button.pressed.bg.color: #333333 +window.active.button.pressed.image.color: #f06860 window.active.button.disabled.bg: flat solid -window.active.button.disabled.bg.color: #2d2d2d +window.active.button.disabled.bg.color: #333333 window.active.button.disabled.image.color: #888888 @@ -60,29 +60,29 @@ window.active.button.disabled.image.color: #888888 window.inactive.border.color: #393939 window.inactive.title.bg: flat solid -window.inactive.title.bg.color: #2d2d2d -window.inactive.title.separator.color: #2d2d2d +window.inactive.title.bg.color: #333333 +window.inactive.title.separator.color: #333333 window.inactive.text.justify: center window.inactive.label.bg: parentrelative window.inactive.label.text.color: #888888 window.inactive.handle.bg: flat solid -window.inactive.handle.bg.color: #2d2d2d +window.inactive.handle.bg.color: #333333 window.inactive.grip.bg: flat solid -window.inactive.grip.bg.color: #2d2d2d +window.inactive.grip.bg.color: #333333 window.inactive.button.unpressed.bg: flat solid -window.inactive.button.unpressed.bg.color: #2d2d2d +window.inactive.button.unpressed.bg.color: #333333 window.inactive.button.unpressed.image.color: #888888 window.inactive.button.pressed.bg: flat solid -window.inactive.button.pressed.bg.color: #2d2d2d -window.inactive.button.pressed.image.color: #d64937 +window.inactive.button.pressed.bg.color: #333333 +window.inactive.button.pressed.image.color: #f06860 window.inactive.button.disabled.bg: flat solid -window.inactive.button.disabled.bg.color: #2d2d2d +window.inactive.button.disabled.bg.color: #333333 window.inactive.button.disabled.image.color: #888888 @@ -91,13 +91,13 @@ osd.border.width: 1 osd.border.color: #484848 osd.bg: flat solid -osd.bg.color: #2d2d2d +osd.bg.color: #333333 osd.label.bg: flat solid -osd.label.bg.color: #2d2d2d -osd.label.text.color: #dcdcdc +osd.label.bg.color: #333333 +osd.label.text.color: #eeeeee osd.hilight.bg: flat solid -osd.hilight.bg.color: #d64937 +osd.hilight.bg.color: #f06860 osd.unhilight.bg: flat solid osd.unhilight.bg.color: #888888 @@ -114,7 +114,7 @@ osd.button.focused.bg: flat solid border osd.button.focused.bg.color: #303030 osd.button.focused.*.border.color: #1e1e1e -osd.button.focused.box.color: #d64937 +osd.button.focused.box.color: #f06860 # Fonts From 585d4e491db6176f502b0f67ec6a00f4712d34c0 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 01:14:22 +0530 Subject: [PATCH 35/73] Move widgets to separate folder --- gtk-3.0/scss/widgets.scss | 40 ++++++++++++---------- gtk-3.0/scss/{ => widgets}/_base.scss | 4 --- gtk-3.0/scss/{ => widgets}/_button.scss | 4 --- gtk-3.0/scss/{ => widgets}/_calendar.scss | 4 --- gtk-3.0/scss/{ => widgets}/_choosers.scss | 4 --- gtk-3.0/scss/{ => widgets}/_entry.scss | 4 --- gtk-3.0/scss/{ => widgets}/_grid.scss | 4 --- gtk-3.0/scss/{ => widgets}/_infobar.scss | 2 -- gtk-3.0/scss/{ => widgets}/_menu.scss | 2 -- gtk-3.0/scss/{ => widgets}/_misc.scss | 4 --- gtk-3.0/scss/{ => widgets}/_notebook.scss | 3 +- gtk-3.0/scss/{ => widgets}/_osd.scss | 2 -- gtk-3.0/scss/{ => widgets}/_progress.scss | 4 --- gtk-3.0/scss/{ => widgets}/_scrollbar.scss | 3 -- gtk-3.0/scss/{ => widgets}/_sidebar.scss | 4 --- gtk-3.0/scss/{ => widgets}/_spinner.scss | 4 --- gtk-3.0/scss/{ => widgets}/_toggle.scss | 4 --- gtk-3.0/scss/{ => widgets}/_toolbar.scss | 3 +- gtk-3.0/scss/{ => widgets}/_view.scss | 4 --- gtk-3.0/scss/{ => widgets}/_window.scss | 4 --- 20 files changed, 23 insertions(+), 84 deletions(-) rename gtk-3.0/scss/{ => widgets}/_base.scss (98%) rename gtk-3.0/scss/{ => widgets}/_button.scss (99%) rename gtk-3.0/scss/{ => widgets}/_calendar.scss (90%) rename gtk-3.0/scss/{ => widgets}/_choosers.scss (98%) rename gtk-3.0/scss/{ => widgets}/_entry.scss (98%) rename gtk-3.0/scss/{ => widgets}/_grid.scss (95%) rename gtk-3.0/scss/{ => widgets}/_infobar.scss (94%) rename gtk-3.0/scss/{ => widgets}/_menu.scss (99%) rename gtk-3.0/scss/{ => widgets}/_misc.scss (98%) rename gtk-3.0/scss/{ => widgets}/_notebook.scss (98%) rename gtk-3.0/scss/{ => widgets}/_osd.scss (99%) rename gtk-3.0/scss/{ => widgets}/_progress.scss (99%) rename gtk-3.0/scss/{ => widgets}/_scrollbar.scss (96%) rename gtk-3.0/scss/{ => widgets}/_sidebar.scss (98%) rename gtk-3.0/scss/{ => widgets}/_spinner.scss (93%) rename gtk-3.0/scss/{ => widgets}/_toggle.scss (98%) rename gtk-3.0/scss/{ => widgets}/_toolbar.scss (98%) rename gtk-3.0/scss/{ => widgets}/_view.scss (99%) rename gtk-3.0/scss/{ => widgets}/_window.scss (96%) diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss index e5613bf..3dfd4ff 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/widgets.scss @@ -1,24 +1,26 @@ @import "functions"; +@import "global"; @import "colors"; -@import "base"; -@import "button"; -@import "entry"; -@import "calendar"; -@import "choosers"; -@import "grid"; -@import "infobar"; -@import "menu"; -@import "misc"; -@import "notebook"; -@import "osd"; -@import "progress"; -@import "scrollbar"; -@import "sidebar"; -@import "spinner"; -@import "toggle"; -@import "toolbar"; -@import "view"; -@import "window"; + +@import "widgets/base"; +@import "widgets/button"; +@import "widgets/entry"; +@import "widgets/calendar"; +@import "widgets/choosers"; +@import "widgets/grid"; +@import "widgets/infobar"; +@import "widgets/menu"; +@import "widgets/misc"; +@import "widgets/notebook"; +@import "widgets/osd"; +@import "widgets/progress"; +@import "widgets/scrollbar"; +@import "widgets/sidebar"; +@import "widgets/spinner"; +@import "widgets/toggle"; +@import "widgets/toolbar"; +@import "widgets/view"; +@import "widgets/window"; /************** diff --git a/gtk-3.0/scss/_base.scss b/gtk-3.0/scss/widgets/_base.scss similarity index 98% rename from gtk-3.0/scss/_base.scss rename to gtk-3.0/scss/widgets/_base.scss index e9afca8..d2f95c7 100755 --- a/gtk-3.0/scss/_base.scss +++ b/gtk-3.0/scss/widgets/_base.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /************** ! GTK settings ***************/ diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/widgets/_button.scss similarity index 99% rename from gtk-3.0/scss/_button.scss rename to gtk-3.0/scss/widgets/_button.scss index f5ff5c6..5ddeb6c 100755 --- a/gtk-3.0/scss/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /********* ! Buttons **********/ diff --git a/gtk-3.0/scss/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss similarity index 90% rename from gtk-3.0/scss/_calendar.scss rename to gtk-3.0/scss/widgets/_calendar.scss index 6eacde0..6f2a34b 100644 --- a/gtk-3.0/scss/_calendar.scss +++ b/gtk-3.0/scss/widgets/_calendar.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /********** ! Calendar ***********/ diff --git a/gtk-3.0/scss/_choosers.scss b/gtk-3.0/scss/widgets/_choosers.scss similarity index 98% rename from gtk-3.0/scss/_choosers.scss rename to gtk-3.0/scss/widgets/_choosers.scss index 2d1a1cf..82c1283 100644 --- a/gtk-3.0/scss/_choosers.scss +++ b/gtk-3.0/scss/widgets/_choosers.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /*************** ! Color chooser ****************/ diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/widgets/_entry.scss similarity index 98% rename from gtk-3.0/scss/_entry.scss rename to gtk-3.0/scss/widgets/_entry.scss index b0a3474..184dac5 100755 --- a/gtk-3.0/scss/_entry.scss +++ b/gtk-3.0/scss/widgets/_entry.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /******* ! Entry ********/ diff --git a/gtk-3.0/scss/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss similarity index 95% rename from gtk-3.0/scss/_grid.scss rename to gtk-3.0/scss/widgets/_grid.scss index 403e592..fbbfd56 100644 --- a/gtk-3.0/scss/_grid.scss +++ b/gtk-3.0/scss/widgets/_grid.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /****************** ! Grid and flowbox *******************/ diff --git a/gtk-3.0/scss/_infobar.scss b/gtk-3.0/scss/widgets/_infobar.scss similarity index 94% rename from gtk-3.0/scss/_infobar.scss rename to gtk-3.0/scss/widgets/_infobar.scss index c5cec55..faf4e5c 100644 --- a/gtk-3.0/scss/_infobar.scss +++ b/gtk-3.0/scss/widgets/_infobar.scss @@ -1,5 +1,3 @@ -@import "functions"; -@import "global"; @import "button"; diff --git a/gtk-3.0/scss/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss similarity index 99% rename from gtk-3.0/scss/_menu.scss rename to gtk-3.0/scss/widgets/_menu.scss index 49aae6c..e5f6cfb 100755 --- a/gtk-3.0/scss/_menu.scss +++ b/gtk-3.0/scss/widgets/_menu.scss @@ -1,5 +1,3 @@ -@import "functions"; -@import "global"; @import "entry"; diff --git a/gtk-3.0/scss/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss similarity index 98% rename from gtk-3.0/scss/_misc.scss rename to gtk-3.0/scss/widgets/_misc.scss index 73ac894..73e64b5 100644 --- a/gtk-3.0/scss/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /*************** ! Dimmed label * ****************/ diff --git a/gtk-3.0/scss/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss similarity index 98% rename from gtk-3.0/scss/_notebook.scss rename to gtk-3.0/scss/widgets/_notebook.scss index defac44..7d5c1ef 100644 --- a/gtk-3.0/scss/_notebook.scss +++ b/gtk-3.0/scss/widgets/_notebook.scss @@ -1,5 +1,4 @@ -@import "functions"; -@import "global"; +@import "button"; /********** diff --git a/gtk-3.0/scss/_osd.scss b/gtk-3.0/scss/widgets/_osd.scss similarity index 99% rename from gtk-3.0/scss/_osd.scss rename to gtk-3.0/scss/widgets/_osd.scss index 673a262..c1cc404 100644 --- a/gtk-3.0/scss/_osd.scss +++ b/gtk-3.0/scss/widgets/_osd.scss @@ -1,5 +1,3 @@ -@import "functions"; -@import "global"; @import "button"; diff --git a/gtk-3.0/scss/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss similarity index 99% rename from gtk-3.0/scss/_progress.scss rename to gtk-3.0/scss/widgets/_progress.scss index 1bb9636..94ec533 100644 --- a/gtk-3.0/scss/_progress.scss +++ b/gtk-3.0/scss/widgets/_progress.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /***************** ! Progress bars * ******************/ diff --git a/gtk-3.0/scss/_scrollbar.scss b/gtk-3.0/scss/widgets/_scrollbar.scss similarity index 96% rename from gtk-3.0/scss/_scrollbar.scss rename to gtk-3.0/scss/widgets/_scrollbar.scss index 7777280..b2548ed 100644 --- a/gtk-3.0/scss/_scrollbar.scss +++ b/gtk-3.0/scss/widgets/_scrollbar.scss @@ -1,6 +1,3 @@ -@import "functions"; -@import "global"; - /*********** ! Scrollbar ************/ diff --git a/gtk-3.0/scss/_sidebar.scss b/gtk-3.0/scss/widgets/_sidebar.scss similarity index 98% rename from gtk-3.0/scss/_sidebar.scss rename to gtk-3.0/scss/widgets/_sidebar.scss index 78e1b89..af417ff 100755 --- a/gtk-3.0/scss/_sidebar.scss +++ b/gtk-3.0/scss/widgets/_sidebar.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /********* ! Sidebar **********/ diff --git a/gtk-3.0/scss/_spinner.scss b/gtk-3.0/scss/widgets/_spinner.scss similarity index 93% rename from gtk-3.0/scss/_spinner.scss rename to gtk-3.0/scss/widgets/_spinner.scss index ee50103..395c21c 100644 --- a/gtk-3.0/scss/_spinner.scss +++ b/gtk-3.0/scss/widgets/_spinner.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /******************* ! Spinner animation ********************/ diff --git a/gtk-3.0/scss/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss similarity index 98% rename from gtk-3.0/scss/_toggle.scss rename to gtk-3.0/scss/widgets/_toggle.scss index 70c1f39..cf4936c 100755 --- a/gtk-3.0/scss/_toggle.scss +++ b/gtk-3.0/scss/widgets/_toggle.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /*********************** ! Check and Radio items ************************/ diff --git a/gtk-3.0/scss/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss similarity index 98% rename from gtk-3.0/scss/_toolbar.scss rename to gtk-3.0/scss/widgets/_toolbar.scss index 094d398..057f817 100755 --- a/gtk-3.0/scss/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -1,7 +1,6 @@ -@import "functions"; -@import "global"; @import "button"; + /********* ! Toolbar **********/ diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/widgets/_view.scss similarity index 99% rename from gtk-3.0/scss/_view.scss rename to gtk-3.0/scss/widgets/_view.scss index a8cf5b4..bda6711 100644 --- a/gtk-3.0/scss/_view.scss +++ b/gtk-3.0/scss/widgets/_view.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /*************** ! Generic views ****************/ diff --git a/gtk-3.0/scss/_window.scss b/gtk-3.0/scss/widgets/_window.scss similarity index 96% rename from gtk-3.0/scss/_window.scss rename to gtk-3.0/scss/widgets/_window.scss index 0be7a63..8f354c8 100755 --- a/gtk-3.0/scss/_window.scss +++ b/gtk-3.0/scss/widgets/_window.scss @@ -1,7 +1,3 @@ -@import "functions"; -@import "global"; - - /************** ! Window frame ***************/ From 4f7284529cd1725293c52ea4fd5da0d6b7643d4d Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 02:48:47 +0530 Subject: [PATCH 36/73] Style GNOME apps --- gtk-3.0/gtk.css | 2 +- gtk-3.0/scss/_global.scss | 3 + gtk-3.0/scss/apps/_gnome-applications.scss | 350 +++++++++++++++++++++ 3 files changed, 354 insertions(+), 1 deletion(-) create mode 100644 gtk-3.0/scss/apps/_gnome-applications.scss diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 27ebee0..a245e70 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,2 +1,2 @@ -@import url("dist/widgets.css"); +@import url("dist/gtk.css"); diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index c1d6911..86f89e7 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -42,6 +42,9 @@ $menu_fg_color: $dark_fg_color; $menubar_bg_color: $dark_bg_color; $menubar_fg_color: $dark_fg_color; +$panel_bg_color: $dark_bg_color; +$panel_fg_color: $dark_fg_color; + $osd_bg: $dark_bg_color; $osd_fg: $dark_fg_color; diff --git a/gtk-3.0/scss/apps/_gnome-applications.scss b/gtk-3.0/scss/apps/_gnome-applications.scss new file mode 100644 index 0000000..2c46b88 --- /dev/null +++ b/gtk-3.0/scss/apps/_gnome-applications.scss @@ -0,0 +1,350 @@ +/*********************** + ! Fallback mode panel * +************************/ + +@include exports("panel") { + %panel { + @include linear-gradient($panel_bg_color); + + color: $panel_fg_color; + } + + PanelWidget, PanelApplet, PanelToplevel { + @extend %panel; + + padding: 0; + } + + PanelApplet { + border: none; + + .button { + -GtkButton-inner-border: 2; + + border-width: 0 1px; + border-radius: 0; + border-color: transparent; + background-color: transparent; + background-image: none; + color: $panel_fg_color; + + &:hover, &:prelight { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11)); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.11); + color: shade($panel_fg_color, 1.08); + } + + &:active, &:checked { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.21); + color: shade($panel_fg_color, 1.08); + + &:prelight { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.31); + } + } + } + } + + PanelSeparator { + @extend %panel; + + border: none; + } + + PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar { + &.menuitem { + @extend %panel; + + border: none; + + -PanelMenuBar-icon-visible: true; + } + } + + PanelAppletFrame { + @extend %panel; + + border: none; + } + + WnckPager, WnckTasklist { @extend %panel; } +} + + +/************ + ! Nautilus * +*************/ + +@include exports("nautilus") { + .nautilus-desktop.nautilus-canvas-item { + color: white; + text-shadow: 1px 1px black; + + &:active { color: $fg_color; } + + &:selected { color: $selected_fg_color; } + + &:active, &:prelight, &:selected { text-shadow: none; } + } + + NautilusWindow { + .toolbar { + border-width: 0 0 1px; + border-style: solid; + border-color: shade($toolbar_bg_color, 0.8); + } + + .sidebar .frame { border: none; } + + > GtkGrid > .pane-separator { + border-width: 0 1px 0 0; + border-style: solid; + + &, &:hover { + border-color: shade($bg_color, 0.8); + background-color: $bg_color; + } + } + } + + NautilusNotebook { + &.notebook { + border-right-width: 0; + border-left-width: 0; + border-bottom-width: 0; + } + + .frame { border: none; } + } + + NautilusQueryEditor { + .search-bar.toolbar { + border-top-width: 0; + border-bottom-width: 0; + } + + .toolbar { + padding-top: $spacing - 1px; + padding-bottom: $spacing - 2px; + border-width: 1px 0 0 0; + border-style: solid; + border-color: $toolbar_bg_color; + background-color: shade($toolbar_bg_color, 0.9); + + &:nth-child(2) { border-color: shade($toolbar_bg_color, 0.8); } + + &.search-bar { + border-top-width: 0; + border-bottom-width: 0; + } + + &, &.search-bar { + &:only-child { + border-bottom-width: 1px; + border-bottom-color: shade($toolbar_bg_color, 0.8); + } + } + + } + } +} + + +/********* + ! Gedit * +**********/ + +@include exports("gedit") { + GeditWindow .pane-separator { + border-width: 0 1px 0 0; + border-style: solid; + + &, &:hover { + border-color: shade($bg_color, 0.8); + background-color: $bg_color; + } + } + + .gedit-document-panel { + background-color: $bg_color; + color: mix($fg_color, $bg_color, 0.1); + + .list-row { + padding: $spacing; + + .button { + padding: 1px; + border-radius: $roundness; + border-style: solid; + border-color: transparent; + border-width: 1px; + background-color: transparent; + background-image: none; + color: transparent; + icon-shadow: none; + } + } + + .prelight-row .button { + border-color: alpha(black, 0.1); + color: alpha(white, 0.8); + + &:active { + border-color: alpha(black, 0.2); + background-color: alpha(black, 0.08); + color: white; + } + } + + list-row, .prelight-row { + .button:hover { + border-color: alpha(black, 0.1); + color: white; + } + } + } + + .gedit-document-panel-group-row { + &, &:hover { + border-top: 1px solid shade($bg_color, 0.9); + background-color: $bg_color; + } + } + + .gedit-document-panel-document-row { + &:hover { background-color: shade($bg_color, 1.05); } + + &:selected { + &, &:hover { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + } + + .gedit-document-panel-dragged-row { + border: 1px solid alpha(black, 0.1); + background-color: alpha(black, 0.5); + color: white; + } + + .gedit-document-panel-placeholder-row { + border: none; + background-color: alpha(black, 0.08); + transition: all 200ms ease-in; + } + + GeditStatusbar { border-top: 1px solid shade($bg_color, 0.8); } + + GeditStatusbar GeditSmallButton, GeditStatusMenuButton { + text-shadow: none; + + .button { + border-style: solid; + border-width: 0 1px; + border-color: transparent; + border-radius: 0; + padding: 1px 6px 2px 4px; + + &:hover, &:active, &:active:hover { border-color: shade($bg_color, 0.8); } + + &:active { + background-color: shade($bg_color, 0.95); + color: $fg_color; + } + } + } + + GeditViewFrame .gedit-search-slider { + padding: $spacing; + border-radius: 0 0 $roundness $roundness; + border-width: 0 1px 1px 1px; + border-style: solid; + border-color: shade($base_color, 0.8); + background-color: $base_color; + + .not-found { + background-color: $error_bg_color; + background-image: none; + color: $error_fg_color; + + &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + } + + GeditFileBrowserWidget .toolbar { + padding: $spacing / 2; + border-top: none; + background-color: $bg_color; + background-image: none; + } + + .gedit-search-entry-occurrences-tag { + margin: $spacing / 2; + padding: $spacing / 2; + color: mix($text_color, $base_color, 0.5); + } +} + + +/*************** + ! Font-viewer * +****************/ + +@include exports("fontviewer") { + SushiFontWidget { + padding: $spacing ($spacing * 2); + } +} + + +/************* + ! Gucharmap * +**************/ + +@include exports("charmap") { + GucharmapChartable { + background-color: $base_color; + color: $text_color; + + &:focus, &:hover, &:active, &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } +} + + +/************* + ! Evolution * +**************/ + +@include exports("evolution") { + EPreviewPane .entry { + background-color: $base_color; + color: $text_color; + } +} + + +/******************* + * Gnome Bluetooth * +********************/ + +@include exports("gnome-bluetooth") { + GtkEntry.entry.pin-entry { + font: regular 50; + padding-left: 25px; + padding-right: 25px; + } + + GtkLabel.pin-label { font: regular 50; } +} From e42253e9976fc4fab07d47396c2cddef5cf4fa28 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 03:11:02 +0530 Subject: [PATCH 37/73] Style more widgets --- gtk-3.0/scss/_functions.scss | 2 +- gtk-3.0/scss/_global.scss | 2 +- gtk-3.0/scss/apps/_gnome-applications.scss | 33 ++++++++------------ gtk-3.0/scss/apps/_nemo.scss | 36 ++++++++++++++++++++++ gtk-3.0/scss/apps/_synaptic.scss | 15 +++++++++ gtk-3.0/scss/{widgets.scss => gtk.scss} | 6 ++++ gtk-3.0/scss/widgets/_base.scss | 8 ++--- gtk-3.0/scss/widgets/_calendar.scss | 6 ++++ gtk-3.0/scss/widgets/_grid.scss | 2 +- gtk-3.0/scss/widgets/_view.scss | 2 +- 10 files changed, 83 insertions(+), 29 deletions(-) create mode 100644 gtk-3.0/scss/apps/_nemo.scss create mode 100644 gtk-3.0/scss/apps/_synaptic.scss rename gtk-3.0/scss/{widgets.scss => gtk.scss} (98%) diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index 6abc15c..1986d84 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -39,7 +39,7 @@ $modules: () !default; } @function border_insensitive($color) { - @return shade($color, ($contrast + .1)); + @return shade($color, ($contrast + .10)); } @mixin linear-gradient($color, $direction: to bottom) { diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index 86f89e7..3c51646 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -53,6 +53,6 @@ $lightdm_fg_color: $dark_fg_color; // widget styles $roundness: 2px; -$spacing: 6px; +$spacing: 5px; $gradient: 0; $contrast: .7; diff --git a/gtk-3.0/scss/apps/_gnome-applications.scss b/gtk-3.0/scss/apps/_gnome-applications.scss index 2c46b88..91c4f34 100644 --- a/gtk-3.0/scss/apps/_gnome-applications.scss +++ b/gtk-3.0/scss/apps/_gnome-applications.scss @@ -96,7 +96,7 @@ .toolbar { border-width: 0 0 1px; border-style: solid; - border-color: shade($toolbar_bg_color, 0.8); + border-color: border_normal($toolbar_bg_color); } .sidebar .frame { border: none; } @@ -106,7 +106,7 @@ border-style: solid; &, &:hover { - border-color: shade($bg_color, 0.8); + border-color: shade($bg_color, ($contrast + .10)); background-color: $bg_color; } } @@ -136,7 +136,7 @@ border-color: $toolbar_bg_color; background-color: shade($toolbar_bg_color, 0.9); - &:nth-child(2) { border-color: shade($toolbar_bg_color, 0.8); } + &:nth-child(2) { border-color: border_normal($toolbar_bg_color); } &.search-bar { border-top-width: 0; @@ -146,7 +146,7 @@ &, &.search-bar { &:only-child { border-bottom-width: 1px; - border-bottom-color: shade($toolbar_bg_color, 0.8); + border-bottom-color: border_normal($toolbar_bg_color); } } @@ -165,7 +165,7 @@ border-style: solid; &, &:hover { - border-color: shade($bg_color, 0.8); + border-color: shade($bg_color, ($contrast + .10)); background-color: $bg_color; } } @@ -211,7 +211,7 @@ .gedit-document-panel-group-row { &, &:hover { - border-top: 1px solid shade($bg_color, 0.9); + border-top: 1px solid shade($bg_color, ($contrast + .10)); background-color: $bg_color; } } @@ -220,10 +220,7 @@ &:hover { background-color: shade($bg_color, 1.05); } &:selected { - &, &:hover { - background-color: $selected_bg_color; - color: $selected_fg_color; - } + &, &:hover { @extend %selected; } } } @@ -239,7 +236,7 @@ transition: all 200ms ease-in; } - GeditStatusbar { border-top: 1px solid shade($bg_color, 0.8); } + GeditStatusbar { border-top: 1px solid border_normal($bg_color); } GeditStatusbar GeditSmallButton, GeditStatusMenuButton { text-shadow: none; @@ -251,7 +248,7 @@ border-radius: 0; padding: 1px 6px 2px 4px; - &:hover, &:active, &:active:hover { border-color: shade($bg_color, 0.8); } + &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); } &:active { background-color: shade($bg_color, 0.95); @@ -265,7 +262,7 @@ border-radius: 0 0 $roundness $roundness; border-width: 0 1px 1px 1px; border-style: solid; - border-color: shade($base_color, 0.8); + border-color: border_normal($base_color); background-color: $base_color; .not-found { @@ -273,10 +270,7 @@ background-image: none; color: $error_fg_color; - &:selected { - background-color: $selected_bg_color; - color: $selected_fg_color; - } + &:selected { @extend %selected; } } } @@ -315,10 +309,7 @@ background-color: $base_color; color: $text_color; - &:focus, &:hover, &:active, &:selected { - background-color: $selected_bg_color; - color: $selected_fg_color; - } + &:focus, &:hover, &:active, &:selected { @extend %selected; } } } diff --git a/gtk-3.0/scss/apps/_nemo.scss b/gtk-3.0/scss/apps/_nemo.scss new file mode 100644 index 0000000..63518aa --- /dev/null +++ b/gtk-3.0/scss/apps/_nemo.scss @@ -0,0 +1,36 @@ +/******** + ! Nemo * +*********/ + +@include exports("nemo") { + .nemo-desktop.nemo-canvas-item { + color: white; + text-shadow: 1px 1px black; + + &:active { color: $fg_color; } + + &:selected { color: $selected_fg_color; } + + &:active, &:prelight, &:selected { text-shadow: none; } + } + + NemoPathbarButton { + @include button($toolbar_bg_color, $toolbar_fg_color); + + -NemoPathbarButton-border-radius: $roundness; + } + + NemoPlacesTreeView { + -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_bg_color, 0.8); + -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color; + -NemoPlacesTreeView-disk-full-bar-width: 1px; + -NemoPlacesTreeView-disk-full-bar-radius: 1px; + -NemoPlacesTreeView-disk-full-bottom-padding: 2px; + -NemoPlacesTreeView-disk-full-max-length: 70px; + + &:selected { + -NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color; + -NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2); + } + } +} diff --git a/gtk-3.0/scss/apps/_synaptic.scss b/gtk-3.0/scss/apps/_synaptic.scss new file mode 100644 index 0000000..ca67412 --- /dev/null +++ b/gtk-3.0/scss/apps/_synaptic.scss @@ -0,0 +1,15 @@ +/************ + ! Synaptic * +*************/ + +@include exports("synaptic") { + GtkWindow > GtkVBox > .dock { + &, > GtkHBox > GtkToolbar { + @include linear-gradient($toolbar-bg-color); + + padding: $spacing; + border: none; + color: $toolbar_fg_color; + } + } +} diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/gtk.scss similarity index 98% rename from gtk-3.0/scss/widgets.scss rename to gtk-3.0/scss/gtk.scss index 3dfd4ff..e191304 100755 --- a/gtk-3.0/scss/widgets.scss +++ b/gtk-3.0/scss/gtk.scss @@ -2,6 +2,7 @@ @import "global"; @import "colors"; + @import "widgets/base"; @import "widgets/button"; @import "widgets/entry"; @@ -23,6 +24,11 @@ @import "widgets/window"; +@import "apps/gnome-applications"; +@import "apps/nemo"; +@import "apps/synaptic"; + + /************** * action-bar * **************/ diff --git a/gtk-3.0/scss/widgets/_base.scss b/gtk-3.0/scss/widgets/_base.scss index d2f95c7..a1916f6 100755 --- a/gtk-3.0/scss/widgets/_base.scss +++ b/gtk-3.0/scss/widgets/_base.scss @@ -48,7 +48,7 @@ ! Base states *************/ -%selected_items { +%selected { &, &:focus { background-color: $selected_bg_color; color: $selected_fg_color; @@ -56,7 +56,7 @@ } * { - &:selected { @extend %selected_items; } + &:selected { @extend %selected; } &:insensitive, &:insensitive:insensitive { color: mix($fg_color, $bg_color, 0.50); } @@ -103,7 +103,7 @@ color: mix($fg_color, $bg_color, 0.50); } - &:selected { @extend %selected_items; } + &:selected { @extend %selected; } } GtkImage, GtkLabel, GtkBox, GtkGrid { @@ -117,7 +117,7 @@ GtkLabel { @extend .dim-label; } - &:selected { @extend %selected_items; } + &:selected { @extend %selected; } &:insensitive { color: mix($fg_color, $bg_color, 0.50); } } diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss index 6f2a34b..ee88e64 100644 --- a/gtk-3.0/scss/widgets/_calendar.scss +++ b/gtk-3.0/scss/widgets/_calendar.scss @@ -19,5 +19,11 @@ &.highlight { color: $selected_bg_color; } } + + /* gnome-calendar */ + .calendar-view { + background-color: $base_color; + color: $text_color; + } } diff --git a/gtk-3.0/scss/widgets/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss index fbbfd56..877707c 100644 --- a/gtk-3.0/scss/widgets/_grid.scss +++ b/gtk-3.0/scss/widgets/_grid.scss @@ -37,7 +37,7 @@ border-radius: $roundness; &:selected { - @extend %selected_items; + @extend %selected; outline-offset: -2px; } diff --git a/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss index bda6711..6a96596 100644 --- a/gtk-3.0/scss/widgets/_view.scss +++ b/gtk-3.0/scss/widgets/_view.scss @@ -12,7 +12,7 @@ color: mix($text_color, $base_color, 0.5); } - &:selected, &:selected:focus { @extend %selected_items; } + &:selected, &:selected:focus { @extend %selected; } } .cell { From 04b7d110accf668451f0173ffec6ccdc9612a7a4 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 03:23:56 +0530 Subject: [PATCH 38/73] Lighter separators --- gtk-3.0/scss/_functions.scss | 4 ++-- gtk-3.0/scss/apps/_gnome-applications.scss | 6 +++--- gtk-3.0/scss/widgets/_button.scss | 4 ++-- gtk-3.0/scss/widgets/_choosers.scss | 2 +- gtk-3.0/scss/widgets/_menu.scss | 2 +- gtk-3.0/scss/widgets/_osd.scss | 2 +- gtk-3.0/scss/widgets/_toolbar.scss | 2 +- gtk-3.0/scss/widgets/_view.scss | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index 1986d84..9ea3a1b 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -35,11 +35,11 @@ $modules: () !default; } @function border_active($color) { - @return shade($color, ($contrast - .10)); + @return shade($color, ($contrast - .1)); } @function border_insensitive($color) { - @return shade($color, ($contrast + .10)); + @return shade($color, ($contrast + .1)); } @mixin linear-gradient($color, $direction: to bottom) { diff --git a/gtk-3.0/scss/apps/_gnome-applications.scss b/gtk-3.0/scss/apps/_gnome-applications.scss index 91c4f34..f2679f6 100644 --- a/gtk-3.0/scss/apps/_gnome-applications.scss +++ b/gtk-3.0/scss/apps/_gnome-applications.scss @@ -106,7 +106,7 @@ border-style: solid; &, &:hover { - border-color: shade($bg_color, ($contrast + .10)); + border-color: shade($bg_color, ($contrast + .1)); background-color: $bg_color; } } @@ -165,7 +165,7 @@ border-style: solid; &, &:hover { - border-color: shade($bg_color, ($contrast + .10)); + border-color: shade($bg_color, ($contrast + .1)); background-color: $bg_color; } } @@ -211,7 +211,7 @@ .gedit-document-panel-group-row { &, &:hover { - border-top: 1px solid shade($bg_color, ($contrast + .10)); + border-top: 1px solid shade($bg_color, ($contrast + .1)); background-color: $bg_color; } } diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index 5ddeb6c..1b353b4 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -150,7 +150,7 @@ &.separator, .separator { border: 1px solid currentColor; - color: shade($bg, ($contrast + .05)); + color: shade($bg, ($contrast + .1)); &:insensitive { color: shade($bg, .85); } } @@ -222,7 +222,7 @@ &:hover { border-color: shade($bg_color, 0.7); - background-color: shade($bg_color, 1.10); + background-color: shade($bg_color, 1.1); background-image: none; } diff --git a/gtk-3.0/scss/widgets/_choosers.scss b/gtk-3.0/scss/widgets/_choosers.scss index 82c1283..6b00d52 100644 --- a/gtk-3.0/scss/widgets/_choosers.scss +++ b/gtk-3.0/scss/widgets/_choosers.scss @@ -111,7 +111,7 @@ border-style: solid; border-color: currentColor; background-color: $bg_color; - color: border_normal($bg_color); + color: shade($bg_color, ($contrast + .1)); } } diff --git a/gtk-3.0/scss/widgets/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss index e5f6cfb..8d0bdf7 100755 --- a/gtk-3.0/scss/widgets/_menu.scss +++ b/gtk-3.0/scss/widgets/_menu.scss @@ -109,7 +109,7 @@ -GtkWidget-separator-height: 1; border-style: none; - color: shade($menu_bg_color, .9); + color: shade($menu_bg_color, ($contrast + .1)); } &.button { diff --git a/gtk-3.0/scss/widgets/_osd.scss b/gtk-3.0/scss/widgets/_osd.scss index c1cc404..178283d 100644 --- a/gtk-3.0/scss/widgets/_osd.scss +++ b/gtk-3.0/scss/widgets/_osd.scss @@ -33,7 +33,7 @@ GtkOverlay.osd { background-image: none; color: $osd_fg; - .separator { color: shade($osd_bg, 0.9); } + .separator { color: shade($osd_bg, ($contrast + .1)); } } /* used by gnome-settings-daemon's media-keys OSD */ diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss index 057f817..c9d37c2 100755 --- a/gtk-3.0/scss/widgets/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -41,7 +41,7 @@ } GtkSeparatorToolItem, .separator, .separator:insensitive { - color: border_normal($bg); + color: shade($bg, ($contrast + .1)); border-color: currentColor; -GtkWidget-window-dragging: true; diff --git a/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss index 6a96596..2febe0a 100644 --- a/gtk-3.0/scss/widgets/_view.scss +++ b/gtk-3.0/scss/widgets/_view.scss @@ -134,7 +134,7 @@ @include exports("separator") { .view.separator, .separator { - color: shade($bg_color, ($contrast + .10)); + color: shade($bg_color, ($contrast + .1)); border: 1px solid currentColor; } } From 249f86d8643314b5873018e7446d9a302a1c3845 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 16:11:38 +0530 Subject: [PATCH 39/73] Split gnome-applications to different files --- gtk-3.0/scss/apps/_gedit.scss | 132 ++++++++ gtk-3.0/scss/apps/_gnome-applications.scss | 341 --------------------- gtk-3.0/scss/apps/_nautilus.scss | 77 +++++ gtk-3.0/scss/apps/_panel.scss | 76 +++++ gtk-3.0/scss/gtk.scss | 4 +- gtk-3.0/scss/widgets/_misc.scss | 51 +++ 6 files changed, 339 insertions(+), 342 deletions(-) create mode 100644 gtk-3.0/scss/apps/_gedit.scss delete mode 100644 gtk-3.0/scss/apps/_gnome-applications.scss create mode 100644 gtk-3.0/scss/apps/_nautilus.scss create mode 100644 gtk-3.0/scss/apps/_panel.scss diff --git a/gtk-3.0/scss/apps/_gedit.scss b/gtk-3.0/scss/apps/_gedit.scss new file mode 100644 index 0000000..86ec7a5 --- /dev/null +++ b/gtk-3.0/scss/apps/_gedit.scss @@ -0,0 +1,132 @@ +/********* + ! Gedit * +**********/ + +@include exports("gedit") { + GeditWindow .pane-separator { + border-width: 0 1px 0 0; + border-style: solid; + + &, &:hover { + border-color: shade($bg_color, ($contrast + .1)); + background-color: $bg_color; + } + } + + .gedit-document-panel { + background-color: $bg_color; + color: mix($fg_color, $bg_color, 0.1); + + .list-row { + padding: $spacing; + + .button { + padding: 1px; + border-radius: $roundness; + border-style: solid; + border-color: transparent; + border-width: 1px; + background-color: transparent; + background-image: none; + color: transparent; + icon-shadow: none; + } + } + + .prelight-row .button { + border-color: alpha(black, 0.1); + color: alpha(white, 0.8); + + &:active { + border-color: alpha(black, 0.2); + background-color: alpha(black, 0.08); + color: white; + } + } + + list-row, .prelight-row { + .button:hover { + border-color: alpha(black, 0.1); + color: white; + } + } + } + + .gedit-document-panel-group-row { + &, &:hover { + border-top: 1px solid shade($bg_color, ($contrast + .1)); + background-color: $bg_color; + } + } + + .gedit-document-panel-document-row { + &:hover { background-color: shade($bg_color, 1.05); } + + &:selected { + &, &:hover { @extend %selected; } + } + } + + .gedit-document-panel-dragged-row { + border: 1px solid alpha(black, 0.1); + background-color: alpha(black, 0.5); + color: white; + } + + .gedit-document-panel-placeholder-row { + border: none; + background-color: alpha(black, 0.08); + transition: all 200ms ease-in; + } + + GeditStatusbar { border-top: 1px solid border_normal($bg_color); } + + GeditStatusbar GeditSmallButton, GeditStatusMenuButton { + text-shadow: none; + + .button { + border-style: solid; + border-width: 0 1px; + border-color: transparent; + border-radius: 0; + padding: 1px 6px 2px 4px; + + &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); } + + &:active { + background-color: shade($bg_color, 0.95); + color: $fg_color; + } + } + } + + GeditViewFrame .gedit-search-slider { + padding: $spacing; + border-radius: 0 0 $roundness $roundness; + border-width: 0 1px 1px 1px; + border-style: solid; + border-color: border_normal($base_color); + background-color: $base_color; + + .not-found { + background-color: $error_bg_color; + background-image: none; + color: $error_fg_color; + + &:selected { @extend %selected; } + } + } + + GeditFileBrowserWidget .toolbar { + padding: $spacing / 2; + border-top: none; + background-color: $bg_color; + background-image: none; + } + + .gedit-search-entry-occurrences-tag { + margin: $spacing / 2; + padding: $spacing / 2; + color: mix($text_color, $base_color, 0.5); + } +} diff --git a/gtk-3.0/scss/apps/_gnome-applications.scss b/gtk-3.0/scss/apps/_gnome-applications.scss deleted file mode 100644 index f2679f6..0000000 --- a/gtk-3.0/scss/apps/_gnome-applications.scss +++ /dev/null @@ -1,341 +0,0 @@ -/*********************** - ! Fallback mode panel * -************************/ - -@include exports("panel") { - %panel { - @include linear-gradient($panel_bg_color); - - color: $panel_fg_color; - } - - PanelWidget, PanelApplet, PanelToplevel { - @extend %panel; - - padding: 0; - } - - PanelApplet { - border: none; - - .button { - -GtkButton-inner-border: 2; - - border-width: 0 1px; - border-radius: 0; - border-color: transparent; - background-color: transparent; - background-image: none; - color: $panel_fg_color; - - &:hover, &:prelight { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11)); - - border-color: mix($panel_bg_color, $panel_fg_color, 0.11); - color: shade($panel_fg_color, 1.08); - } - - &:active, &:checked { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, 0.21); - color: shade($panel_fg_color, 1.08); - - &:prelight { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, 0.31); - } - } - } - } - - PanelSeparator { - @extend %panel; - - border: none; - } - - PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar { - &.menuitem { - @extend %panel; - - border: none; - - -PanelMenuBar-icon-visible: true; - } - } - - PanelAppletFrame { - @extend %panel; - - border: none; - } - - WnckPager, WnckTasklist { @extend %panel; } -} - - -/************ - ! Nautilus * -*************/ - -@include exports("nautilus") { - .nautilus-desktop.nautilus-canvas-item { - color: white; - text-shadow: 1px 1px black; - - &:active { color: $fg_color; } - - &:selected { color: $selected_fg_color; } - - &:active, &:prelight, &:selected { text-shadow: none; } - } - - NautilusWindow { - .toolbar { - border-width: 0 0 1px; - border-style: solid; - border-color: border_normal($toolbar_bg_color); - } - - .sidebar .frame { border: none; } - - > GtkGrid > .pane-separator { - border-width: 0 1px 0 0; - border-style: solid; - - &, &:hover { - border-color: shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - } - - NautilusNotebook { - &.notebook { - border-right-width: 0; - border-left-width: 0; - border-bottom-width: 0; - } - - .frame { border: none; } - } - - NautilusQueryEditor { - .search-bar.toolbar { - border-top-width: 0; - border-bottom-width: 0; - } - - .toolbar { - padding-top: $spacing - 1px; - padding-bottom: $spacing - 2px; - border-width: 1px 0 0 0; - border-style: solid; - border-color: $toolbar_bg_color; - background-color: shade($toolbar_bg_color, 0.9); - - &:nth-child(2) { border-color: border_normal($toolbar_bg_color); } - - &.search-bar { - border-top-width: 0; - border-bottom-width: 0; - } - - &, &.search-bar { - &:only-child { - border-bottom-width: 1px; - border-bottom-color: border_normal($toolbar_bg_color); - } - } - - } - } -} - - -/********* - ! Gedit * -**********/ - -@include exports("gedit") { - GeditWindow .pane-separator { - border-width: 0 1px 0 0; - border-style: solid; - - &, &:hover { - border-color: shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - - .gedit-document-panel { - background-color: $bg_color; - color: mix($fg_color, $bg_color, 0.1); - - .list-row { - padding: $spacing; - - .button { - padding: 1px; - border-radius: $roundness; - border-style: solid; - border-color: transparent; - border-width: 1px; - background-color: transparent; - background-image: none; - color: transparent; - icon-shadow: none; - } - } - - .prelight-row .button { - border-color: alpha(black, 0.1); - color: alpha(white, 0.8); - - &:active { - border-color: alpha(black, 0.2); - background-color: alpha(black, 0.08); - color: white; - } - } - - list-row, .prelight-row { - .button:hover { - border-color: alpha(black, 0.1); - color: white; - } - } - } - - .gedit-document-panel-group-row { - &, &:hover { - border-top: 1px solid shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - - .gedit-document-panel-document-row { - &:hover { background-color: shade($bg_color, 1.05); } - - &:selected { - &, &:hover { @extend %selected; } - } - } - - .gedit-document-panel-dragged-row { - border: 1px solid alpha(black, 0.1); - background-color: alpha(black, 0.5); - color: white; - } - - .gedit-document-panel-placeholder-row { - border: none; - background-color: alpha(black, 0.08); - transition: all 200ms ease-in; - } - - GeditStatusbar { border-top: 1px solid border_normal($bg_color); } - - GeditStatusbar GeditSmallButton, GeditStatusMenuButton { - text-shadow: none; - - .button { - border-style: solid; - border-width: 0 1px; - border-color: transparent; - border-radius: 0; - padding: 1px 6px 2px 4px; - - &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); } - - &:active { - background-color: shade($bg_color, 0.95); - color: $fg_color; - } - } - } - - GeditViewFrame .gedit-search-slider { - padding: $spacing; - border-radius: 0 0 $roundness $roundness; - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: border_normal($base_color); - background-color: $base_color; - - .not-found { - background-color: $error_bg_color; - background-image: none; - color: $error_fg_color; - - &:selected { @extend %selected; } - } - } - - GeditFileBrowserWidget .toolbar { - padding: $spacing / 2; - border-top: none; - background-color: $bg_color; - background-image: none; - } - - .gedit-search-entry-occurrences-tag { - margin: $spacing / 2; - padding: $spacing / 2; - color: mix($text_color, $base_color, 0.5); - } -} - - -/*************** - ! Font-viewer * -****************/ - -@include exports("fontviewer") { - SushiFontWidget { - padding: $spacing ($spacing * 2); - } -} - - -/************* - ! Gucharmap * -**************/ - -@include exports("charmap") { - GucharmapChartable { - background-color: $base_color; - color: $text_color; - - &:focus, &:hover, &:active, &:selected { @extend %selected; } - } -} - - -/************* - ! Evolution * -**************/ - -@include exports("evolution") { - EPreviewPane .entry { - background-color: $base_color; - color: $text_color; - } -} - - -/******************* - * Gnome Bluetooth * -********************/ - -@include exports("gnome-bluetooth") { - GtkEntry.entry.pin-entry { - font: regular 50; - padding-left: 25px; - padding-right: 25px; - } - - GtkLabel.pin-label { font: regular 50; } -} diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss new file mode 100644 index 0000000..d31a25e --- /dev/null +++ b/gtk-3.0/scss/apps/_nautilus.scss @@ -0,0 +1,77 @@ +/************ + ! Nautilus * +*************/ + +@include exports("nautilus") { + .nautilus-desktop.nautilus-canvas-item { + color: white; + text-shadow: 1px 1px black; + + &:active { color: $fg_color; } + + &:selected { color: $selected_fg_color; } + + &:active, &:prelight, &:selected { text-shadow: none; } + } + + NautilusWindow { + .toolbar { + border-width: 0 0 1px; + border-style: solid; + border-color: border_normal($toolbar_bg_color); + } + + .sidebar .frame { border: none; } + + > GtkGrid > .pane-separator { + border-width: 0 1px 0 0; + border-style: solid; + + &, &:hover { + border-color: shade($bg_color, ($contrast + .1)); + background-color: $bg_color; + } + } + } + + NautilusNotebook { + &.notebook { + border-right-width: 0; + border-left-width: 0; + border-bottom-width: 0; + } + + .frame { border: none; } + } + + NautilusQueryEditor { + .search-bar.toolbar { + border-top-width: 0; + border-bottom-width: 0; + } + + .toolbar { + padding-top: $spacing - 1px; + padding-bottom: $spacing - 2px; + border-width: 1px 0 0 0; + border-style: solid; + border-color: $toolbar_bg_color; + background-color: shade($toolbar_bg_color, 0.9); + + &:nth-child(2) { border-color: border_normal($toolbar_bg_color); } + + &.search-bar { + border-top-width: 0; + border-bottom-width: 0; + } + + &, &.search-bar { + &:only-child { + border-bottom-width: 1px; + border-bottom-color: border_normal($toolbar_bg_color); + } + } + + } + } +} diff --git a/gtk-3.0/scss/apps/_panel.scss b/gtk-3.0/scss/apps/_panel.scss new file mode 100644 index 0000000..adc096e --- /dev/null +++ b/gtk-3.0/scss/apps/_panel.scss @@ -0,0 +1,76 @@ +/*********************** + ! Fallback mode panel * +************************/ + +@include exports("panel") { + %panel { + @include linear-gradient($panel_bg_color); + + color: $panel_fg_color; + } + + PanelWidget, PanelApplet, PanelToplevel { + @extend %panel; + + padding: 0; + } + + PanelApplet { + border: none; + + .button { + -GtkButton-inner-border: 2; + + border-width: 0 1px; + border-radius: 0; + border-color: transparent; + background-color: transparent; + background-image: none; + color: $panel_fg_color; + + &:hover, &:prelight { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11)); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.11); + color: shade($panel_fg_color, 1.08); + } + + &:active, &:checked { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.21); + color: shade($panel_fg_color, 1.08); + + &:prelight { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.31); + } + } + } + } + + PanelSeparator { + @extend %panel; + + border: none; + } + + PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar { + &.menuitem { + @extend %panel; + + border: none; + + -PanelMenuBar-icon-visible: true; + } + } + + PanelAppletFrame { + @extend %panel; + + border: none; + } + + WnckPager, WnckTasklist { @extend %panel; } +} diff --git a/gtk-3.0/scss/gtk.scss b/gtk-3.0/scss/gtk.scss index e191304..4b0d533 100755 --- a/gtk-3.0/scss/gtk.scss +++ b/gtk-3.0/scss/gtk.scss @@ -24,8 +24,10 @@ @import "widgets/window"; -@import "apps/gnome-applications"; +@import "apps/gedit"; +@import "apps/nautilus"; @import "apps/nemo"; +@import "apps/panel"; @import "apps/synaptic"; diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index 73e64b5..1d5a510 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -163,3 +163,54 @@ .toolbar { background-color: transparent; } } } + +/*************** + ! Font-viewer * +****************/ + +@include exports("fontviewer") { + SushiFontWidget { + padding: $spacing ($spacing * 2); + } +} + + +/************* + ! Gucharmap * +**************/ + +@include exports("charmap") { + GucharmapChartable { + background-color: $base_color; + color: $text_color; + + &:focus, &:hover, &:active, &:selected { @extend %selected; } + } +} + + +/************* + ! Evolution * +**************/ + +@include exports("evolution") { + EPreviewPane .entry { + background-color: $base_color; + color: $text_color; + } +} + + +/******************* + ! Gnome Bluetooth * +********************/ + +@include exports("gnome-bluetooth") { + GtkEntry.entry.pin-entry { + font: regular 50; + padding-left: 25px; + padding-right: 25px; + } + + GtkLabel.pin-label { font: regular 50; } +} From 7dccf6b479382b132ecb66052fd5ccc23e8b4c1d Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 16:42:58 +0530 Subject: [PATCH 40/73] Added actionbar styles --- gtk-3.0/scss/gtk.scss | 225 +-------------------------- gtk-3.0/scss/widgets/_actionbar.scss | 106 +++++++++++++ gtk-3.0/scss/widgets/_entry.scss | 14 +- 3 files changed, 116 insertions(+), 229 deletions(-) create mode 100644 gtk-3.0/scss/widgets/_actionbar.scss diff --git a/gtk-3.0/scss/gtk.scss b/gtk-3.0/scss/gtk.scss index 4b0d533..26eeaa5 100755 --- a/gtk-3.0/scss/gtk.scss +++ b/gtk-3.0/scss/gtk.scss @@ -6,6 +6,7 @@ @import "widgets/base"; @import "widgets/button"; @import "widgets/entry"; +@import "widgets/actionbar"; @import "widgets/calendar"; @import "widgets/choosers"; @import "widgets/grid"; @@ -29,227 +30,3 @@ @import "apps/nemo"; @import "apps/panel"; @import "apps/synaptic"; - - -/************** -* action-bar * -**************/ -.action-bar { - padding: 4px; - border-width: 1px 0 0 0; - border-style: solid; - border-color: shade($bg_color, 0.8); - background-color: $bg_color; - background-image: none; - color: $fg_color; -} - -.action-bar .button.text-button { - padding: 4px; -} - -.action-bar .button.image-button { - padding: 6px; -} - -.action-bar .title { - font: bold; - padding: 0 12px; -} - -.action-bar .subtitle { - font: smaller; - padding: 0 12px; -} - -/*************** -* search bars * -***************/ -.search-bar { - border-width: 0 0 1px 0; - border-style: solid; - border-color: shade($bg_color, 0.8); - background-color: shade($bg_color, 0.98); -} - -.search-bar .button.close-button { - padding: 4px; -} - - - -/****************************** -* destructive action buttons * -******************************/ -.destructive-action.button { - border-width: 1px; - border-style: solid; - border-color: shade($error_color, 0.8); - border-radius: 2px; - background-color: $error_color; - background-image: none; - color: mix($selected_fg_color, $error_color, 0.1); -} - -.destructive-action.button:hover { - border-color: shade($error_color, 0.7); - background-color: shade($error_color, 1.12); - background-image: none; -} - -.destructive-action.button:active { - border-color: shade($error_color, 0.8); - background-color: shade($error_color, 0.87); - background-image: none; -} - -.destructive-action.button:hover:active { - border-color: shade($error_color, 0.7); -} - -/****************************** -* suggested action buttons * -******************************/ -.suggested-action.button { - border-width: 1px; - border-style: solid; - border-color: shade($selected_bg_color, 0.9); - border-radius: 2px; - background-color: shade($selected_bg_color, 1.18); - background-image: none; - color: mix($selected_fg_color, $selected_bg_color, 0.1); -} - -.suggested-action.button:hover { - border-color: shade($selected_bg_color, 0.8); - background-color: shade($selected_bg_color, 1.20); - background-image: none; -} - -.suggested-action.button:active { - border-color: shade($selected_bg_color, 0.9); - background-color: shade($selected_bg_color, 1.05); - background-image: none; -} - -.suggested-action.button:hover:active { - border-color: shade($selected_bg_color, 0.8); -} - -/****************** -* selection mode * -******************/ -.selection-mode.header-bar, -.selection-mode.toolbar { - border-style: solid; - border-color: $selected_bg_color; - background-color: shade($selected_bg_color, 1.6); - background-image: none; - color: $selected_bg_color; -} - -.selection-mode.header-bar { - border-top-color: shade($selected_bg_color, 1.6); - border-bottom-color: $selected_bg_color; -} - -.selection-mode.toolbar { - padding: 4px; -} - -/* regular button */ -.selection-mode.header-bar .button, -.selection-mode.toolbar .button, -.selection-mode.toolbar GtkToolButton .button { - border-width: 1px; - border-style: solid; - border-color: $selected_bg_color; - border-radius: 2px; - background-color: shade($selected_bg_color, 1.68); - background-image: none; - color: shade($selected_bg_color, 0.8); -} - -.selection-mode.header-bar .button:hover, -.selection-mode.toolbar .button:hover, -.selection-mode.toolbar GtkToolButton .button:hover { - border-color: shade($selected_bg_color, 0.9); - background-color: shade($selected_bg_color, 1.70); - background-image: none; -} - -.selection-mode.header-bar .button:active, -.selection-mode.toolbar .button:active, -.selection-mode.toolbar GtkToolButton .button:active { - border-color: shade($selected_bg_color, 0.9); - background-color: shade($selected_bg_color, 1.55); - background-image: none; -} - -.selection-mode.header-bar .button:hover:active, -.selection-mode.toolbar .button:hover:active, -.selection-mode.toolbar GtkToolButton .button:hover:active { - border-color: shade($selected_bg_color, 0.8); -} - -/* suggested button */ -.selection-mode.header-bar .suggested-action.button, -.selection-mode.toolbar .suggested-action.button, -.selection-mode.toolbar GtkToolButton.suggested-action .button { - border-width: 1px; - border-style: solid; - border-color: shade($selected_bg_color, 0.9); - border-radius: 2px; - background-color: shade($selected_bg_color, 1.18); - background-image: none; - color: mix($selected_fg_color, $selected_bg_color, 0.1); -} - -.selection-mode.header-bar .suggested-action.button:hover, -.selection-mode.toolbar .suggested-action.button:hover, -.selection-mode.toolbar GtkToolButton.suggested-action .button:hover { - border-color: shade($selected_bg_color, 0.8); - background-color: shade($selected_bg_color, 1.20); - background-image: none; -} - -.selection-mode.header-bar .suggested-action.button:active, -.selection-mode.toolbar .suggested-action.button:active, -.selection-mode.toolbar GtkToolButton.suggested-action:active { - border-color: shade($selected_bg_color, 0.9); - background-color: shade($selected_bg_color, 1.05); - background-image: none; -} - -.selection-mode.header-bar .suggested-action.button:hover:active, -.selection-mode.toolbar .suggested-action.button:hover:active, -.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active { - border-color: shade($selected_bg_color, 0.8); -} - -/* menu button */ -.selection-mode.header-bar .selection-menu.button, -.selection-mode.toolbar .selection-menu.button { - border-style: none; - background-color: transparent; - background-image: none; - color: shade($selected_bg_color, 0.8); -} - -.selection-mode.toolbar .dim-label, -.selection-mode.toolbar .selection-menu.button .dim-label { - color: shade($selected_bg_color, 0.7); -} - -.selection-mode.header-bar .selection-menu.button:hover, -.selection-mode.toolbar .dim-label:hover, -.selection-mode.toolbar .selection-menu.button:hover, -.selection-mode.toolbar .selection-menu.button .dim-label:hover { - color: shade($selected_bg_color, 0.7); -} - -.selection-mode.header-bar .selection-menu.button:active, -.selection-mode.toolbar .selection-menu.button:active { - color: shade($selected_bg_color, 0.8); - box-shadow: none; -} diff --git a/gtk-3.0/scss/widgets/_actionbar.scss b/gtk-3.0/scss/widgets/_actionbar.scss new file mode 100644 index 0000000..4f1280a --- /dev/null +++ b/gtk-3.0/scss/widgets/_actionbar.scss @@ -0,0 +1,106 @@ +@import "button"; +@import "toolbar"; + +/************** + ! Action-bar * +***************/ + +@include exports("actionbar") { + .action-bar { + @include linear-gradient($bg_color); + + padding: $spacing; + border-width: 1px 0 0 0; + border-style: solid; + border-color: border_normal($bg_color); + color: $fg_color; + + .button { + &.text-button { padding: $spacing - 1px; } + + &.image-button { padding: $spacing + 1px; } + } + + .title { + font: bold; + padding: 0 ($spacing * 2); + } + + .subtitle { + font: smaller; + padding: 0 ($spacing * 2); + } + } +} + + +/*************** + ! Search bars * +****************/ + +@include exports("searchbar") { + .search-bar { + @include linear-gradient(shade($bg_color, 0.98)); + + border-width: 0 0 1px 0; + border-style: solid; + border-color: border_normal($bg_color); + color: $fg_color; + + .button.close-button { padding: $spacing; } + } +} + + +/****************** + ! Action buttons * +*******************/ + +@include exports("actionbuttons") { + $types: ( + suggested: $selected_bg_color, + destructive: $error-color + ); + + @each $type, $color in $types { + .#{$type}-action.button { + @include button($color, $selected_fg_color); + } + } +} + + +/****************** +* selection mode * +******************/ + +@include exports("selectionmode") { + .selection-mode { + &.header-bar, &.toolbar { + @include toolbar($selected_bg_color, $selected_fg_color); + + .button { + @include button(shade($selected_bg_color, 1.68), shade($selected_bg_color, 0.8)); + + &.suggested-action { @extend .suggested-action.button; } + } + + .selection-menu.button { + border: none; + background-color: transparent; + background-image: none; + color: shade($selected_bg_color, $contrast); + + &:hover { color: shade($selected_bg_color, ($contrast - .1)); } + + &:active { color: shade($selected_bg_color, ($contrast - .05)); } + } + + .dim-label, { + &, .selection-menu.button & { color: shade($selected_bg_color, ($contrast - .1)); } + } + } + + &.toolbar { padding: $spacing; } + } +} diff --git a/gtk-3.0/scss/widgets/_entry.scss b/gtk-3.0/scss/widgets/_entry.scss index 184dac5..b3c4264 100755 --- a/gtk-3.0/scss/widgets/_entry.scss +++ b/gtk-3.0/scss/widgets/_entry.scss @@ -1,8 +1,8 @@ -/******* - ! Entry -********/ +/********* + ! Entry * +**********/ -@mixin linked_entry($bg) { +%linked_entry { border-width: 1px; border-radius: 0; border-right-width: 0; @@ -70,7 +70,11 @@ } @include exports("entry") { - .entry { @include entry($base_color, $text_color); } + .entry { + @include entry($base_color, $text_color); + + &.linked, .linked & { @extend %linked_entry; } + } } From 1b99e55e916e98c5703117f744ed215eb1aa7ce7 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 20 Dec 2014 17:08:26 +0530 Subject: [PATCH 41/73] Improve combobox styling --- gtk-3.0/scss/widgets/_button.scss | 57 +++++++++++++++++++++++++++++++ gtk-3.0/scss/widgets/_entry.scss | 37 -------------------- 2 files changed, 57 insertions(+), 37 deletions(-) diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index 1b353b4..9310af9 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -15,6 +15,18 @@ -GtkWidget-focus-line-width: 0; } + %linked_middle { + border-radius: 0; + border-left-style: none; + border-right-style: solid; + + &:dir(rtl) { + border-radius: 0; // needed when including %linked_middle:dir(rtl) + border-right-style: none; + border-left-style: solid + } + } + %linked_button { border-width: 1px; border-style: solid; @@ -266,3 +278,48 @@ } } } + + +/****************** +! ComboBoxes * +*******************/ + +@include exports("combobox") { + GtkComboBox { + > .button { + padding: ($spacing - 2px) ($spacing + 1px); + + -GtkComboBox-arrow-scaling: 0.5; + -GtkComboBox-shadow-type: none; + } + + &.combobox-entry { + .entry, .button { @extend %linked_button; } + } + + .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; + + border-style: none; + } + } + + .linked > GtkComboBox { + > .button { + // the combo is a composite widget so the way we do button linked doesn't + // work, special case needed. See + // https://bugzilla.gnome.org/show_bug.cgi?id=733979 + &:dir(ltr) { @extend %linked_middle; } // specificity bump + &:dir(rtl) { @extend %linked_middle:dir(rtl); } + } + + &:first-child > .button { @extend %linked_button:first-child; } + + &:last-child > .button { @extend %linked_button:last-child; } + + &:only-child > .button { @extend %linked_button:only-child; } + } +} diff --git a/gtk-3.0/scss/widgets/_entry.scss b/gtk-3.0/scss/widgets/_entry.scss index b3c4264..0015dee 100755 --- a/gtk-3.0/scss/widgets/_entry.scss +++ b/gtk-3.0/scss/widgets/_entry.scss @@ -76,40 +76,3 @@ &.linked, .linked & { @extend %linked_entry; } } } - - -/****************** - ! Combobox entry * -*******************/ - -@include exports("combobox") { - GtkComboBox { - &.combobox-entry { - .entry { - &, &:hover, &:focus, &:active, &:insensitive { - border-width: 1px 0 1px 1px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - } - - .button { - &, &:hover, &:focus, &:active, &:insensitive { - border-width: 1px 1px 1px 1px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } - } - } - - .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; - - border-style: none; - } - } -} - From 7a4b108791854634204d61bc5aed74fd23769fc0 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 28 Dec 2014 20:24:48 +0530 Subject: [PATCH 42/73] Wrap code in exports mixin --- gtk-3.0/scss/widgets/_grid.scss | 57 +++---- gtk-3.0/scss/widgets/_misc.scss | 8 +- gtk-3.0/scss/widgets/_osd.scss | 227 +++++++++++++--------------- gtk-3.0/scss/widgets/_progress.scss | 33 +--- gtk-3.0/scss/widgets/_sidebar.scss | 30 ++-- 5 files changed, 159 insertions(+), 196 deletions(-) diff --git a/gtk-3.0/scss/widgets/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss index 877707c..573e5c2 100644 --- a/gtk-3.0/scss/widgets/_grid.scss +++ b/gtk-3.0/scss/widgets/_grid.scss @@ -2,44 +2,47 @@ ! Grid and flowbox *******************/ -.list { - background-color: shade($bg_color, 0.97); - color: $fg_color; +@include exports("grid") { + .list { + background-color: shade($bg_color, 0.97); + color: $fg_color; - &-row { - &, &.button { - border: none; - border-radius: 0; - padding: $spacing; - background-image: none; - background-color: transparent; - box-shadow: none; - - &:hover { + &-row { + &, &.button { + border: none; + border-radius: 0; + padding: $spacing; background-image: none; - background-color: shade($bg_color, 1.02); - } + background-color: transparent; + box-shadow: none; - &:selected { - &, &:hover, &:focus { + &:hover { background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; + background-color: shade($bg_color, 1.02); + } + + &:selected { + &, &:hover, &:focus { + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } } } } } -} -.grid-child { - &, GtkFlowBox & { - padding: $spacing; - border-radius: $roundness; + .grid-child { + &, GtkFlowBox & { + padding: $spacing; + border-radius: $roundness; - &:selected { - @extend %selected; + &:selected { + @extend %selected; - outline-offset: -2px; + outline-offset: -2px; + } } } } + diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index 1d5a510..f7a5c94 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -2,9 +2,11 @@ ! Dimmed label * ****************/ -.dim-label { - opacity: 0.5; - text-shadow: none; +@include exports("dimlabel") { + .dim-label { + opacity: 0.5; + text-shadow: none; + } } diff --git a/gtk-3.0/scss/widgets/_osd.scss b/gtk-3.0/scss/widgets/_osd.scss index 178283d..87be1e5 100644 --- a/gtk-3.0/scss/widgets/_osd.scss +++ b/gtk-3.0/scss/widgets/_osd.scss @@ -5,146 +5,127 @@ ! OSD * ********/ -GtkOverlay.osd { - background-color: transparent; -} +@include exports("osd") { + GtkOverlay.osd { background-color: transparent; } -.osd { - &.background { - background-color: alpha($osd_bg, 0.8); - color: $osd_fg; - } + .osd { + &.background { + background-color: alpha($osd_bg, 0.8); + color: $osd_fg; + } - &.frame { - background-clip: border-box; - background-origin: border-box; - } + &.frame { + background-clip: border-box; + background-origin: border-box; + } - &.button, .button { @include button($osd_bg, $osd_fg); } + &.button, .button { @include button($osd_bg, $osd_fg); } - &.toolbar { - -GtkToolbar-button-relief: normal; + &.toolbar { + -GtkToolbar-button-relief: normal; - padding: $spacing; - border: 1px solid border_normal($osd_bg); - border-radius: $roundness; - background-color: $osd_bg; - background-image: none; - color: $osd_fg; - - .separator { color: shade($osd_bg, ($contrast + .1)); } - } - - /* used by gnome-settings-daemon's media-keys OSD */ - &.trough { background-color: shade($osd_bg, 0.8); } - - &.progressbar { background-color: $osd_fg; } - - .scale { - &.slider { - background-color: shade($osd_bg, 1.08); + padding: $spacing; + border: 1px solid border_normal($osd_bg); + border-radius: $roundness; + background-color: $osd_bg; background-image: none; - /* we will draw the border using box shadow for now */ - box-shadow: inset 1px 0 shade($osd_bg, 0.8), - inset 0 1px shade($osd_bg, 0.8), - inset -1px 0 shade($osd_bg, 0.8), - inset 0 -1px shade($osd_bg, 0.8); + color: $osd_fg; - &:hover { - box-shadow: inset 1px 0 shade($osd_bg, 0.7), - inset 0 1px shade($osd_bg, 0.7), - inset -1px 0 shade($osd_bg, 0.7), - inset 0 -1px shade($osd_bg, 0.7); + .separator { color: shade($osd_bg, ($contrast + .1)); } + } + + /* used by gnome-settings-daemon's media-keys OSD */ + &.trough { background-color: shade($osd_bg, 0.8); } + + &.progressbar { background-color: $osd_fg; } + + .scale { + &.slider { + @include linear-gradient(shade($osd_bg, 1.08)); + @include border($osd_bg); + + &:insensitive { @include linear-gradient(shade($osd_bg, 0.9)); } } - &:insensitive { - background-color: shade($osd_bg, 0.9); + &.trough { + border-color: shade($osd_bg, 0.8); + background-color: shade($osd_bg, 1.08); background-image: none; - box-shadow: inset 1px 0 shade($osd_bg, 0.85), - inset 0 1px shade($osd_bg, 0.85), - inset -1px 0 shade($osd_bg, 0.85), - inset 0 -1px shade($osd_bg, 0.85); + + &.highlight { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + background-image: none; + } + + &:insensitive, &.highlight:insensitive { + border-color: shade($osd_bg, 0.85); + background-color: shade($osd_bg, 0.9); + background-image: none; + } } } + &.view, .view { background-color: $osd_bg; } + + .scrollbar { + .trough { background-color: $osd_bg; } + + .slider { + border: 1px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + border-radius: 0; + background-color: mix($osd_bg, $osd_fg, 0.21); + + &:hover { + border-color: mix(shade($osd_bg, 0.87), $osd_fg, 0.31); + background-color: mix($osd_bg, $osd_fg, 0.31); + } + + &:active { + border-color: shade($selected_bg_color, 0.9); + background-color: $selected_bg_color; + } + } + } + + GtkIconView.cell { + &:selected, &:selected:focus { + background-color: transparent; + border: 3px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + border-radius: $roundness; + outline-color: transparent; + } + } + + /* used by Documents */ + .page-thumbnail { + border: 1px solid shade($osd_bg, 0.9); + /* when there's no pixbuf yet */ + background-color: $osd_bg; + } + } + + .osd GtkProgressBar, GtkProgressBar.osd { + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 2px; + -GtkProgressBar-min-horizontal-bar-height: 2px; + + padding: 0; + &.trough { - border-color: shade($osd_bg, 0.8); - background-color: shade($osd_bg, 1.08); - background-image: none; - - &.highlight { - border-color: $selected_bg_color; - background-color: $selected_bg_color; - background-image: none; - } - - &:insensitive, &.highlight:insensitive { - border-color: shade($osd_bg, 0.85); - background-color: shade($osd_bg, 0.9); - background-image: none; - } - } - } - - &.view, .view { background-color: $osd_bg; } - - .scrollbar { - .trough { background-color: $osd_bg; } - - .slider { - border: 1px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + padding: 0; + border-style: none; border-radius: 0; - background-color: mix($osd_bg, $osd_fg, 0.21); - - &:hover { - border-color: mix(shade($osd_bg, 0.87), $osd_fg, 0.31); - background-color: mix($osd_bg, $osd_fg, 0.31); - } - - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - } - } - } - - GtkIconView.cell { - &:selected, &:selected:focus { + background-image: none; background-color: transparent; - border: 3px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); - border-radius: $roundness; - outline-color: transparent; + } + + &.progressbar { + border-style: none; + border-radius: 0; + background-color: $selected_bg_color; + background-image: none; } } - - /* used by Documents */ - .page-thumbnail { - border: 1px solid shade($osd_bg, 0.9); - /* when there's no pixbuf yet */ - background-color: $osd_bg; - } -} - -.osd GtkProgressBar, GtkProgressBar.osd { - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 2px; - -GtkProgressBar-min-horizontal-bar-height: 2px; - - padding: 0; - - &.trough { - padding: 0; - border-style: none; - border-radius: 0; - background-image: none; - background-color: transparent; - } - - &.progressbar { - border-style: none; - border-radius: 0; - background-color: $selected_bg_color; - background-image: none; - } } diff --git a/gtk-3.0/scss/widgets/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss index 94ec533..c09ff40 100644 --- a/gtk-3.0/scss/widgets/_progress.scss +++ b/gtk-3.0/scss/widgets/_progress.scss @@ -120,37 +120,14 @@ &.slider { @include linear-gradient(shade($bg_color, 1.08)); + @include border($bg_color); border-radius: 8px; + border-width: 1px; + border-style: solid; + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); - /* we will draw the border using box shadow for now */ - box-shadow: inset 1px 0 border_normal($bg_color), - inset 0 1px border_normal($bg_color), - inset -1px 0 border_normal($bg_color), - inset 0 -1px border_normal($bg_color); - - &:hover, &:focus { - box-shadow: inset 1px 0 border_focus($bg_color), - inset 0 1px border_focus($bg_color), - inset -1px 0 border_focus($bg_color), - inset 0 -1px border_focus($bg_color); - } - - &:active { - box-shadow: inset 1px 0 border_active($bg_color), - inset 0 1px border_active($bg_color), - inset -1px 0 border_active($bg_color), - inset 0 -1px border_active($bg_color); - } - - &:insensitive { - @include linear-gradient(shade($bg_color, 0.9)); - - box-shadow: inset 1px 0 border_insensitive($bg_color), - inset 0 1px border_insensitive($bg_color), - inset -1px 0 border_insensitive($bg_color), - inset 0 -1px border_insensitive($bg_color); - } + &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } } &.fine-tune { diff --git a/gtk-3.0/scss/widgets/_sidebar.scss b/gtk-3.0/scss/widgets/_sidebar.scss index af417ff..b3185d5 100755 --- a/gtk-3.0/scss/widgets/_sidebar.scss +++ b/gtk-3.0/scss/widgets/_sidebar.scss @@ -19,21 +19,21 @@ } row, .view row { - &:selected { - &, &:hover, &:focus { - border: none; - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } + &:selected { + &, &:hover, &:focus { + border: none; + background-image: none; + background-color: $selected_bg_color; + color: $selected_fg_color; + } - &:prelight { - border: none; - background-image: none; - background-color: shade($selected_bg_color, 1.05); - color: $selected_fg_color; - } - } + &:prelight { + border: none; + background-image: none; + background-color: shade($selected_bg_color, 1.05); + color: $selected_fg_color; + } + } &:prelight { border: none; @@ -46,7 +46,7 @@ .frame { border-width: 0; } GtkAssistant & { - padding: 4px; + padding: $spacing; border-width: 0 1px 0 0; border-style: solid; border-right-color: border_normal($bg_color); From c0bfa7f0139f640eb189ddd96cf12ce41f5ce745 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 28 Dec 2014 20:59:37 +0530 Subject: [PATCH 43/73] Remove button spacing from message-dialog Fixes #179 --- gtk-3.0/scss/widgets/_misc.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index f7a5c94..b6fa512 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -32,7 +32,7 @@ ************/ @include exports("dialogs") { - GtkMessageDialog, .prompt { + GtkMessageDialog, .message-dialog, .prompt { -GtkDialog-content-area-border: 0; -GtkDialog-action-area-border: 0; -GtkDialog-button-spacing: 0; From 14f1db1e01fdd9226c761effc4b736ce48cfb5f5 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 28 Dec 2014 21:09:36 +0530 Subject: [PATCH 44/73] Make GtkDrawingArea transparent #156 --- gtk-3.0/scss/widgets/_view.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss index 2febe0a..c7a6998 100644 --- a/gtk-3.0/scss/widgets/_view.scss +++ b/gtk-3.0/scss/widgets/_view.scss @@ -100,11 +100,13 @@ /* this will get overridden by .view, needed by gedit line numbers */ GtkTextView { background-color: mix($bg_color, $base_color, 0.50); } - GtkDrawingArea, GtkHTML { + GtkHTML { @extend .view; &:insensitive { background-color: shade($base_color, 0.9); } } + + GtkDrawingArea { background-color: transparent; } } /************ From f0b8fa3ac8ac0fc39b7e5cf524aa48d64419e25d Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 24 Jan 2015 00:24:03 +0530 Subject: [PATCH 45/73] Added xfce and lightdm styles --- gtk-3.0/scss/_colors.scss | 22 ++-- gtk-3.0/scss/_functions.scss | 2 - gtk-3.0/scss/_global.scss | 16 ++- gtk-3.0/scss/apps/_lightdm.scss | 193 ++++++++++++++++++++++++++++++ gtk-3.0/scss/apps/_panel.scss | 58 ++++----- gtk-3.0/scss/apps/_unity.scss | 70 +++++++++++ gtk-3.0/scss/apps/_xfce.scss | 26 ++++ gtk-3.0/scss/gtk.scss | 3 + gtk-3.0/scss/widgets/_window.scss | 29 +++-- 9 files changed, 366 insertions(+), 53 deletions(-) create mode 100644 gtk-3.0/scss/apps/_lightdm.scss create mode 100644 gtk-3.0/scss/apps/_unity.scss create mode 100644 gtk-3.0/scss/apps/_xfce.scss diff --git a/gtk-3.0/scss/_colors.scss b/gtk-3.0/scss/_colors.scss index dcb562c..86dd590 100755 --- a/gtk-3.0/scss/_colors.scss +++ b/gtk-3.0/scss/_colors.scss @@ -53,14 +53,14 @@ @define-color lightdm_fg_color #{"" + $lightdm_fg_color}; /* window manager colors */ -@define-color wm_bg @titlebar_bg_color; -@define-color wm_border_focused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21); -@define-color wm_border_unfocused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12); -@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); -@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); -@define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1); -@define-color wm_icons_focused_prelight @selected_bg_color; -@define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8); -@define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4); -@define-color wm_icons_unfocused_prelight @selected_bg_color; -@define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8); +@define-color wm_bg #{"" + $wm_bg}; +@define-color wm_border_focused #{"" + $wm_border_focused}; +@define-color wm_border_unfocused #{"" + $wm_border_unfocused}; +@define-color wm_title_focused #{"" + $wm_title_focused}; +@define-color wm_title_unfocused #{"" + $wm_title_unfocused}; +@define-color wm_icons_focused #{"" + $wm_icons_focused}; +@define-color wm_icons_focused_prelight #{"" + $wm_icons_focused_prelight}; +@define-color wm_icons_focused_pressed #{"" + $wm_icons_unfocused_pressed}; +@define-color wm_icons_unfocused #{"" + $wm_icons_unfocused}; +@define-color wm_icons_unfocused_prelight #{"" + $wm_icons_unfocused_prelight}; +@define-color wm_icons_unfocused_pressed #{"" + $wm_icons_unfocused_pressed}; diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index 9ea3a1b..6216dc2 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -1,5 +1,3 @@ -@import "global"; - $modules: () !default; @mixin exports($name) { diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index 3c51646..d2b1c51 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -1,3 +1,5 @@ +@import "functions"; + // default color scheme $bg_color: #eee; $fg_color: #333; @@ -51,8 +53,20 @@ $osd_fg: $dark_fg_color; $lightdm_bg_color: $dark_bg_color; $lightdm_fg_color: $dark_fg_color; +$wm_bg: $titlebar_bg_color; +$wm_border_focused: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); +$wm_border_unfocused: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); +$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); +$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4); +$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); +$wm_icons_focused_prelight: $selected_bg_color; +$wm_icons_focused_pressed: shade($selected_bg_color, 0.8); +$wm_icons_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4); +$wm_icons_unfocused_prelight: $selected_bg_color; +$wm_icons_unfocused_pressed: shade($selected_bg_color, 0.8); + // widget styles $roundness: 2px; -$spacing: 5px; +$spacing: 4px; $gradient: 0; $contrast: .7; diff --git a/gtk-3.0/scss/apps/_lightdm.scss b/gtk-3.0/scss/apps/_lightdm.scss new file mode 100644 index 0000000..333d6af --- /dev/null +++ b/gtk-3.0/scss/apps/_lightdm.scss @@ -0,0 +1,193 @@ +/*********************** + ! LightDM GTK Greeter * + ***********************/ + +@include exports("lightdm") { + #panel_window { + background-color: transparent; + background-image: none; + color: white; + font: bold; + text-shadow: 0 1px alpha(black, 0.5); + icon-shadow: 0 1px alpha(black, 0.5); + + .menubar { + &, > .menuitem { + background-color: transparent; + background-image: none; + color: white; + font: bold; + text-shadow: 0 1px alpha(black, 0.5); + icon-shadow: 0 1px alpha(black, 0.5); + + *:hover { color: white; } + + &:hover { + border-style: none; + background-color: alpha(white, 0.2); + background-image: none; + color: white; + } + + &:insensitive { color: alpha(white, 0.7); } + + .menu { + border-radius: 1px; + + .menuitem { + font: normal; + text-shadow: none; + } + } + } + } + } + + #content_frame { padding-bottom: 14px; } + + #login_window, #shutdown_dialog, #restart_dialog { + border-style: none; + border-radius: $roundness; + background-color: $lightdm_bg_color; + color: $lightdm_fg_color; + + /* draw border using box-shadow */ + box-shadow: inset 1px 0 mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21), + inset -1px 0 mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21), + inset 0 1px mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21), + inset 0 -1px mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21); + + .button { + padding: 3px 15px; + border-width: 1px; + border-radius: $roundness; + border-style: solid; + border-color: shade($lightdm_bg_color, 0.8); + background-color: shade($lightdm_bg_color, 1.08); + background-image: none; + color: $lightdm_fg_color; + transition: all 150ms ease-out; + + &.default, &:focus, &:active:focus { + border-color: shade($selected_bg_color, 0.8); + background-color: shade($selected_bg_color, 1.08); + background-image: none; + color: $selected_fg_color; + + &:hover { + border-color: shade($selected_bg_color, 0.7); + background-color: $selected_bg_color; + } + } + } + } + + + #login_window { + .menu { border-radius: 1px; } + + GtkComboBox .button { + &, &:hover, &:active, &:active:hover, + &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { + padding: 0; + background: none; + border-style: none; + box-shadow: none; + } + } + + .entry { + padding: 3px 5px; + border-width: 1px; + border-style: solid; + border-color: shade($lightdm_bg_color, 0.8); + border-radius: $roundness; + background-color: shade($lightdm_bg_color, 0.9); + background-image: none; + color: $lightdm_fg_color; + box-shadow: none; + transition: all 150ms ease-out; + + &:focus, &:hover { + border-color: shade($lightdm_bg_color, 0.7); + + box-shadow: inset 1px 0 alpha($dark_shadow, 0.10), + inset 0 1px alpha($dark_shadow, 0.12), + inset -1px 0 alpha($dark_shadow, 0.10), + inset 0 -1px alpha($dark_shadow, 0.05); + } + } + } + + #user_combobox { + color: $lightdm_fg_color; + font: 18px; + + .menu { font: normal; } + + .arrow { olor: mix($lightdm_fg_color, $lightdm_bg_color, 0.5); } + } + + #user_image { + padding: 3px; + border-radius: $roundness; + + /* draw border using box-shadow */ + box-shadow: inset 1px 0 shade($lightdm_bg_color, 0.7), + inset -1px 0 shade($lightdm_bg_color, 0.7), + inset 0 1px shade($lightdm_bg_color, 0.7), + inset 0 -1px shade($lightdm_bg_color, 0.7); + } + + #user_image_border { + border-radius: $roundness; + background-color: shade($lightdm_bg_color, 0.9); + background-image: none; + box-shadow: inset 1px 0 alpha($dark_shadow, 0.07), + inset 0 1px alpha($dark_shadow, 0.08), + inset -1px 0 alpha($dark_shadow, 0.07), + inset 0 -1px alpha($dark_shadow, 0.05); + } + + #buttonbox_frame { + padding-top: 10px; + padding-bottom: 0; + border-style: none; + border-bottom-left-radius: $roundness; + border-bottom-right-radius: $roundness; + background-color: transparent; + background-image: none; + box-shadow: none; + } + + + + /* shutdown button */ + #shutdown_button { + border-color: shade($error_bg_color, 0.8); + background-color: shade($error_bg_color, 1.08); + background-image: none; + color: $error_fg_color; + + &:hover, &:active, &:active:hover { + border-color: shade($error_bg_color, 0.7); + background-color: $error_bg_color; + } + } + + /* restart button */ + #restart_button { + border-color: shade($warning_bg_color, 0.8); + background-color: shade($warning_bg_color, 1.08); + background-image: none; + color: $warning_fg_color; + + &:hover, &:active, &:active:hover { + border-color: shade($warning_bg_color, 0.7); + background-color: $warning_bg_color; + } + } + + /* password warning */ + #greeter_infobar { font: bold; } +} diff --git a/gtk-3.0/scss/apps/_panel.scss b/gtk-3.0/scss/apps/_panel.scss index adc096e..c84c98b 100644 --- a/gtk-3.0/scss/apps/_panel.scss +++ b/gtk-3.0/scss/apps/_panel.scss @@ -9,6 +9,35 @@ color: $panel_fg_color; } + %panelbutton { + border-width: 0 1px; + border-radius: 0; + border-color: transparent; + background-color: transparent; + background-image: none; + color: $panel_fg_color; + + &:hover, &:prelight { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11)); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.11); + color: shade($panel_fg_color, 1.08); + } + + &:active, &:checked { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.21); + color: shade($panel_fg_color, 1.08); + + &:prelight { + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top); + + border-color: mix($panel_bg_color, $panel_fg_color, 0.31); + } + } + } + PanelWidget, PanelApplet, PanelToplevel { @extend %panel; @@ -19,34 +48,9 @@ border: none; .button { + @extend %panelbutton; + -GtkButton-inner-border: 2; - - border-width: 0 1px; - border-radius: 0; - border-color: transparent; - background-color: transparent; - background-image: none; - color: $panel_fg_color; - - &:hover, &:prelight { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11)); - - border-color: mix($panel_bg_color, $panel_fg_color, 0.11); - color: shade($panel_fg_color, 1.08); - } - - &:active, &:checked { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, 0.21); - color: shade($panel_fg_color, 1.08); - - &:prelight { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, 0.31); - } - } } } diff --git a/gtk-3.0/scss/apps/_unity.scss b/gtk-3.0/scss/apps/_unity.scss new file mode 100644 index 0000000..5cea4ad --- /dev/null +++ b/gtk-3.0/scss/apps/_unity.scss @@ -0,0 +1,70 @@ +@import "panel"; + +/**************** + ! Unity styles * +*****************/ + +@include exports("unity") { + UnityDecoration { + -UnityDecoration-extents: 28px 1px 1px 1px; + -UnityDecoration-input-extents: 10px; + + -UnityDecoration-shadow-offset-x: 1px; + -UnityDecoration-shadow-offset-y: 1px; + -UnityDecoration-active-shadow-color: rgba(0,0,0,0.7); + -UnityDecoration-active-shadow-radius: 8px; + -UnityDecoration-inactive-shadow-color: rgba(0,0,0,0.5); + -UnityDecoration-inactive-shadow-radius: 5px; + + -UnityDecoration-glow-size: 10px; + -UnityDecoration-glow-color: $selected_bg_color; + + -UnityDecoration-title-indent: 10px; + -UnityDecoration-title-fade: 35px; + -UnityDecoration-title-alignment: 0.0; + + + &.top { + border: 1px solid $wm_border_focused; + border-bottom: none; + border-radius: 2px 2px 0 0; + padding: 1px ($spacing * 2) 0 ($spacing * 2); + background-color: $titlebar_bg_color; + color: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); + text-shadow: none; + + &:backdrop { + border: 1px solid $wm_border_unfocused; + color: mix($titlebar_fg_color, $titlebar_bg_color, 0.4); + } + } + + &.left, &.right, &.bottom { + background-color: $wm_border_focused; + + &:backdrop { background-color: $wm_border_unfocused; } + } + } + + UnityPanelWidget, .unity-panel { + @extend %panel; + + border: none; + } + + .unity-panel { + &.menuitem, .menuitem { + border-width: 0 1px; + color: $panel_fg_color; + + &:hover, *:hover { + border-color: mix($panel_bg_color, $panel_fg_color, 0.21); + background-color: mix($panel_bg_color, $panel_fg_color, 0.21); + background-image: none; + color: shade($panel_fg_color, 1.08); + } + } + } + + SheetStyleDialog.unity-force-quit { background-color: $bg_color; } +} diff --git a/gtk-3.0/scss/apps/_xfce.scss b/gtk-3.0/scss/apps/_xfce.scss new file mode 100644 index 0000000..20dd546 --- /dev/null +++ b/gtk-3.0/scss/apps/_xfce.scss @@ -0,0 +1,26 @@ +@import "panel"; + +/*************** + ! Xfce styles * +****************/ + +@include exports("xfce") { + XfceHeading { + margin: 0; + padding: 0; + border: none; + background-image: none; + background-color: $base_color; + color: $text_color; + } + + .xfce4-panel { + @extend %panel; + + font: normal; + + .button { @extend %panelbutton; } + + .menu { -gtk-image-effect: none; } + } +} diff --git a/gtk-3.0/scss/gtk.scss b/gtk-3.0/scss/gtk.scss index 26eeaa5..e593bcb 100755 --- a/gtk-3.0/scss/gtk.scss +++ b/gtk-3.0/scss/gtk.scss @@ -30,3 +30,6 @@ @import "apps/nemo"; @import "apps/panel"; @import "apps/synaptic"; +@import "apps/xfce"; +@import "apps/unity"; +@import "apps/lightdm"; diff --git a/gtk-3.0/scss/widgets/_window.scss b/gtk-3.0/scss/widgets/_window.scss index 8f354c8..8d60778 100755 --- a/gtk-3.0/scss/widgets/_window.scss +++ b/gtk-3.0/scss/widgets/_window.scss @@ -3,27 +3,32 @@ ***************/ @include exports("window") { - .window-frame { - border: none; - border-radius: $roundness $roundness 0 0; + %window { box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); - - /* this is used for the resize cursor area */ - margin: $spacing * 3; + 0 0 0 1px $wm_border_focused; &:backdrop { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); + 0 0 0 1px $wm_border_unfocused; } + } + + .window-frame { + @extend %window; + + border: none; + border-radius: $roundness $roundness 0 0; + + /* this is used for the resize cursor area */ + margin: $spacing * 3; &.tiled { border-radius: 0; } &.csd { &.popup { + @extend %window; + border-radius: 0; - box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); } &.tooltip { @@ -32,9 +37,9 @@ } &.message-dialog { + @extend %window; + border-radius: $roundness; - box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23), - 0 0 0 1px mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); } } } From 7bdd234dd93753398711ff20588f37002259c678 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 22 May 2015 20:26:20 +0530 Subject: [PATCH 46/73] Change theme color --- gtk-2.0/gtkrc | 2 +- unity/close_focused_prelight.svg | 2 +- unity/close_focused_pressed.svg | 2 +- unity/maximize_focused_prelight.svg | 2 +- unity/maximize_focused_pressed.svg | 2 +- unity/minimize_focused_prelight.svg | 2 +- unity/minimize_focused_pressed.svg | 2 +- unity/progress_bar_fill.svg | 2 +- unity/unmaximize_focused_prelight.svg | 2 +- unity/unmaximize_focused_pressed.svg | 2 +- xfce-notify-4.0/gtkrc | 2 +- xfwm4/close-prelight.xpm | 2 +- xfwm4/close-pressed.xpm | 2 +- xfwm4/hide-prelight.xpm | 2 +- xfwm4/hide-pressed.xpm | 2 +- xfwm4/maximize-prelight.xpm | 2 +- xfwm4/maximize-pressed.xpm | 2 +- xfwm4/maximize-toggled-prelight.xpm | 2 +- xfwm4/maximize-toggled-pressed.xpm | 2 +- xfwm4/shade-prelight.xpm | 2 +- xfwm4/shade-pressed.xpm | 2 +- xfwm4/shade-toggled-prelight.xpm | 2 +- xfwm4/shade-toggled-pressed.xpm | 2 +- xfwm4/stick-prelight.xpm | 2 +- xfwm4/stick-pressed.xpm | 2 +- xfwm4/stick-toggled-prelight.xpm | 2 +- xfwm4/stick-toggled-pressed.xpm | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 0f86d59..790890a 100755 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,6 +1,6 @@ # Numix GTK Theme -gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#333333\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#d64937\nselected_fg_color:#ffffff\ntooltip_bg_color:#333333\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#333333\ntitlebar_fg_color:#eeeeee\nmenubar_bg_color:#333333\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#333333\nmenu_bg_color:#333333\nmenu_fg_color:#eeeeee\npanel_bg_color:#333333\npanel_fg_color:#eeeeee\nlink_color:#f06860" +gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#333333\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#333333\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#333333\ntitlebar_fg_color:#eeeeee\nmenubar_bg_color:#333333\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#333333\nmenu_bg_color:#333333\nmenu_fg_color:#eeeeee\npanel_bg_color:#333333\npanel_fg_color:#eeeeee\nlink_color:#f06860" # Default Style diff --git a/unity/close_focused_prelight.svg b/unity/close_focused_prelight.svg index 46d998c..9c4611b 100755 --- a/unity/close_focused_prelight.svg +++ b/unity/close_focused_prelight.svg @@ -1 +1 @@ - + diff --git a/unity/close_focused_pressed.svg b/unity/close_focused_pressed.svg index abecba9..fb119c6 100755 --- a/unity/close_focused_pressed.svg +++ b/unity/close_focused_pressed.svg @@ -1 +1 @@ - + diff --git a/unity/maximize_focused_prelight.svg b/unity/maximize_focused_prelight.svg index 7c1cffd..b1d4bc2 100755 --- a/unity/maximize_focused_prelight.svg +++ b/unity/maximize_focused_prelight.svg @@ -1 +1 @@ - + diff --git a/unity/maximize_focused_pressed.svg b/unity/maximize_focused_pressed.svg index 38dbcc4..0e35a70 100755 --- a/unity/maximize_focused_pressed.svg +++ b/unity/maximize_focused_pressed.svg @@ -1 +1 @@ - + diff --git a/unity/minimize_focused_prelight.svg b/unity/minimize_focused_prelight.svg index 29699c2..56801e1 100755 --- a/unity/minimize_focused_prelight.svg +++ b/unity/minimize_focused_prelight.svg @@ -1 +1 @@ - + diff --git a/unity/minimize_focused_pressed.svg b/unity/minimize_focused_pressed.svg index a713426..253a310 100755 --- a/unity/minimize_focused_pressed.svg +++ b/unity/minimize_focused_pressed.svg @@ -1 +1 @@ - + diff --git a/unity/progress_bar_fill.svg b/unity/progress_bar_fill.svg index aef847c..dc9cfec 100755 --- a/unity/progress_bar_fill.svg +++ b/unity/progress_bar_fill.svg @@ -1,5 +1,5 @@ - + diff --git a/unity/unmaximize_focused_prelight.svg b/unity/unmaximize_focused_prelight.svg index a71bdea..90f33e7 100755 --- a/unity/unmaximize_focused_prelight.svg +++ b/unity/unmaximize_focused_prelight.svg @@ -1 +1 @@ - + diff --git a/unity/unmaximize_focused_pressed.svg b/unity/unmaximize_focused_pressed.svg index 11173a6..2b21194 100755 --- a/unity/unmaximize_focused_pressed.svg +++ b/unity/unmaximize_focused_pressed.svg @@ -1 +1 @@ - + diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc index 52a62ca..274b046 100755 --- a/xfce-notify-4.0/gtkrc +++ b/xfce-notify-4.0/gtkrc @@ -27,7 +27,7 @@ style "notify-button" { } style "notify-text" { - GtkWidget::link-color = "#d64937" + GtkWidget::link-color = "#f0544c" fg[NORMAL] = "#f9f9f9" fg[PRELIGHT] = "#f9f9f9" diff --git a/xfwm4/close-prelight.xpm b/xfwm4/close-prelight.xpm index e3bd443..e8916bd 100755 --- a/xfwm4/close-prelight.xpm +++ b/xfwm4/close-prelight.xpm @@ -3,7 +3,7 @@ static char * close_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm index e3bd443..e8916bd 100755 --- a/xfwm4/close-pressed.xpm +++ b/xfwm4/close-pressed.xpm @@ -3,7 +3,7 @@ static char * close_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/hide-prelight.xpm b/xfwm4/hide-prelight.xpm index d2470bf..040ece7 100755 --- a/xfwm4/hide-prelight.xpm +++ b/xfwm4/hide-prelight.xpm @@ -3,7 +3,7 @@ static char * hide_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm index d2470bf..040ece7 100755 --- a/xfwm4/hide-pressed.xpm +++ b/xfwm4/hide-pressed.xpm @@ -3,7 +3,7 @@ static char * hide_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/maximize-prelight.xpm b/xfwm4/maximize-prelight.xpm index eec4b49..6a73981 100755 --- a/xfwm4/maximize-prelight.xpm +++ b/xfwm4/maximize-prelight.xpm @@ -3,7 +3,7 @@ static char * maximize_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm index eec4b49..6a73981 100755 --- a/xfwm4/maximize-pressed.xpm +++ b/xfwm4/maximize-pressed.xpm @@ -3,7 +3,7 @@ static char * maximize_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm index 2dda206..0c7ed43 100755 --- a/xfwm4/maximize-toggled-prelight.xpm +++ b/xfwm4/maximize-toggled-prelight.xpm @@ -3,7 +3,7 @@ static char * maximize_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm index 2dda206..0c7ed43 100755 --- a/xfwm4/maximize-toggled-pressed.xpm +++ b/xfwm4/maximize-toggled-pressed.xpm @@ -3,7 +3,7 @@ static char * maximize_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm index 4aa3b7a..e50b07a 100755 --- a/xfwm4/shade-prelight.xpm +++ b/xfwm4/shade-prelight.xpm @@ -3,7 +3,7 @@ static char * shade_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm index 4aa3b7a..e50b07a 100755 --- a/xfwm4/shade-pressed.xpm +++ b/xfwm4/shade-pressed.xpm @@ -3,7 +3,7 @@ static char * shade_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm index e3109e5..0cecaba 100755 --- a/xfwm4/shade-toggled-prelight.xpm +++ b/xfwm4/shade-toggled-prelight.xpm @@ -3,7 +3,7 @@ static char * shade_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm index e3109e5..0cecaba 100755 --- a/xfwm4/shade-toggled-pressed.xpm +++ b/xfwm4/shade-toggled-pressed.xpm @@ -3,7 +3,7 @@ static char * shade_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/stick-prelight.xpm b/xfwm4/stick-prelight.xpm index 725c314..ea2a259 100755 --- a/xfwm4/stick-prelight.xpm +++ b/xfwm4/stick-prelight.xpm @@ -3,7 +3,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm index 725c314..ea2a259 100755 --- a/xfwm4/stick-pressed.xpm +++ b/xfwm4/stick-pressed.xpm @@ -3,7 +3,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/stick-toggled-prelight.xpm b/xfwm4/stick-toggled-prelight.xpm index d56f353..5763b9b 100755 --- a/xfwm4/stick-toggled-prelight.xpm +++ b/xfwm4/stick-toggled-prelight.xpm @@ -3,7 +3,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm index d56f353..5763b9b 100755 --- a/xfwm4/stick-toggled-pressed.xpm +++ b/xfwm4/stick-toggled-pressed.xpm @@ -3,7 +3,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", ". c #2D2D2D", -"+ c #D64937 s active_color_1", +"+ c #f0544c s active_color_1", "........................", "........................", "........................", From 3b736963fb292eefb04102360383bf16ff30554c Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 31 May 2015 21:50:35 +0530 Subject: [PATCH 47/73] Start redesign --- gtk-3.0/assets/assets.sketch | Bin 0 -> 335872 bytes gtk-3.0/assets/checkbox-checked-dark.png | Bin 0 -> 469 bytes .../checkbox-checked-insensitive-dark.png | Bin 0 -> 298 bytes .../assets/checkbox-checked-insensitive.png | Bin 0 -> 282 bytes gtk-3.0/assets/checkbox-checked.png | Bin 0 -> 522 bytes gtk-3.0/assets/checkbox-mixed-dark.png | Bin 0 -> 349 bytes .../checkbox-mixed-insensitive-dark.png | Bin 0 -> 202 bytes gtk-3.0/assets/checkbox-mixed-insensitive.png | Bin 0 -> 182 bytes gtk-3.0/assets/checkbox-mixed.png | Bin 0 -> 382 bytes gtk-3.0/assets/checkbox-unchecked-dark.png | Bin 0 -> 233 bytes .../checkbox-unchecked-insensitive-dark.png | Bin 0 -> 172 bytes .../assets/checkbox-unchecked-insensitive.png | Bin 0 -> 153 bytes gtk-3.0/assets/checkbox-unchecked.png | Bin 0 -> 252 bytes .../assets/grid-selection-checked-dark.png | Bin 0 -> 813 bytes gtk-3.0/assets/grid-selection-checked.png | Bin 0 -> 883 bytes .../assets/grid-selection-unchecked-dark.png | Bin 0 -> 306 bytes gtk-3.0/assets/grid-selection-unchecked.png | Bin 0 -> 347 bytes .../menuitem-checkbox-checked-hover.png | Bin 0 -> 212 bytes .../menuitem-checkbox-checked-insensitive.png | Bin 0 -> 215 bytes gtk-3.0/assets/menuitem-checkbox-checked.png | Bin 0 -> 426 bytes .../assets/menuitem-checkbox-mixed-hover.png | Bin 0 -> 114 bytes .../menuitem-checkbox-mixed-insensitive.png | Bin 0 -> 109 bytes gtk-3.0/assets/menuitem-checkbox-mixed.png | Bin 0 -> 228 bytes .../assets/menuitem-radio-checked-hover.png | Bin 0 -> 171 bytes .../menuitem-radio-checked-insensitive.png | Bin 0 -> 181 bytes gtk-3.0/assets/menuitem-radio-checked.png | Bin 0 -> 319 bytes gtk-3.0/assets/radio-checked-dark.png | Bin 0 -> 593 bytes .../assets/radio-checked-insensitive-dark.png | Bin 0 -> 473 bytes gtk-3.0/assets/radio-checked-insensitive.png | Bin 0 -> 389 bytes gtk-3.0/assets/radio-checked.png | Bin 0 -> 637 bytes gtk-3.0/assets/radio-mixed-dark.png | Bin 0 -> 529 bytes .../assets/radio-mixed-insensitive-dark.png | Bin 0 -> 449 bytes gtk-3.0/assets/radio-mixed-insensitive.png | Bin 0 -> 349 bytes gtk-3.0/assets/radio-mixed.png | Bin 0 -> 603 bytes gtk-3.0/assets/radio-unchecked-dark.png | Bin 0 -> 485 bytes .../radio-unchecked-insensitive-dark.png | Bin 0 -> 420 bytes .../assets/radio-unchecked-insensitive.png | Bin 0 -> 335 bytes gtk-3.0/assets/radio-unchecked.png | Bin 0 -> 517 bytes gtk-3.0/gtk-dark.css | 1 + gtk-3.0/gtk.css | 1 - gtk-3.0/scss/_functions.scss | 12 +- gtk-3.0/scss/_global.scss | 50 ++--- gtk-3.0/scss/_widgets.scss | 36 ++++ gtk-3.0/scss/apps/_lightdm.scss | 2 +- gtk-3.0/scss/apps/_nautilus.scss | 9 +- gtk-3.0/scss/gtk-dark.scss | 3 + gtk-3.0/scss/gtk.scss | 36 +--- gtk-3.0/scss/widgets/_actionbar.scss | 2 +- gtk-3.0/scss/widgets/_base.scss | 27 +-- gtk-3.0/scss/widgets/_button.scss | 180 ++++++++++-------- gtk-3.0/scss/widgets/_calendar.scss | 2 +- gtk-3.0/scss/widgets/_entry.scss | 40 ++-- gtk-3.0/scss/widgets/_grid.scss | 2 +- gtk-3.0/scss/widgets/_menu.scss | 10 +- gtk-3.0/scss/widgets/_misc.scss | 2 +- gtk-3.0/scss/widgets/_notebook.scss | 38 ++-- gtk-3.0/scss/widgets/_overshoot.scss | 123 ++++++++++++ gtk-3.0/scss/widgets/_progress.scss | 16 +- gtk-3.0/scss/widgets/_scrollbar.scss | 31 +-- gtk-3.0/scss/widgets/_sidebar.scss | 80 ++++---- gtk-3.0/scss/widgets/_toggle.scss | 54 ++++-- gtk-3.0/scss/widgets/_toolbar.scss | 12 +- gtk-3.0/scss/widgets/_view.scss | 6 +- gtk-3.0/scss/widgets/_window.scss | 8 +- unity/close.svg | 2 +- unity/maximize.svg | 2 +- unity/minimize.svg | 2 +- unity/minimized.svg | 2 +- unity/progress_bar_trough.svg | 2 +- unity/unmaximize.svg | 2 +- xfce-notify-4.0/gtkrc | 20 +- xfwm4/close-active.xpm | 4 +- xfwm4/close-inactive.xpm | 2 +- xfwm4/close-prelight.xpm | 4 +- xfwm4/close-pressed.xpm | 2 +- xfwm4/hide-active.xpm | 4 +- xfwm4/hide-inactive.xpm | 2 +- xfwm4/hide-prelight.xpm | 2 +- xfwm4/hide-pressed.xpm | 2 +- xfwm4/maximize-active.xpm | 4 +- xfwm4/maximize-inactive.xpm | 2 +- xfwm4/maximize-prelight.xpm | 2 +- xfwm4/maximize-pressed.xpm | 2 +- xfwm4/maximize-toggled-active.xpm | 4 +- xfwm4/maximize-toggled-inactive.xpm | 2 +- xfwm4/maximize-toggled-prelight.xpm | 2 +- xfwm4/maximize-toggled-pressed.xpm | 2 +- xfwm4/menu-active.xpm | 2 +- xfwm4/menu-inactive.xpm | 2 +- xfwm4/menu-prelight.xpm | 2 +- xfwm4/menu-pressed.xpm | 2 +- xfwm4/shade-active.xpm | 4 +- xfwm4/shade-inactive.xpm | 2 +- xfwm4/shade-prelight.xpm | 2 +- xfwm4/shade-pressed.xpm | 2 +- xfwm4/shade-toggled-active.xpm | 4 +- xfwm4/shade-toggled-inactive.xpm | 2 +- xfwm4/shade-toggled-prelight.xpm | 2 +- xfwm4/shade-toggled-pressed.xpm | 2 +- xfwm4/stick-active.xpm | 4 +- xfwm4/stick-inactive.xpm | 2 +- xfwm4/stick-prelight.xpm | 2 +- xfwm4/stick-pressed.xpm | 2 +- xfwm4/stick-toggled-active.xpm | 4 +- xfwm4/stick-toggled-inactive.xpm | 2 +- xfwm4/stick-toggled-prelight.xpm | 2 +- xfwm4/stick-toggled-pressed.xpm | 2 +- xfwm4/themerc | 2 +- xfwm4/title-1-active.xpm | 2 +- xfwm4/title-1-inactive.xpm | 2 +- xfwm4/title-2-active.xpm | 2 +- xfwm4/title-2-inactive.xpm | 2 +- xfwm4/title-3-active.xpm | 2 +- xfwm4/title-3-inactive.xpm | 2 +- xfwm4/title-4-active.xpm | 2 +- xfwm4/title-4-inactive.xpm | 2 +- xfwm4/title-5-active.xpm | 2 +- xfwm4/title-5-inactive.xpm | 2 +- xfwm4/top-left-active.xpm | 2 +- xfwm4/top-left-inactive.xpm | 2 +- xfwm4/top-right-active.xpm | 2 +- xfwm4/top-right-inactive.xpm | 2 +- 122 files changed, 538 insertions(+), 397 deletions(-) create mode 100644 gtk-3.0/assets/assets.sketch create mode 100644 gtk-3.0/assets/checkbox-checked-dark.png create mode 100644 gtk-3.0/assets/checkbox-checked-insensitive-dark.png create mode 100644 gtk-3.0/assets/checkbox-checked-insensitive.png create mode 100644 gtk-3.0/assets/checkbox-checked.png create mode 100644 gtk-3.0/assets/checkbox-mixed-dark.png create mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive-dark.png create mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive.png create mode 100644 gtk-3.0/assets/checkbox-mixed.png create mode 100644 gtk-3.0/assets/checkbox-unchecked-dark.png create mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png create mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive.png create mode 100644 gtk-3.0/assets/checkbox-unchecked.png create mode 100644 gtk-3.0/assets/grid-selection-checked-dark.png create mode 100644 gtk-3.0/assets/grid-selection-checked.png create mode 100644 gtk-3.0/assets/grid-selection-unchecked-dark.png create mode 100644 gtk-3.0/assets/grid-selection-unchecked.png create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-hover.png create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked.png create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-hover.png create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed.png create mode 100644 gtk-3.0/assets/menuitem-radio-checked-hover.png create mode 100644 gtk-3.0/assets/menuitem-radio-checked-insensitive.png create mode 100644 gtk-3.0/assets/menuitem-radio-checked.png create mode 100644 gtk-3.0/assets/radio-checked-dark.png create mode 100644 gtk-3.0/assets/radio-checked-insensitive-dark.png create mode 100644 gtk-3.0/assets/radio-checked-insensitive.png create mode 100644 gtk-3.0/assets/radio-checked.png create mode 100644 gtk-3.0/assets/radio-mixed-dark.png create mode 100644 gtk-3.0/assets/radio-mixed-insensitive-dark.png create mode 100644 gtk-3.0/assets/radio-mixed-insensitive.png create mode 100644 gtk-3.0/assets/radio-mixed.png create mode 100644 gtk-3.0/assets/radio-unchecked-dark.png create mode 100644 gtk-3.0/assets/radio-unchecked-insensitive-dark.png create mode 100644 gtk-3.0/assets/radio-unchecked-insensitive.png create mode 100644 gtk-3.0/assets/radio-unchecked.png create mode 100755 gtk-3.0/gtk-dark.css create mode 100755 gtk-3.0/scss/_widgets.scss create mode 100644 gtk-3.0/scss/gtk-dark.scss mode change 100755 => 100644 gtk-3.0/scss/gtk.scss create mode 100644 gtk-3.0/scss/widgets/_overshoot.scss diff --git a/gtk-3.0/assets/assets.sketch b/gtk-3.0/assets/assets.sketch new file mode 100644 index 0000000000000000000000000000000000000000..aa048c3efd9dea2b415b3bf69efd6ad79d06da6f GIT binary patch literal 335872 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 Jxw@DHKvMPsw%GhH<%a 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

K)&t?>=;&v&ecT*^ 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

L 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 H8awGf{^F%N literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-checked-dark.png b/gtk-3.0/assets/checkbox-checked-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..36128053386c11438b9b60777cdf67dae127d235 GIT binary patch literal 469 zcmV;`0V@89P)Px$k4Z#9R5%fpQ@c(AK@`0^JBuvrMuQ;|r6Lgsno!Wv(r8Cz;};k^^&|8@w45jD8~@*Y^R{rtT`8PJ59^ zL?y$PGn!zVVs4V2-tNf>$JCiIHpqOrtkCInz9vBN{o|FYr+f7Ha!1pVIYmCd87Bkh zH-jhO0*-<^DCXAb;kij?*Hzt_F%SR_6DWabG^#`aKmm)5N&cNN5YWHT4`3mPa6agB z12G&9YonLNvD*C;1bvRd0oQO{HPx#RCIqhKV!nH0k?NL5vW2z3UtXCxqY9LM4~&LtQDBY{@@h%`;3g@Pbp`LqrKbS_Cw wsm+G*3!C-JQ^l*|v~3Fp*5ygg@ZZn*4KXQexfl1Ci~s-t07*qoM6N<$g44fyZU6uP literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.png b/gtk-3.0/assets/checkbox-checked-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..09c66155f4e0a6c9349ea307b76291d74421ac6e GIT binary patch literal 282 zcmV+#0pPx#)Ja4^R5%f(lf4SUFcgJT6@{Xpi<3h@2Nxf~_kRF)(ZxY<5~_>fccQ5=w4tFF zzBIiz=iKxsg)wFhJ18M1Di$9KhCN*24mmMn@p8bR&beYWlBSeFugEo+(rpV1-*x0C z9j+2v(0i*J*AtSd2*o!R3Ky|~CA)^9tA2)9dZ^E@q*$7G2Pbk*n7{@s z=$WU)mZ?23jnWbE_&S#E%e^x=m%EQ>BBE g8`4yINxhEq8-k%9&tE>EkpKVy07*qoM6N<$figP)Px$#7RU!R5%fhlTAwkQ5c2Kj5B7UrlgUyXw#=i3$d0_YPiltf&B*mM}Iycb(S8LZU@qPEe%MXmc*z!7R`hu8#B0dCr;lUX?*66gOYwZdkJW5M zz-hu#`9T1k+MgC48=p8Y)?vPWpnmo0i02YMB(q^L{h#3pkN`-?#!eIyVI6Nz9h8a< zT%J6L*c8*5JH;gd)Hwj|!njXIYA=d_4S6^1LD}!zFSbwXFEIgP1{@dxJRH8j7*hFZ zR7%eXPU%=#pA@eDiT?n2gAoHk1)IAw{3)OW%h+;vM3a4a!3H0a-`sx|lgaz+4VG&E zt7@icItN1v=qjD1P@WaSsi9UYm&@C>!Px$7fD1xR5%fpQ%i1xFc7tkSs-9nBvx6lASjFE6um(1(bM!Exj;_QEb`fQg+#Xq zA@M1XYMhBhTW2I|Jo7%oAX!FHv`LcW;CbF!JQ020->RzG%Ph+-K@b#LYayj{vKYrv zbX_N!rnzdRRN?!+vltUF2%5HS3yp$~(|AULZZ@DE8ZLnq5VOIOfCx6WG(dCGZ$jcM z;l=OQ)GmO>zj_wAq;9+eV$2IdKUef$m}OboFyt=akR{0EwDW A2><{9 literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..1f73901bba0ec6fb81f8282e57e38f9c5823bf0c GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|3OrpLLo5W7 zQxXyc7?NTYo-ri_9WY<;=yZ?6A+e5l#*gU=YOEiaM7s?cIVYT5lEoIua_KOuQG=2J z4^P5DAqFl7!vKzC<^>Ja4LXj65(&kOUA!l@B_;>IX-Z6D&FVdQ&MBb@0K}X)hX4Qo literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-mixed.png b/gtk-3.0/assets/checkbox-mixed.png new file mode 100644 index 0000000000000000000000000000000000000000..5cd581fa2d04549f82410cac3ec5c984c2490083 GIT binary patch literal 382 zcmV-^0fGLBP)Px$I7vi7R5%fplRa*OKoEroSP(*KDCk_Jh%Jj-K$R|T)8qo&DHpKIRB(+%PLV1- z6e$qmCp@CJ0)%5c(z5LAyl-X})<}|MA4Sp0ah$DT7_!E?u9K>&&RLcnR2;|0Fbuc8 z?~7@gat#7;+qRPDIT9X~=Xtvz2*kGS0kEb50F+V!t+Fg@5Z?+wB4`!L=D1cqt7AN7 zMdx@%pG&rsU;^L)VV*-E#z5AwX#mA0`7@5u@0*7^d3?E_Ks1hku3au46df~a zQCGk;@$*LNx|XJCbQ>srIPw0|%}smQAHFXIJO}Opf-}IHHUS`DE@mM71ks0C1F*Ox z#vTm&Fjj{52>=cl1OHb4Kh6GDeH2A8To91g4BQ21pjBy_KJ~qyT-V*tf09eN0VvDz cz1JRo0l}=Gr@Fq}WdHyG07*qoM6N<$f`L+>Q~&?~ literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.png b/gtk-3.0/assets/checkbox-unchecked-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..3e0cafcdcd04d763e7ea09e097823cce046b0cee GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|7JIrlhFA!` zo$SkXM1iOEZ>-3xO%HDQEk^s`~J;h2CY8 z+@Mo4{|Z_@KVLadyZqeS!v+;gMIO(Ytdq4?XXz0qj(pXY4^i1hJ$xA~YR6uP>V;3b zb>HQ|u7jb@jY1VnOjVAIb(wO^-)fSi1p>Wp-cI`(d9Wo=D9IpUr(xQ*Yk9dVr@eEs gk@{oRm;9GWM%(w<`y(w8K<6@ey85}Sb4q9e03Lo@ZU6uP literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..e98cc68f54be28e447226892d0b6cfc1722602f0 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|(mY)pLo5W7 zuUx$vDkLg;_r#GSOAb3Q{rLX={?zO1<9}~%F!}uPFVdQ&MBb@0FB>600000 literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.png b/gtk-3.0/assets/checkbox-unchecked-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..80c76dce46f8dc82e4a7d7333f1d42299ff440ef GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|f<0XvLo5W7 zQxXyc7?NTYo-ri_9WY<;=yZ?6A+e5l#*gU=YOEiaM7s?cIVYT5lEoIua_KOuQG=2} y76bF)3<;iT1`JQN0*)z&HhigJe(Kh>$(X^yo~v3*@JkWUcm_{bKbLh*2~7a`-7LZY literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/checkbox-unchecked.png b/gtk-3.0/assets/checkbox-unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..8fa69726930c8f5cbf3ef1a72676d6b31bb81096 GIT binary patch literal 252 zcmVPx#wn;=mR5%gslfemuFc3v2$tdE@gEhE_U1$SqA1O^M&^C72Dw3n*5cLOgHtTWO zfgup`{(QoGp|x)NzMu0vZ-fw(Qv1G>bMCXQ>&U|}OkLMCRaKFclCDGmd+*5@gMky5 zW%;PPx%=Sf6CR9FecSIuh^K@@-ck!Uun*hH&U2@%Xfi(0VtAQ(`3Qjhj(PZq?xHxCv3 zBSZu*;z|7vLe!uszvpX97 zX;vK8b>0uuFl zodk(x*L593cz)fotaE|@>AEfnfJ8sLVHn`EGnGo|rU0I1&-?8?M*$-+k#b#t76u8- zBw7)6K!Dc?yM!YWs7(Bf#L#K~iqKtiz7C%0r`L_>o4)}P* zo&p8{`1y&ev~O2|l4gp=^Jgh*=X~Ip#7aN~-;vtw17zP>E>;3;ls#9$mzJN=>i73P zLa`Cp47~K|1wDOzC-9gLEJ8M@(p4)M`z+hdbAUg7bz2|1jEZA3 z0z#vgOZTX}x*(OjBv>{KIP|!)9vlcPLI@N`XUN{36+J^!$F9(!;Yr9#64+-WQNX1E zC5(Wf=hw>(-)p&NWo2R62{0L&Xt!_jR5gE!^~_LnRRfT-6P% z0VctpX#XP73pmIG62L|n61{>;9JL0p=xtmRs0aMV+wJhkN&5EVgM7u}Y2|c5kBNJ2 zsQ)8`!QQDO%c#b~%tH}i07QVn*|<9A z^{}G}qhVXGU@DGGt@v@HkWh_mbq-9?ONMRRBc^EPx&ElET{R9FecmrYL-K^(@PmhB59BBazrXjDWBCZZ7|;s@{|dXh6=f|H3yqbELs z9(ut85xPjtFt$V3zTA zA&1rFUrLyGgilvJAn+gS+n9a4jGe8b&O)(RQUdfaxaNU+@G}=$(9sp%BZx1q2&e~- z^@nk7B&yCD-FgbJ4FMOF%0ZkYmG63~3-1eI_*Msk!5|F7s1Z>kfD1B%KfnKpg=Z^3 z1sEPViJpOWHCaC~4+Os*MRRkr5+J`doF~OrK(ScF{LIR363spNibB4GzQKr^CvIf6 zJ0)CNvueE!gu+rcTM#seJ4IG;X$40*GF!%WD2acsOH@^91kNRF1<(T&z&M|~)UHsvh$=Q3 zh1&{Xr))LuU6!7UZR%+!;wW$~TH^slvOcOs*m>fp@O=gFOFI!QtpO~*+eX`oAmUeA z5e|nPPdTnpuQ+-@Ch8)%Lr(P?i1oCpqnU?`RE~4nYOng$CtjD-`LBQLVVf*6c~A6P7sV;w z)%eTCN>yG~;gHEo>i@r-($m`Ye3VzUMl-rz)aY4;oL-mf`Cqgh?2n#J^P&I%002ov JPDHLkV1nZSq;UWM literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.png b/gtk-3.0/assets/grid-selection-unchecked-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..2f40f868a21f966375013f046a47d7ba8d7e0357 GIT binary patch literal 306 zcmV-20nPr2P)Px#>`6pHR9Fe^mpux?KoEuZFM%w+%T6rMpZl-{G@~E}$XyWsKuVq;jO+QW3V;F`jef zoL~+S4R;8@Z`p6KO?K)JPy&bnF(3xSfEW-1Vn7Ut0fVNp)&Uy$HwS@T8t1&5hX4Qo07*qoM6N<$ Eg5joq5&!@I literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/grid-selection-unchecked.png b/gtk-3.0/assets/grid-selection-unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..f2b67fa6aec42b5a66da66ac72edd03e9e93eca2 GIT binary patch literal 347 zcmV-h0i^zkP)Px$6-h)vR9Fe^moW~4FcgMgi-g3LupkSA9)XMK%q5si9F0y~f`vsd!Vz>}K^DSl zLI`00fuxHY)#bgUNz)L%zVCJU1*!6Vf1Rf3$#vbmZQDB`1dbQ4X_~0-`$yZh_asTq zbzQ#&;8~VE!Z6%;o=1-3EDqLx*mWH>O+#f_zT!CEi9F9QQ4}46ARx=KNJ^=HzxaL} zM;eBKs;Z)*D6T7|{eaE^$1+_r15Auus+n)0-E`-AV_<=a_a;p}I34(H54PEXe zd;vDV2G{@_U;}J`4X^<=AQ6}TRbWe%)t-n;NG!i9u)su4lqx9Rkkt^Euy8ArYvzE7 tkox~{3hi1vKOm}^N=q<{k;D2N&p)Ue&KRfP`uG3<002ovPDHLkV1n{wlY{^O literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.png b/gtk-3.0/assets/menuitem-checkbox-checked-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..7a27aa2834d7a67aa996df90cada52d45d55bb52 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|`aE46Lo5W7 z6C_wwS`YmH|6jMUf?MGCVUtYM6-X_8W4Sdz}LkxRgyEvZm}?Pn#c zvT`#21T~(9ZCnf=xfIxTvh1H_)cq_PWfqRHTrrNYARxck+JEPI~l|9WYQ1JEr2M<;O P9mnA5>gTe~DWM4f9dBGM literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/menuitem-checkbox-checked.png b/gtk-3.0/assets/menuitem-checkbox-checked.png new file mode 100644 index 0000000000000000000000000000000000000000..4f609d66c9bdb6af0fbc41c794fd0c43bae31cb0 GIT binary patch literal 426 zcmV;b0agBqP)Px$WJyFpR5%f1U>Nd%kpv%r)FP|@59I%6A<_UQpgN}B{QVvrti02H{r%Na*l#rl zq?Z^2K$@95b9Q;Mv+}J1x`F-Q|GzvS1A+K2vH{qf2ohuN$ll?_%^|#!5vcjsukSO9 zC)&;cii5oaGXTV4no@Fl6T^Q7fxEA-h4n9re+5zm)a=Q_DGJv70OedDsDhSv?K);{W#hA645mO2C4;Nm;nsP1~6W@bKoZrJI@w52`yJ9W@a^@W)>uy zK^lJ{YX-9627uULaP7f~A6%?lTVy0O6@UEvvaWQBVQzyRcQ7yx?%$N>c` z2!o;t1VDa9@i$l$N+25m5(4qTi3Uo8#6W=s@-sZ-L4q)VZUC}4Ob)9?m_mwa0I^bX UCJp{*ga7~l07*qoM6N<$f=U##9RL6T literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..8b11a27eb1d5d19cfddd4ebf6e7b0e488530a561 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|bUa-gLo5W7 z6C_vnPSguHwmIJjgc)I$ztaD0e F0st`$8}$GH literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed.png b/gtk-3.0/assets/menuitem-checkbox-mixed.png new file mode 100644 index 0000000000000000000000000000000000000000..1081f3a5101fbf2f2391977706e3dfadf491c37d GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|=6Sj}hFA!` z4LB&+Y{0|Jq;1GNf88bV`J>j7uRUDGBA87f> S{Kr$Eg$$mqelF{r5}E)z`8Wjt literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.png b/gtk-3.0/assets/menuitem-radio-checked-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..9bbb22a31c67cc50ff688a90b2cecd1e511c0d79 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|@;zM~Lo5W7 z6C_wg+8LDjgdH9QIq2|At><1cpYdb8hP2Gq^hID5w_08Ck+xugG!hkYSO~QwrMEz zGA&3_U=H}QprBz=g7|_LE>8tY7$bgupC2E-@Ktic0X4QDW+Oq#hL{5t|1Tb$yeq40 zj>G=b|AFB3b@};XXQG1d{CRhpJ3!$dYf?qd0u~MrV}Z>KhSCC?oo+gGJ>(bo&-N%j zz|4=i;nM>Lrky;N2OI*~H%YbxE)u-U>QHIG(Amr+q1JD#=s1O6g_GgTJnIFjm!?Dj P1A)QQ)z4*}Q$iB}Q4@Hv literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-checked-dark.png b/gtk-3.0/assets/radio-checked-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..be4856c74d8709123bda2b08f753dd99b00bf257 GIT binary patch literal 593 zcmV-X0Px%3rR#lR5%fJQ%z43Q53!N-t=SI&{S*upiNszu)!Du?DPk?(1or<68#N=iEQ`< zMvXtgg(d`7@&nwe36Yg3)o5GOLP&6ktG4M(hjRwr&&;QzrsEAR`b`XZT3MqpNp8)HU{SaQg<(fR`fa9=uVTPs^;C+^DRr5mBn z&z(=Q@q0~%fgfUsC5K#HC=^~|_6mch%Iw5FnZA5m5_UQ~7xR;1iIScDtq4P9TLef$N5SW24sd`Ft6bXUr(38}n-_qiuc@uN#fV zG6kc-UDsX9X0v}0y9JUW(HP12B3ao(<;RB1{4vU)Mb1>K)%&>Ed5BzN7y@5Wb*0&C fzJt4e3>7&5Z};V0XnSz%00000NkvXXu0mjfq(T;A literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark.png b/gtk-3.0/assets/radio-checked-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..24403ff4f59e8cbff97f52caea68a8388e063a1c GIT binary patch literal 473 zcmV;~0Ve*5P)Px$lSxEDR5%fxlekj6p?3kkW9Y@Bb&EQi%1I&iXc&dfj8Kc2}*tyT+~&E`q5SUmMS?*Q{= zvw2%A7Ego0;CVbAM=r#3FYR{wvRp3Tl}aVQP$(E{ZDNk&*esVzGoQ~_v)Syr-|ycm zE)CG>bRGnFUa3@4pgQT7K-1}zK#$#S_k#BvKV%l*O|@DzQZ`S&3N~rYNT9=dz5Y2G zjY3P$luhPc1z#{=bFEhEOfnzSvx*FjGPPWWXnfyKtJ_v-1^3}IZ5K=sz#J9TC96Ie zFkmgK(rK$zR;FtD&Ax$2u&KvC6lpECkc9QP!lbj3ecNK*EewMst_U9thhcH_?)rcM z>#+*i#8(gmes&fvz}3kfMbRn@!#xYPp(hO6RqzD^HesSL>b22m?8C5pKA-M88<5PC z$t0n2uh+Z9o&-P{4u>z$bG=?4$yK^Z)`SV_(l5kX$+=Q6wjad*>)-hsZ%WgIUzx-* P00000NkvXXu0mjf$0N?? literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-checked-insensitive.png b/gtk-3.0/assets/radio-checked-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..bb07e1c93aa4b9eee20158ae63da1e497c1cc8e1 GIT binary patch literal 389 zcmV;00eb$4P)Px$KS@MER5%f(lUqvzF%U*uZ!HxBwc3J+0e$e*|NkR=(kGFE3R-L{UaEM*b3(HW zTZMujoK1GJGnq_gn~iz3G3~)FbY{y_#v$Cm+su}SW_)3O1PSip5#B+q!3K0;02h!I z1Ds%4hb#EVtMiXlO#AQxr!Fu1K<>N+m+%dL$+Zdez^ukgJUnv(cV1L}o1kq52k-?? zP~_42V7fc70;XMLCVta0z%h*B6N+@!(G11f=1G|EcXRk!IgwFWJ)Nn(+l=OQs$uo2url-E8nz$;kD2Z%jj!R$zh#pAV68tTjd zR^Ox8|MfI6{i=lZ8ioc?I&Om<=58?)UMsnC0*`nORVzEc1q*Wsp5J?}8iu)Nwz1qf jJ2U1F9iwdRg@5NCxwJxr-jc&A00000NkvXXu0mjf<42~O literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-checked.png b/gtk-3.0/assets/radio-checked.png new file mode 100644 index 0000000000000000000000000000000000000000..f2da6f65808972251f6a0c27251366f62991e1b8 GIT binary patch literal 637 zcmV-@0)qXCP)Px%H%UZ6R5%e`lh3OXQ546|+Qo}f)=5?HICe9)@J+X)gvy6*XQ5-tmB(a!&% zMXPp_Lg3ThT8Y{SC2Fh4S8ZAuCTJ$1qRyzd`@J>u#&_W`=brQZoH=*qT!k*IcszbN zlgS*1LZKs%$8!_u)oS%^I2=|hmC8w@(fH*=6z8T;C_ITqqt7Cdh#CwA$>;OQ^kT7~ z$z(!AEhf0~W2*$F~DIYyQSouI`7i?B?*^RjETKV8Al3*LzFTG`npS`2OjS#oABAki*e% zL@;0(HkKg?5fQh+bLU^qD)67-OnluhVo=U?!n=O3zq7~YVhoI6zp~M2RKbu~m2tk? zah-15*(Z<2q`^nb`U}v40ZYkb@=~+eH0SfV{O^Wg$e|GeE(FrxV~~&&N953g0V`WA zm&=d3-L5@25Mufugu%C96o3|t^PEb(UVn)M#1O65YmVuI!AA@^XrOh%wl8km!%nAT ziVGuKwhEwq#E^r=286S78<9w*Qo(FCdtVI7vD@uFKuolMHXe^pN~O~4TCFxg%vyf| XaMi(qIYZgr00000NkvXXu0mjfHC{KN literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-mixed-dark.png b/gtk-3.0/assets/radio-mixed-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..6fced71380018bae50730302ff30acd72a3c8a7f GIT binary patch literal 529 zcmV+s0`C2ZP)Px$%Sl8*R5%fhQ@ct7K@^>R|9>aO+-*;&tNj_8b>#5)Gcfk}LCVKaXC5K!MrEeqi8qV#K2p(n5o!G02Dk?f|nzt>PLS;3?t>Q<;m>hE1NYj~2<^z91cgRw0%)|;g(2-`LP?%-i z4LAqvu)hSHII-lAD?1S#^&E{x4YcagxGrQtY-O}D-^4|+SUl#Q6yQgr(YV89e&TZ# znFcoshvkyU$Aru#GVeNM^4!Nn$F`|dDz%Qz%t2^@dk}d;)_kc{x`q2?4 literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.png b/gtk-3.0/assets/radio-mixed-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d20db95f0ba9a34b317aedac66151ec3c6582bf0 GIT binary patch literal 449 zcmV;y0Y3hTP)Px$dr3q=R5%fplf6y?K@i9H_V_pg#86RqPe5S-B@K3#7Is=nOpMQYv!Z5tE z+&V$4)w&n(yjU!*K^tVBBpQuIBzov{I&Jn{{-`YAb-7$ta%{H#Gu+FGJ7zF-HJ%L5PifML?X9(=(=Vg>k9wnVx(g48igT}v<3sKktYgUWlWTZSQuE1 zwvi_aOKQZzz?#NIQLn!5?@Q)7H@%wkPChC#C8Qh#!3_aFHzzN>Uhf%sMp1MmOPP`x r6ER4ae)$d-^1HM!z8&GG{hYr60|><0O*ojw00000NkvXXu0mjf;g`r0 literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-mixed-insensitive.png b/gtk-3.0/assets/radio-mixed-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..9b962722b17dfb9d0e7ee32786fd95b01d1f5a3f GIT binary patch literal 349 zcmV-j0iyniP)Px$7fD1xR5%f(lU+*!K^R8UN@b%iGV~(Cf&2sg{~zI2#j!ecJwgw%a=4&gz#O(^U#uF{586Wru!IeKfoj1WJU|W;h^lVz zLeC9M;X95V7uR$>!6%FyzO+D|d=Ibi2j}G28v0;Vt0ska4&ceDa&CZ*5e(oL-XT>+ z;`Q4`V75(IUAd-rMd4HJv+X7UZf%^9QRZd8YceDFmyAG@n9;pKa@r|!O<@w-phv!G(-}W~;vCe9j00000NkvXXu0mjf&-##S literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png new file mode 100644 index 0000000000000000000000000000000000000000..54f75103a15bd24be5e7769885584aa648e6eb81 GIT binary patch literal 603 zcmV-h0;K(kP)Px%6-h)vR5%fBlRIl_K@i9HJbV&CV^D-(k>bL=-p>#O6NG4;7}7|vOdu(4=Qp@T zs&sM{0!Gtolg38W+B_gd3W*3Bu~6}G)Xn@i$>AKi10%aL|KFV1aaUq%77mBE5{bmI z&*wX`*=#?Np3P>@-EOy7C=_lhmCCyjk&K&6CUY4K2LA>E0mb9-Fo(k-(v!)A4F&_& z>2#K@R_jkHmAW!=VqGj2Z)&v~r!Vo*Xv7KP)9F+=)`%eo4YZ~L*=+WrUa#}va3}yx z)A(|^G&y1@2o1DgP(+DDBHnmBejf^jWVCFtSePu!!X-&!Mn@cbm&?VdtNnJneXXR^ z=~IH^G&CJHwP)CT7f=+1tyU}9?RK|Rzu$l4^?DhCFlwD~&V?ITQzy`Z0jt{W_Fqn? zQ)sCwE9YL>+snwv>g(+v8|)ytBlcjx%HL;16b1N->%jT~ok0Wp;RaI<-5yOaml6$>g0ha`ZAwh&74&{)rKO}H% zQDEH=Lk=2fjj+C^*LK!uG&FiJ;_jnuINkwb$U&n6v@pF!Bx13cCz(th(nUF@LHPx$pGibPR5%fplgmoOKoo{2lk~o+7jV&%c2^V;dsm4a@30WY8%A3?!KaG}uZ z&bJWUdZDYf(k=vzxN1w2#{W-qLab2jfh2S0obNxAnKOp^ZHvWXv6@IEwoTJqX4vz* zm*H@D)9G|-aNpyI5qAoO!eJ(pIRk83mZc119QJ)*xvr}q;`MsH<8HTmAzUO-DwVF% z>GV!2l~P*k2$n>Oj7B3h7z|Xu-@k6R+q;aJeA%{rkj-XKP(6S}fGe1M!j-Kd{|k1n z!7rfdc`})dk|{a~#^;zzhOCLD@1gQ0{`&_+AZ{YaIgVi(t9aGeY3{a6GVrHSfDBm* ztni;{q4HD#$srT4Q?vgL`Wnac#3P#3$l!U_XplNOZC0M$$>yqaJLfBv${S9?lJlRY z#>#9cbfnv8G?ut~4xA%)*nf?=WXJ}ch>m*5=kqp{*JTy5+afBJ(Z;+Jm(6DLl(9g7 z1IKaha=F|Gh8uv#=L$zaUM5s_QF&ira?xd?6WUz4T;4)wRw1;?Ify)>YOU33-NOA0 b^McPeJkqbtW+xn|00000NkvXXu0mjfuQ}wa literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark.png b/gtk-3.0/assets/radio-unchecked-insensitive-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..6c8f7c870b7bc10d9afa92806b432e3e897e39c6 GIT binary patch literal 420 zcmV;V0bBlwP)Px$UP(kjR5%fplf6!aKoG}aPrgEkp`wr{ps+Yf8cItGJ1sRP#%Iu%urb=&+4%w_ zgi;G*s4Pfm?1%}3j~w9qH@BCIdI?Md%QEwu+1>fCEd4Uuw)Z{HJJB@lRF>sKxW{pP zZ`<}MP1EP1D89E5d3zEB!KGmsce<|csj4b5#<+VJ2C3^hscD*3UDwx1lH3b!lOPPk z2LjJc)7*d}NQ_8SRTUCFMp1Nu{|mfOnZO&%vLsqIe*J6k(bgnNv~(QjE6?*+hCO51 zs65pW3kK}M_x&@fe2hI$we>0)ai0vQJqH#=z<_0Fl{jtToHByp?3CbLF{F=yK_qC; zTw60A3<`rt<{B8V4Dy7+=Bxs-V8AkH8}fw0rW#_wfaOXgMZLMMdqA0&ilXdPBPy3= z$)y~}@huAS1o+6Z>;>}d`~HZg)Fs{~xFB8Z7x!RA&y|4T`y>3h*ZBtnX1-{n0WK{7 O0000Px$2}wjjR5%f(liO+nF%(5>ix)=lp^83~VnBbu|NjWz`cy=)f()fXYX|X$YXvI< zB24Ipm1L5fliQx!!>w9$y+9wb%Wy%R!xFZazF5`DAGF61;1j-K2dV)b=)oM`A*!5U zLQfkOu#cm+MV+o!_=Ty%PZr3PpJ4_kxF^TfFaUS;^+@5F1GsWkIX6Jd9Sq?JKTuWf z#N#*Jfw%32rOKGT34E%*+fGShOlE?A$po6j8%>olg_qa_P2$_8$Y)=>1MR89G)YxC z*O;X{IDm=tzb2`oz@!hzO`r_yf)3ljJvX{?0FV0yS1a3Iffq9ZO`^H3hN115{SRC@ h22;n0)@3FA&S!dUGhW!K$;|)&002ovPDHLkV1fgUksAO2 literal 0 HcmV?d00001 diff --git a/gtk-3.0/assets/radio-unchecked.png b/gtk-3.0/assets/radio-unchecked.png new file mode 100644 index 0000000000000000000000000000000000000000..ada911bfd8ab78b984f3598f5991a61583b9137f GIT binary patch literal 517 zcmV+g0{Z=lP)Px$zez+vR5%fhlRIkyK@^2&XYmPw%Lc{9J~2N+kW_A+XeYrkfuu<1KS+@(okSs` zyXmz_W2e^U(JzRg5eo%hStoNAb{SU*4qTkM_k3qA>m7-BRyv(N$>nnSSS)rG2n0@1 zUaeN&qtVFFb-mGUw|_)L5)b8a`97IUJ|+?gSy2=c3We68qIL(4SHhhnk# zBy#rNFpSqur^EP7Y(Aee4zcBOX$SVmp#}}KI|h|X<*wW9ve|5A1Dnl;S(ddE$iWaA zXu-fl&SWyGrfKh~REnZypU+1qrFKY?M8rTI=SU<%cvlyL!Qfdgl}gtf*7!$rVTim- zG?HbRY`0q)jYdrxkH@c6RV7Fs0uLEM3kEC=27_neaM*3t3wX~?Ct$!*CvnW}j+wwP z%D?U>9~7r{^e-6Be$nxGtYb(RV@Jc#f&oiwwVJ^v>=%y5m_P$97_j!O^?Lob-|yRl z!v+5?3>dUv#FnL2tM!5c#+LubdnU-C1`V_#?C$w%yXp0M8~$MI*~j=I@D7ke4H_5V zo4t|CX0uA6P`KoSlK1=l=Mb;g>yOD~(x_IeZ_Q?NDjNI&P_|w5^9k?A00000NkvXX Hu0mjf?;7dP literal 0 HcmV?d00001 diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css new file mode 100755 index 0000000..3c469d4 --- /dev/null +++ b/gtk-3.0/gtk-dark.css @@ -0,0 +1 @@ +@import url("dist/gtk-dark.css"); diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index a245e70..415ea7b 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,2 +1 @@ - @import url("dist/gtk.css"); diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index 6216dc2..a1e33cf 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -17,7 +17,15 @@ $modules: () !default; } @function shade($color, $amount) { - @return unquote("shade(#{$color},#{$amount})"); + @if type-of($color) == "color" { + @if ($amount > 1) { + @return lighten($color, ($amount - 1) * lightness($color)) + } @else { + @return darken($color, (1 - $amount) * lightness($color)) + } + } @else { + @return unquote("shade(#{$color},#{$amount})"); + } } @function mix($color1, $color2, $amount) { @@ -37,7 +45,7 @@ $modules: () !default; } @function border_insensitive($color) { - @return shade($color, ($contrast + .1)); + @return shade($color, ($contrast + .05)); } @mixin linear-gradient($color, $direction: to bottom) { diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index d2b1c51..1110ace 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -1,17 +1,17 @@ @import "functions"; // default color scheme -$bg_color: #eee; -$fg_color: #333; -$base_color: #fff; -$text_color: #333; -$selected_bg_color: #f06860; +$bg_color: if($variant == "dark", #444, #eee); +$fg_color: if($variant == "dark", #ccc, #555); +$base_color: if($variant == "dark", #333, #fff); +$text_color: if($variant == "dark", #eee, #333); +$selected_bg_color: #f0544c; $selected_fg_color: #fff; -$tooltip_bg_color: #333; +$tooltip_bg_color: #444; $tooltip_fg_color: #eee; // dark colors -$dark_bg_color: #333; +$dark_bg_color: #444; $dark_fg_color: #eee; // shadows @@ -19,18 +19,18 @@ $dark_shadow: #000; $light_shadow: #fff; // misc colors used by gtk+ -$info_fg_color: #3986ac; -$info_bg_color: #d9edf7; -$warning_fg_color: #c09853; -$warning_bg_color: #fcf8e3; -$question_fg_color: #d64937; -$question_bg_color: #fce5d5; -$error_fg_color: #b94a48; -$error_bg_color: #f2dede; -$link_color: #fc6f5d; -$success_color: #53a93f; -$warning_color: #f57900; -$error_color: #cc0000; +$info_fg_color: #fff; +$info_bg_color: #03a9f4; +$warning_fg_color: #fff; +$warning_bg_color: #ef6c00; +$question_fg_color: #fff; +$question_bg_color: #673ab7; +$error_fg_color: #fff; +$error_bg_color: #f44336; +$link_color: #3f51b5; +$success_color: #4caf50; +$warning_color: #ef6c00; +$error_color: #f44336; $toolbar_bg_color: $bg_color; $toolbar_fg_color: $fg_color; @@ -41,8 +41,8 @@ $titlebar_fg_color: $dark_fg_color; $menu_bg_color: $dark_bg_color; $menu_fg_color: $dark_fg_color; -$menubar_bg_color: $dark_bg_color; -$menubar_fg_color: $dark_fg_color; +$menubar_bg_color: $bg_color; +$menubar_fg_color: $fg_color; $panel_bg_color: $dark_bg_color; $panel_fg_color: $dark_fg_color; @@ -54,8 +54,8 @@ $lightdm_bg_color: $dark_bg_color; $lightdm_fg_color: $dark_fg_color; $wm_bg: $titlebar_bg_color; -$wm_border_focused: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); -$wm_border_unfocused: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); +$wm_border_focused: transparent; +$wm_border_unfocused: transparent; $wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); $wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4); $wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); @@ -67,6 +67,6 @@ $wm_icons_unfocused_pressed: shade($selected_bg_color, 0.8); // widget styles $roundness: 2px; -$spacing: 4px; +$spacing: 5px; $gradient: 0; -$contrast: .7; +$contrast: .8; diff --git a/gtk-3.0/scss/_widgets.scss b/gtk-3.0/scss/_widgets.scss new file mode 100755 index 0000000..62de316 --- /dev/null +++ b/gtk-3.0/scss/_widgets.scss @@ -0,0 +1,36 @@ +@import "functions"; +@import "global"; +@import "colors"; + + +@import "widgets/base"; +@import "widgets/button"; +@import "widgets/entry"; +@import "widgets/actionbar"; +@import "widgets/calendar"; +@import "widgets/choosers"; +@import "widgets/grid"; +@import "widgets/infobar"; +@import "widgets/menu"; +@import "widgets/misc"; +@import "widgets/notebook"; +@import "widgets/osd"; +@import "widgets/overshoot"; +@import "widgets/progress"; +@import "widgets/scrollbar"; +@import "widgets/sidebar"; +@import "widgets/spinner"; +@import "widgets/toggle"; +@import "widgets/toolbar"; +@import "widgets/view"; +@import "widgets/window"; + + +@import "apps/gedit"; +@import "apps/nautilus"; +@import "apps/nemo"; +@import "apps/panel"; +@import "apps/synaptic"; +@import "apps/xfce"; +@import "apps/unity"; +@import "apps/lightdm"; diff --git a/gtk-3.0/scss/apps/_lightdm.scss b/gtk-3.0/scss/apps/_lightdm.scss index 333d6af..453434e 100644 --- a/gtk-3.0/scss/apps/_lightdm.scss +++ b/gtk-3.0/scss/apps/_lightdm.scss @@ -125,7 +125,7 @@ .menu { font: normal; } - .arrow { olor: mix($lightdm_fg_color, $lightdm_bg_color, 0.5); } + .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, 0.5); } } #user_image { diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss index d31a25e..9a9f754 100644 --- a/gtk-3.0/scss/apps/_nautilus.scss +++ b/gtk-3.0/scss/apps/_nautilus.scss @@ -23,7 +23,7 @@ .sidebar .frame { border: none; } - > GtkGrid > .pane-separator { + GtkPaned { border-width: 0 1px 0 0; border-style: solid; @@ -45,11 +45,6 @@ } NautilusQueryEditor { - .search-bar.toolbar { - border-top-width: 0; - border-bottom-width: 0; - } - .toolbar { padding-top: $spacing - 1px; padding-bottom: $spacing - 2px; @@ -66,7 +61,7 @@ } &, &.search-bar { - &:only-child { + &:last-child, &:only-child { border-bottom-width: 1px; border-bottom-color: border_normal($toolbar_bg_color); } diff --git a/gtk-3.0/scss/gtk-dark.scss b/gtk-3.0/scss/gtk-dark.scss new file mode 100644 index 0000000..fd46aa1 --- /dev/null +++ b/gtk-3.0/scss/gtk-dark.scss @@ -0,0 +1,3 @@ +$variant: "dark"; + +@import "widgets"; diff --git a/gtk-3.0/scss/gtk.scss b/gtk-3.0/scss/gtk.scss old mode 100755 new mode 100644 index e593bcb..4455669 --- a/gtk-3.0/scss/gtk.scss +++ b/gtk-3.0/scss/gtk.scss @@ -1,35 +1,3 @@ -@import "functions"; -@import "global"; -@import "colors"; +$variant: "light"; - -@import "widgets/base"; -@import "widgets/button"; -@import "widgets/entry"; -@import "widgets/actionbar"; -@import "widgets/calendar"; -@import "widgets/choosers"; -@import "widgets/grid"; -@import "widgets/infobar"; -@import "widgets/menu"; -@import "widgets/misc"; -@import "widgets/notebook"; -@import "widgets/osd"; -@import "widgets/progress"; -@import "widgets/scrollbar"; -@import "widgets/sidebar"; -@import "widgets/spinner"; -@import "widgets/toggle"; -@import "widgets/toolbar"; -@import "widgets/view"; -@import "widgets/window"; - - -@import "apps/gedit"; -@import "apps/nautilus"; -@import "apps/nemo"; -@import "apps/panel"; -@import "apps/synaptic"; -@import "apps/xfce"; -@import "apps/unity"; -@import "apps/lightdm"; +@import "widgets"; diff --git a/gtk-3.0/scss/widgets/_actionbar.scss b/gtk-3.0/scss/widgets/_actionbar.scss index 4f1280a..6745b23 100644 --- a/gtk-3.0/scss/widgets/_actionbar.scss +++ b/gtk-3.0/scss/widgets/_actionbar.scss @@ -58,7 +58,7 @@ @include exports("actionbuttons") { $types: ( - suggested: $selected_bg_color, + suggested: $success_color, destructive: $error-color ); diff --git a/gtk-3.0/scss/widgets/_base.scss b/gtk-3.0/scss/widgets/_base.scss index a1916f6..bad015d 100755 --- a/gtk-3.0/scss/widgets/_base.scss +++ b/gtk-3.0/scss/widgets/_base.scss @@ -4,34 +4,9 @@ * { -GtkArrow-arrow-scaling: 0.5; - -GtkButton-child-displacement-x: 0; - -GtkButton-child-displacement-y: 0; - -GtkButton-default-border: 0; - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 1; - -GtkButton-interior-focus: true; - -GtkButtonBox-child-min-height: 24; - -GtkButtonBox-child-internal-pad-y: 1; -GtkExpander-expander-size: 8; - -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; - -GtkPaned-handle-size: 4; - -GtkProgressBar-min-horizontal-bar-height: 12; - -GtkProgressBar-min-vertical-bar-width: 12; - -GtkRange-slider-width: 12; - -GtkRange-stepper-spacing: 0; - -GtkRange-trough-border: 0; - -GtkRange-trough-under-steppers: 1; - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - -GtkScrollbar-min-slider-length: 80; - -GtkScrolledWindow-scrollbar-spacing: 0; - -GtkScrolledWindow-scrollbars-within-bevel: 1; -GtkStatusbar-shadow-type: none; - -GtkTextView-error-underline-color: $error_color; - -GtkToolButton-icon-spacing: 6; -GtkToolItemGroup-expander-size: 8; - -GtkTreeView-expander-size: 8; -GtkWindow-resize-grip-height: 0; -GtkWindow-resize-grip-width: 0; -WnckTasklist-fade-overlay-rect: 0; @@ -82,6 +57,8 @@ text-shadow: none; icon-shadow: none; } + + &.csd { background-color: $bg_color; } } .gtkstyle-fallback { diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index 9310af9..f54d96b 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -4,15 +4,17 @@ @include exports("button_extends") { %button { - padding: ($spacing - 1px) ($spacing + 1px); + padding: $spacing ($spacing + 2px); border-width: 1px; border-style: solid; border-radius: $roundness; - transition: 100ms ease; + transition: 150ms ease; outline-color: transparent; -GtkWidget-focus-padding: 1; -GtkWidget-focus-line-width: 0; + + &:focus, &:hover, &:active { transition: none; } } %linked_middle { @@ -71,95 +73,107 @@ } @mixin linked_button($bg) { + $border_strength: if(lightness($bg) > 50, 0, .1); + $shadow_strength: if(lightness($bg) > 50, 0, .1); + @extend %linked_button; - box-shadow: inset -1px 0 border_normal($bg), - 0 1px 2px -1px alpha($dark_shadow, .3); + box-shadow: inset -1px 0 border_normal(rgba(0,0,0,.12 + $border_strength)), + 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); &:focus, &:hover { - box-shadow: inset -1px 0 border_focus($bg), - 0 1px 2px -1px alpha($dark_shadow, .3); + box-shadow: inset -1px 0 border_focus(rgba(0,0,0,.12 + $border_strength)), + 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } &:active, &:active:hover, &:active:focus, &:active:hover:focus, &:checked, &:checked:hover, &:checked:focus, &:checked:hover:focus { - box-shadow: inset -1px 0 border_active($bg), - inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), + box-shadow: inset -1px 0 border_active(rgba(0,0,0,.12 + $border_strength)), + inset 0 1px alpha($dark_shadow, .07), inset 0 -1px alpha($dark_shadow, .05); } - &:insensitive { box-shadow: inset -1px 0 border_insensitive($bg); } + &:insensitive { box-shadow: inset -1px 0 shade($bg, .8); } + + &:last-child, &:only-child { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); } + + &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } - &:last-child, &:only-child, &:insensitive:last-child, &:insensitive:only-child, &:active:insensitive:last-child, &:active:insensitive:only-child, &:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } - &:active:last-child, &:active:only-child, - &:active:last-child:focus, &:active:only-child:focus, - &:active:last-child:hover, &:active:only-child:hover, - &:active:last-child:hover:focus, &:active:only-child:hover:focus, - &:checked:last-child, &:checked:only-child, - &:checked:last-child:focus, &:checked:only-child:focus, - &:checked:last-child:hover, &:checked:only-child:hover, - &:checked:last-child:hover:focus, &:checked:only-child:hover:focus { - box-shadow: inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), - inset -1px 0 alpha($dark_shadow, .07); + &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, + &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus, { + box-shadow: inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06); + } + + &:active:only-child, &:active:only-child:focus, &:active:only-child:hover, &:active:only-child:hover:focus, + &:checked:only-child, &:checked:only-child:focus, &:checked:only-child:hover, &:checked:only-child:hover:focus { + box-shadow: inset 1px 0 alpha($dark_shadow, .06), + inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06); } } @mixin button($bg, $fg) { - @include linear-gradient(shade($bg, 1.05)); + $border_strength: if(lightness($bg) > 50, 0, .1); + $shadow_strength: if(lightness($bg) > 50, 0, .1); + @extend %button; + @include linear-gradient(shade($bg, 1.2)); + @include border(rgba(0,0,0,.12 + $border_strength)); color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); - - &:insensitive { - @include linear-gradient(shade($bg, .95)); - - color: mix($bg, $fg, .5); - box-shadow: none; - } - - &, &.flat { - @include border(shade($bg, 1.05)); - - &:focus, &:hover { - @include linear-gradient(shade($bg, 1.1)); - - box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5); - } - - &:checked, &:active { - @include linear-gradient(shade($bg, .95)); - - box-shadow: inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), - inset -1px 0 alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - } - - &:active:insensitive, - &:checked:insensitive { - @include linear-gradient(shade($bg, .8)); - - box-shadow: none; - } - } + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); &.flat { - color: inherit; border-color: transparent; background-color: transparent; background-image: none; box-shadow: none; } + &, &.flat { + &:focus, &:hover { + @include linear-gradient(shade($bg, 1.2)); + @include border(rgba(0,0,0,.2 + $border_strength)); + + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); + } + + &:active, &:checked { + @include linear-gradient(shade($bg, .9), to top); + + color: $fg; + box-shadow: inset 1px 0 alpha($dark_shadow, .06), + inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06), + inset 0 -1px alpha($dark_shadow, .05); + } + + &:active:insensitive, &:checked:insensitive { + @include linear-gradient(shade($bg, .8)); + + color: $fg; + box-shadow: none; + } + + &:insensitive:insensitive { + @if (lightness($bg) > 50) { + @include linear-gradient(shade($bg, .95)); + } @else { + @include linear-gradient(alpha($bg, .3)); + } + + color: mix($bg, $fg, .5); + box-shadow: none; + } + } + &.separator, .separator { border: 1px solid currentColor; color: shade($bg, ($contrast + .1)); @@ -169,6 +183,18 @@ } @include exports("button") { + * { + -GtkButton-child-displacement-x: 0; + -GtkButton-child-displacement-y: 0; + -GtkButton-default-border: 0; + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 1; + -GtkButton-interior-focus: true; + -GtkButtonBox-child-min-height: 24; + -GtkButtonBox-child-internal-pad-y: 1; + -GtkToolButton-icon-spacing: 6; + } + %close_button { border: 1px solid transparent; background-color: transparent; @@ -176,15 +202,15 @@ box-shadow: none; &:focus, &:hover { - border: 1px solid alpha(black, 0.3); - background-color: alpha(white, 0.2); + border: 1px solid alpha(black, .3); + background-color: alpha(white, .2); background-image: none; box-shadow: none; } &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha(black, 0.3); - background-color: alpha(black, 0.1); + border: 1px solid alpha(black, .3); + background-color: alpha(black, .1); background-image: none; box-shadow: none; } @@ -195,21 +221,21 @@ &.default { @include button($selected_bg_color, $selected_fg_color); } - &.linked, .linked & { @include linked_button($bg_color); } + &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); } .spinbutton & { - color: mix($text_color, $base_color, 0.4); + color: mix($text_color, $base_color, .4); padding: $spacing ($spacing * 2); border: none; border-radius: 0; border-style: none; background-color: transparent; background-image: none; - box-shadow: inset 1px 0 shade($base_color, 0.9); + box-shadow: inset 1px 0 shade($base_color, .9); &:insensitive { - color: mix($text_color, $base_color, 0.7); - box-shadow: inset 1px 0 shade($base_color, 0.85); + color: mix($text_color, $base_color, .7); + box-shadow: inset 1px 0 shade($base_color, .85); } &:active, &:checked, &:hover { color: $text_color; } @@ -221,11 +247,11 @@ &:last-child { border-radius: 0 $roundness $roundness 0; } - &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, 0.9); } + &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, .9); } } .spinbutton.vertical & { - border: 1px solid shade($bg_color, 0.8); + border: 1px solid shade($bg_color, .8); border-radius: $roundness; background-color: shade($bg_color, 1.08); background-image: none; @@ -233,26 +259,26 @@ box-shadow: none; &:hover { - border-color: shade($bg_color, 0.7); + border-color: shade($bg_color, .7); background-color: shade($bg_color, 1.1); background-image: none; } &:active, &:checked { - border-color: shade($bg_color, 0.8); - background-color: shade($bg_color, 0.95); + border-color: shade($bg_color, .8); + background-color: shade($bg_color, .95); background-image: none; } &:active:hover, &:checked:hover { - border-color: shade($bg_color, 0.7); + border-color: shade($bg_color, .7); } - &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, 0.7); } + &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, .7); } &:insensitive { - border-color: shade($bg_color, 0.85); - background-color: shade($bg_color, 0.9); + border-color: shade($bg_color, .85); + background-color: shade($bg_color, .9); background-image: none; } @@ -289,7 +315,7 @@ > .button { padding: ($spacing - 2px) ($spacing + 1px); - -GtkComboBox-arrow-scaling: 0.5; + -GtkComboBox-arrow-scaling: .5; -GtkComboBox-shadow-type: none; } diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss index ee88e64..909ea9c 100644 --- a/gtk-3.0/scss/widgets/_calendar.scss +++ b/gtk-3.0/scss/widgets/_calendar.scss @@ -10,7 +10,7 @@ &:inconsistent { color: mix($fg_color, $bg_color, 0.5); } &.view, &.highlight, &.header, &.button { - &, &:hover, &:insensitive { + &, &:focus, &:hover, &:insensitive { border: none; background-color: transparent; background-image: none; diff --git a/gtk-3.0/scss/widgets/_entry.scss b/gtk-3.0/scss/widgets/_entry.scss index 0015dee..6605f01 100755 --- a/gtk-3.0/scss/widgets/_entry.scss +++ b/gtk-3.0/scss/widgets/_entry.scss @@ -30,33 +30,23 @@ } } -@mixin entry($bg, $fg) { - @include border(shade($bg, .9)); - +%entry { padding: ($spacing - 1px) $spacing; border-width: 1px; border-style: solid; border-radius: $roundness; - background-color: $bg; - background-image: none; - transition: border 100ms ease; - box-shadow: inset 1px 0 alpha($dark_shadow, .1), - inset 0 1px alpha($dark_shadow, .12), - inset -1px 0 alpha($dark_shadow, .1), - inset 0 -1px alpha($dark_shadow, .05), - 0 1px 2px -1px shade($bg, 1.4); + transition: border 150ms ease; + box-shadow: inset 1px 1px alpha($dark_shadow, .06), + inset -1px 0 alpha($dark_shadow, .06); + + &:focus, &:hover, &:active { transition: none; } &:selected, &:selected:focus { background-color: $selected_bg_color; color: $selected_fg_color; } - &:insensitive { - background-color: shade($bg, .9); - background-image: none; - color: mix($bg, $fg, .5); - box-shadow: none; - } + &:insensitive { box-shadow: none; } &.progressbar { @include linear-gradient($selected_bg_color); @@ -69,6 +59,22 @@ &.image.left { padding-right: $spacing; } } +@mixin entry($bg, $fg) { + @extend %entry; + @include linear-gradient($bg, to top); + @include border($bg); + + color: $fg; + + &:focus, &:active { border-color: $selected_bg_color; } + + &:insensitive { + @include linear-gradient(shade($bg, .9), to top); + + color: mix($bg, $fg, .5); + } +} + @include exports("entry") { .entry { @include entry($base_color, $text_color); diff --git a/gtk-3.0/scss/widgets/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss index 573e5c2..13016da 100644 --- a/gtk-3.0/scss/widgets/_grid.scss +++ b/gtk-3.0/scss/widgets/_grid.scss @@ -13,7 +13,7 @@ border-radius: 0; padding: $spacing; background-image: none; - background-color: transparent; + background-color: alpha($bg_color, 0); box-shadow: none; &:hover { diff --git a/gtk-3.0/scss/widgets/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss index 8d0bdf7..35a2581 100755 --- a/gtk-3.0/scss/widgets/_menu.scss +++ b/gtk-3.0/scss/widgets/_menu.scss @@ -40,6 +40,11 @@ *******/ @include exports("menu") { + * { + -GtkMenu-horizontal-padding: 0; + -GtkMenu-vertical-padding: 0; + } + GtkTreeMenu, GtkMenuToolButton, GtkComboBox { &.menu, .menu { background-color: $menu_bg_color; @@ -50,7 +55,7 @@ #toolbar-popup, .menu { padding: 0; border-radius: 0; - border-style: none; + border: none; background-color: $menu_bg_color; color: $menu_fg_color; @@ -191,9 +196,10 @@ } } - .list { + .view, .list { background-color: transparent; background-image: none; + color: $menu_fg_color; } .list-row { diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index b6fa512..8eb1de3 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -34,7 +34,7 @@ @include exports("dialogs") { GtkMessageDialog, .message-dialog, .prompt { -GtkDialog-content-area-border: 0; - -GtkDialog-action-area-border: 0; + -GtkDialog-action-area-border: $spacing; -GtkDialog-button-spacing: 0; margin: 0; diff --git a/gtk-3.0/scss/widgets/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss index 7d5c1ef..e3c155e 100644 --- a/gtk-3.0/scss/widgets/_notebook.scss +++ b/gtk-3.0/scss/widgets/_notebook.scss @@ -27,10 +27,10 @@ &.header { border-width: 0; - background-color: shade($base_color, 0.85); + background-color: shade($base_color, .9); &.frame { - border-color: shade($base_color, 0.75); + border-color: border_normal($base_color); &.top { border-width: 1px 1px 0 1px; } @@ -49,55 +49,45 @@ } tab { - padding: $spacing ($spacing * 2); + padding: ($spacing + 1px) ($spacing * 2); border: 1px solid transparent; background-color: transparent; background-image: none; + &:hover { + background-color: shade($base_color, .95); + border-color: shade($base_color, .8); + } + &:active { - background-color: transparent; + background-color: $base_color; background-image: none; + border-color: shade($base_color, .85); } &.top { - border-bottom-width: 2px; + border-bottom-width: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; - - &:hover { border-bottom-color: alpha($selected_bg_color, 0.3); } - - &:active { border-bottom-color: $selected_bg_color; } } &.right { - border-left-width: 2px; + border-left-width: 0; border-bottom-left-radius: 0; border-top-left-radius: 0; - - &:hover { border-left-color: alpha($selected_bg_color, 0.3); } - - &:active { border-left-color: $selected_bg_color; } } &.bottom { - border-top-width: 2px; + border-top-width: 0; border-top-right-radius: 0; border-top-left-radius: 0; - - &:hover { border-top-color: alpha($selected_bg_color, 0.3); } - - &:active { border-top-color: $selected_bg_color; } } &.left { - border-right-width: 2px; + border-right-width: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; - - &:hover { border-right-color: alpha($selected_bg_color, 0.3); } - - &:active { border-right-color: $selected_bg_color; } } GtkLabel { color: mix($text_color, $base_color, 0.3); } diff --git a/gtk-3.0/scss/widgets/_overshoot.scss b/gtk-3.0/scss/widgets/_overshoot.scss new file mode 100644 index 0000000..fa5fe1b --- /dev/null +++ b/gtk-3.0/scss/widgets/_overshoot.scss @@ -0,0 +1,123 @@ +@mixin overshoot($position, $type: normal, $color: $selected_bg_color) { + $_small_gradient_length: 5%; + $_big_gradient_length: 100%; + + $_position: center top; + $_small_gradient_size: 100% $_small_gradient_length; + $_big_gradient_size: 100% $_big_gradient_length; + + @if $position == bottom { + $_position: center bottom; + $_linear_gradient_direction: to top; + } + + @else if $position == right { + $_position: right center; + $_small_gradient_size: $_small_gradient_length 100%; + $_big_gradient_size: $_big_gradient_length 100%; + } + + @else if $position == left { + $_position: left center; + $_small_gradient_size: $_small_gradient_length 100%; + $_big_gradient_size: $_big_gradient_length 100%; + } + + $_small_gradient_color: $color; + $_big_gradient_color: $color; + + $_small_gradient: -gtk-gradient(radial, + $_position, 0, + $_position, 0.5, + to(alpha($_small_gradient_color, .35)), + to(alpha($_small_gradient_color, .25))); + + $_big_gradient: -gtk-gradient(radial, + $_position, 0, + $_position, 0.6, + from(alpha($_big_gradient_color, .2)), + to(alpha($_big_gradient_color, 0))); + + @if $type == normal { + background-image: $_small_gradient, $_big_gradient; + background-size: $_small_gradient_size, $_big_gradient_size; + } @else if $type == backdrop { + background-image: $_small_gradient; + background-size: $_small_gradient_size; + } + + background-repeat: no-repeat; + background-position: $_position; + + background-color: transparent; // reset some properties to be sure to not inherit them somehow + border: none; + box-shadow: none; +} + +@mixin undershoot($position) { + $_undershoot_color_dark: alpha(black, .2); + $_undershoot_color_light: alpha(white, .2); + + $_gradient_dir: left; + $_dash_bg_size: 10px 1px; + $_gradient_repeat: repeat-x; + $_bg_pos: center $position; + + background-color: transparent; // shouldn't be needed, but better to be sure; + + @if ($position == left) or ($position == right) { + $_gradient_dir: top; + $_dash_bg_size: 1px 10px; + $_gradient_repeat: repeat-y; + $_bg_pos: $position center; + } + + background-image: linear-gradient(to $_gradient_dir, // this is the dashed line + $_undershoot_color_light 50%, + $_undershoot_color_dark 50%); + + padding-#{$position}: 1px; + background-size: $_dash_bg_size; + background-repeat: $_gradient_repeat; + background-origin: content-box; + background-position: $_bg_pos; +} + +// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. +// This draws a box on top of the content, the size changes programmatically. +.overshoot { + &.top { + @include overshoot(top); + + &:backdrop { @include overshoot(top, backdrop); } + } + + &.bottom { + @include overshoot(bottom); + + &:backdrop { @include overshoot(bottom, backdrop); } + } + + &.left { + @include overshoot(left); + + &:backdrop { @include overshoot(left, backdrop); } + } + + &.right { + @include overshoot(right); + + &:backdrop { @include overshoot(right, backdrop); } + } +} + +// Overflow indication, works similarly to the overshoot, the size if fixed tho. +.undershoot { + &.top { @include undershoot(top); } + + &.bottom { @include undershoot(bottom); } + + &.left { @include undershoot(left); } + + &.right { @include undershoot(right); } +} diff --git a/gtk-3.0/scss/widgets/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss index c09ff40..f6943df 100644 --- a/gtk-3.0/scss/widgets/_progress.scss +++ b/gtk-3.0/scss/widgets/_progress.scss @@ -9,13 +9,13 @@ font-size: smaller; color: alpha($fg_color, 0.6); - -GtkProgressBar-min-horizontal-bar-height: 12; - -GtkProgressBar-min-vertical-bar-width: 12; + -GtkProgressBar-min-horizontal-bar-height: 6; + -GtkProgressBar-min-vertical-bar-width: 6; &.osd { -GtkProgressBar-xspacing: 0; -GtkProgressBar-yspacing: 0; - -GtkProgressBar-min-horizontal-bar-height: 3; + -GtkProgressBar-min-horizontal-bar-height: 4; } &.trough { @@ -119,8 +119,8 @@ &.slider { - @include linear-gradient(shade($bg_color, 1.08)); - @include border($bg_color); + @include linear-gradient($base_color); + @include border($base_color); border-radius: 8px; border-width: 1px; @@ -146,13 +146,13 @@ &.trough { @include linear-gradient(shade($bg_color, 1.08)); - margin: 7px 0; - border: 1px solid alpha(border_normal($bg_color), 0.5); + margin: 8px 0; + border: 0; border-radius: $roundness; &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } - &.vertical { margin: 0 7px; } + &.vertical { margin: 0 8px; } } &.highlight { diff --git a/gtk-3.0/scss/widgets/_scrollbar.scss b/gtk-3.0/scss/widgets/_scrollbar.scss index b2548ed..969ece6 100644 --- a/gtk-3.0/scss/widgets/_scrollbar.scss +++ b/gtk-3.0/scss/widgets/_scrollbar.scss @@ -3,6 +3,18 @@ ************/ @include exports("scrollbar") { + * { + -GtkRange-slider-width: 8; + -GtkRange-stepper-spacing: 0; + -GtkRange-trough-border: $spacing; + -GtkRange-trough-under-steppers: 1; + -GtkScrollbar-has-backward-stepper: false; + -GtkScrollbar-has-forward-stepper: false; + -GtkScrollbar-min-slider-length: 80; + -GtkScrolledWindow-scrollbar-spacing: 0; + -GtkScrolledWindow-scrollbars-within-bevel: 1; + } + .scrollbar { border: none; padding: 0; @@ -18,24 +30,15 @@ } &.slider, &.slider.vertical { - border: 1px solid mix(shade($bg_color, 0.87), $fg_color, 0.21); - border-radius: 0; + border: none; + border-radius: $roundness; background-color: mix($bg_color, $fg_color, 0.21); - &:hover { - border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31); - background-color: mix($bg_color, $fg_color, 0.31); - } + &:hover { background-color: $selected_bg_color; } - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - } + &:active { background-color: shade($selected_bg_color, .9); } - &.fine-tune:prelight:active { - border-width: 2px; - border-color: transparent; - } + &.fine-tune:prelight:active { border: 2px solid transparent; } } } diff --git a/gtk-3.0/scss/widgets/_sidebar.scss b/gtk-3.0/scss/widgets/_sidebar.scss index b3185d5..7d5d9f1 100755 --- a/gtk-3.0/scss/widgets/_sidebar.scss +++ b/gtk-3.0/scss/widgets/_sidebar.scss @@ -38,8 +38,7 @@ &:prelight { border: none; background-image: none; - background-color: shade($bg_color, 0.95); - color: $fg_color; + background-color: shade($bg_color, 1.05); } } @@ -57,7 +56,7 @@ &:dir(ltr) { border-width: 0 1px 0 0; } &:dir(rtl) { border-width: 0 0 0 1px; } - GtkLabel { + .label { padding: $spacing ($spacing * 2); &.highlight { background-color: mix($bg_color, $fg_color, 0.80); } @@ -71,51 +70,38 @@ } -/*************** -! Pane separator -****************/ +/****** +! Paned +*******/ -@include exports("paneseparator") { - .pane-separator { - background-color: $bg_color; - color: transparent; +@include exports("paned") { + GtkPaned { + -GtkPaned-handle-size: 1; + -gtk-icon-source: none; - &, &.horizontal { - background-image: linear-gradient(to bottom, - shade($bg_color, 0.8) 0%, - shade($bg_color, 0.8) 20%, - transparent 20%, - transparent 45%, - shade($bg_color, 0.8) 45%, - shade($bg_color, 0.8) 55%, - transparent 55%, - transparent 80%, - shade($bg_color, 0.8) 80%, - shade($bg_color, 0.8) - ); - - background-size: 4px 10px; - background-repeat: no-repeat; - background-position: center center; - } - - &.vertical { - background-image: linear-gradient(to right, - shade($bg_color, 0.8) 0%, - shade($bg_color, 0.8) 20%, - transparent 20%, - transparent 45%, - shade($bg_color, 0.8) 45%, - shade($bg_color, 0.8) 55%, - transparent 55%, - transparent 80%, - shade($bg_color, 0.8) 80%, - shade($bg_color, 0.8) - ); - - background-size: 10px 4px; - background-repeat: no-repeat; - background-position: center center; - } + margin: 0 $spacing; } + + + GtkPaned:dir(rtl) { + margin-right: 0; + margin-left: $spacing; + } + + GtkPaned .pane-separator { background-color: shade($bg_color, 0.9); } + + GtkPaned.wide { + -GtkPaned-handle-size: 4; + + margin: 0; + } + + GtkPaned.wide .pane-separator { + background-color: transparent; + border-style: none solid; + border-color: shade($bg_color, 0.9); + border-width: 1px; + } + + GtkPaned.wide.vertical .pane-separator { border-style: solid none; } } diff --git a/gtk-3.0/scss/widgets/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss index cf4936c..c9e40f0 100755 --- a/gtk-3.0/scss/widgets/_toggle.scss +++ b/gtk-3.0/scss/widgets/_toggle.scss @@ -2,23 +2,25 @@ ! Check and Radio items ************************/ +$suffix: if($variant == "dark", "-dark", ""); + @mixin toggle($type) { background-image: none; - -gtk-icon-source: url('../assets/#{$type}-unchecked.svg'); + -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.png"); - &:insensitive { -gtk-icon-source: url('../assets/#{$type}-unchecked-insensitive.svg'); } + &:insensitive { -gtk-icon-source: url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"); } &:checked, &:active { - -gtk-icon-source: url('../assets/#{$type}-checked.svg'); + -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.png"); - &:insensitive { -gtk-icon-source: url('../assets/#{$type}-checked-insensitive.svg'); } + &:insensitive { -gtk-icon-source: url("../assets/#{$type}-checked-insensitive#{$suffix}.png"); } } &:inconsistent { - -gtk-icon-source: url('../assets/#{$type}-mixed.svg'); + -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.png"); - &:insensitive { -gtk-icon-source: url('../assets/#{$type}-mixed-insensitive.svg'); } + &:insensitive { -gtk-icon-source: url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"); } } &.menuitem { @@ -27,19 +29,19 @@ &:insensitive { -gtk-icon-source: none; } &:checked, &:active { - -gtk-icon-source: url('../assets/menuitem-#{$type}-checked.svg'); + -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.png"); - &:hover { -gtk-icon-source: url('../assets/menuitem-#{$type}-checked-hover.svg'); } + &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.png"); } - &:insensitive { -gtk-icon-source: url('../assets/menuitem-#{$type}-checked-insensitive.svg'); } + &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png"); } } &:inconsistent { - -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed.svg'); + -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.png"); - &:hover { -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed-hover.svg'); } + &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.png"); } - &:insensitive { -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed-insensitive.svg'); } + &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-insensitive.png"); } } } } @@ -47,7 +49,7 @@ @include exports("checkradio") { * { -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 14; + -GtkCheckMenuItem-indicator-size: 16; } .radio { @include toggle("radio"); } @@ -55,9 +57,9 @@ .check { @include toggle("checkbox"); } GtkIconView.content-view.cell.check { - -gtk-icon-source: url("assets/grid-selection-unchecked.svg"); + -gtk-icon-source: url("assets/grid-selection-unchecked#{$suffix}.png"); - &:active { -gtk-icon-source: url("assets/grid-selection-checked.svg"); } + &:active { -gtk-icon-source: url("assets/grid-selection-checked#{$suffix}.png"); } } } @@ -74,29 +76,39 @@ outline-offset: -4px; &.slider { - border: 1px solid border_normal($bg_color); - background-color: shade($bg_color, 1.08); + @include linear-gradient(shade($bg_color, 1.2)); + + border: 1px solid rgba(0,0,0,0.2); + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12); &:insensitive { - border-color: border_insensitive($bg_color); + border-color: rgba(0,0,0,0.1); background-color: shade($bg_color, 0.9); + box-shadow: none; } } &.trough { + @include linear-gradient(shade($bg_color, .95), to top); + border: 1px solid border_normal($bg_color); - background-color: shade($bg_color, 0.95); color: $fg_color; + box-shadow: inset 1px 0 alpha($dark_shadow, .07), + inset 0 1px alpha($dark_shadow, .08), + inset -1px 0 alpha($dark_shadow, .07), + inset 0 -1px alpha($dark_shadow, .05); &:active { + @include linear-gradient($selected_bg_color, to top); + border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; color: $selected_fg_color; } &:insensitive { + @include linear-gradient(shade($bg_color, .9), to top); + border-color: border_insensitive($bg_color); - background-color: shade($bg_color, 0.9); color: mix($fg_color, $bg_color, 0.5); } } diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss index c9d37c2..ab8d98f 100755 --- a/gtk-3.0/scss/widgets/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -9,7 +9,7 @@ @include linear-gradient($bg); @include border($bg); - padding: $spacing; + padding: $spacing * 2; color: $fg; &:insensitive { @@ -37,7 +37,7 @@ &.text-button { padding: $spacing; } - &.image-button { padding: $spacing ($spacing - 1px) ($spacing - 1px) $spacing; } + &.image-button { padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; } } GtkSeparatorToolItem, .separator, .separator:insensitive { @@ -55,6 +55,11 @@ @include toolbar($bg_color, $fg_color); border-style: none; + + &.inline-toolbar { + background-image: none; + background-color: transparent; + } } .header-bar { @@ -97,20 +102,17 @@ &:hover, &:hover:focus { background-image: none; background-color: transparent; - color: $selected_bg_color; box-shadow: none; } &:active, &:active:hover { background-image: none; background-color: transparent; - color: shade($selected_bg_color, .9); box-shadow: none; } &:backdrop { background: none; - color: mix($titlebar_fg_color, $titlebar_bg_color, .6); icon-shadow: none; } } diff --git a/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss index c7a6998..e077972 100644 --- a/gtk-3.0/scss/widgets/_view.scss +++ b/gtk-3.0/scss/widgets/_view.scss @@ -3,6 +3,8 @@ ****************/ @include exports("view") { + * { -GtkTextView-error-underline-color: $error_color; } + .view { color: $text_color; background-color: $base_color; @@ -92,9 +94,6 @@ } } - /* used by GtkScrolledWindow, shown when content is touch-dragged past boundaries. */ - .overshoot { background-color: alpha($selected_bg_color, 0.3); } - GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } /* this will get overridden by .view, needed by gedit line numbers */ @@ -115,6 +114,7 @@ @include exports("treeview") { GtkTreeView { + -GtkTreeView-expander-size: 8; -GtkTreeView-vertical-separator: 0; outline-offset: -1px; diff --git a/gtk-3.0/scss/widgets/_window.scss b/gtk-3.0/scss/widgets/_window.scss index 8d60778..0b8f88b 100755 --- a/gtk-3.0/scss/widgets/_window.scss +++ b/gtk-3.0/scss/widgets/_window.scss @@ -4,11 +4,11 @@ @include exports("window") { %window { - box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), + box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22), 0 0 0 1px $wm_border_focused; &:backdrop { - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24), + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), 0 0 0 1px $wm_border_unfocused; } } @@ -16,8 +16,8 @@ .window-frame { @extend %window; - border: none; - border-radius: $roundness $roundness 0 0; + border: 0; + border-radius: $roundness + 1; /* this is used for the resize cursor area */ margin: $spacing * 3; diff --git a/unity/close.svg b/unity/close.svg index 4a4ca0b..1d739f2 100755 --- a/unity/close.svg +++ b/unity/close.svg @@ -1 +1 @@ - + diff --git a/unity/maximize.svg b/unity/maximize.svg index d62a015..a84ce25 100755 --- a/unity/maximize.svg +++ b/unity/maximize.svg @@ -1 +1 @@ - + diff --git a/unity/minimize.svg b/unity/minimize.svg index 09e7c2e..a7075cc 100755 --- a/unity/minimize.svg +++ b/unity/minimize.svg @@ -1 +1 @@ - + diff --git a/unity/minimized.svg b/unity/minimized.svg index 09e7c2e..a7075cc 100755 --- a/unity/minimized.svg +++ b/unity/minimized.svg @@ -1 +1 @@ - + diff --git a/unity/progress_bar_trough.svg b/unity/progress_bar_trough.svg index 8082c32..4d4b209 100755 --- a/unity/progress_bar_trough.svg +++ b/unity/progress_bar_trough.svg @@ -59,7 +59,7 @@ id="image6" /> diff --git a/unity/unmaximize.svg b/unity/unmaximize.svg index eee6717..9f6d305 100755 --- a/unity/unmaximize.svg +++ b/unity/unmaximize.svg @@ -1 +1 @@ - + diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc index 274b046..b4ea119 100755 --- a/xfce-notify-4.0/gtkrc +++ b/xfce-notify-4.0/gtkrc @@ -1,6 +1,6 @@ style "notify-window" { XfceNotifyWindow::summary-bold = 1 - XfceNotifyWindow::border-color = "#2d2d2d" + XfceNotifyWindow::border-color = "#444444" XfceNotifyWindow::border-color-hover = "#333333" XfceNotifyWindow::border-radius = 2.0 XfceNotifyWindow::border-width = 1.0 @@ -10,13 +10,13 @@ style "notify-window" { } style "notify-button" { - bg[NORMAL] = "#2d2d2d" - bg[PRELIGHT] = "#333333" - bg[ACTIVE] = "#2d2d2d" + bg[NORMAL] = "#444444" + bg[PRELIGHT] = "#555555" + bg[ACTIVE] = "#444444" - fg[NORMAL] = "#dcdcdc" - fg[PRELIGHT] = "#dedede" - fg[ACTIVE] = "#dedede" + fg[NORMAL] = "#eeeeee" + fg[PRELIGHT] = "#eeeeee" + fg[ACTIVE] = "#eeeeee" engine "murrine" { gradient_shades = { 1.0, 1.0, 1.0, 1.0 } @@ -46,9 +46,9 @@ style "notify-progressbar" { xthickness = 1 ythickness = 1 - bg[NORMAL] = "#dcdcdc" - bg[ACTIVE] = "#2d2d2d" - bg[SELECTED] = "#dedede" + bg[NORMAL] = "#eeeeee" + bg[ACTIVE] = "#444444" + bg[SELECTED] = "#eeeeee" fg[PRELIGHT] = "#333333" fg[ACTIVE] = "#f9f9f9" diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm index 3424b7c..73ee20b 100755 --- a/xfwm4/close-active.xpm +++ b/xfwm4/close-active.xpm @@ -2,8 +2,8 @@ static char * close_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm index 9201e50..eb5514e 100755 --- a/xfwm4/close-inactive.xpm +++ b/xfwm4/close-inactive.xpm @@ -2,7 +2,7 @@ static char * close_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/close-prelight.xpm b/xfwm4/close-prelight.xpm index e8916bd..f7ebf57 100755 --- a/xfwm4/close-prelight.xpm +++ b/xfwm4/close-prelight.xpm @@ -1,8 +1,8 @@ -/* XPM */ +s/* XPM */ static char * close_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm index e8916bd..644cedb 100755 --- a/xfwm4/close-pressed.xpm +++ b/xfwm4/close-pressed.xpm @@ -2,7 +2,7 @@ static char * close_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/hide-active.xpm b/xfwm4/hide-active.xpm index 4a01c16..0f4de57 100755 --- a/xfwm4/hide-active.xpm +++ b/xfwm4/hide-active.xpm @@ -2,8 +2,8 @@ static char * hide_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm index 3da4487..6e210d2 100755 --- a/xfwm4/hide-inactive.xpm +++ b/xfwm4/hide-inactive.xpm @@ -2,7 +2,7 @@ static char * hide_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/hide-prelight.xpm b/xfwm4/hide-prelight.xpm index 040ece7..be53c73 100755 --- a/xfwm4/hide-prelight.xpm +++ b/xfwm4/hide-prelight.xpm @@ -2,7 +2,7 @@ static char * hide_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm index 040ece7..be53c73 100755 --- a/xfwm4/hide-pressed.xpm +++ b/xfwm4/hide-pressed.xpm @@ -2,7 +2,7 @@ static char * hide_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/maximize-active.xpm b/xfwm4/maximize-active.xpm index ce44a5f..e56f28e 100755 --- a/xfwm4/maximize-active.xpm +++ b/xfwm4/maximize-active.xpm @@ -2,8 +2,8 @@ static char * maximize_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm index 153b4d2..7983fe3 100755 --- a/xfwm4/maximize-inactive.xpm +++ b/xfwm4/maximize-inactive.xpm @@ -2,7 +2,7 @@ static char * maximize_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/maximize-prelight.xpm b/xfwm4/maximize-prelight.xpm index 6a73981..342bddb 100755 --- a/xfwm4/maximize-prelight.xpm +++ b/xfwm4/maximize-prelight.xpm @@ -2,7 +2,7 @@ static char * maximize_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm index 6a73981..342bddb 100755 --- a/xfwm4/maximize-pressed.xpm +++ b/xfwm4/maximize-pressed.xpm @@ -2,7 +2,7 @@ static char * maximize_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm index a34f44a..fa463e7 100755 --- a/xfwm4/maximize-toggled-active.xpm +++ b/xfwm4/maximize-toggled-active.xpm @@ -2,8 +2,8 @@ static char * maximize_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm index 914eed8..962e5e3 100755 --- a/xfwm4/maximize-toggled-inactive.xpm +++ b/xfwm4/maximize-toggled-inactive.xpm @@ -2,7 +2,7 @@ static char * maximize_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm index 0c7ed43..c4c45a2 100755 --- a/xfwm4/maximize-toggled-prelight.xpm +++ b/xfwm4/maximize-toggled-prelight.xpm @@ -2,7 +2,7 @@ static char * maximize_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm index 0c7ed43..c4c45a2 100755 --- a/xfwm4/maximize-toggled-pressed.xpm +++ b/xfwm4/maximize-toggled-pressed.xpm @@ -2,7 +2,7 @@ static char * maximize_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/menu-active.xpm b/xfwm4/menu-active.xpm index 3ec59e2..89a9597 100755 --- a/xfwm4/menu-active.xpm +++ b/xfwm4/menu-active.xpm @@ -2,7 +2,7 @@ static char * menu_active_xpm[] = { "24 16 2 1", " c None", -". c #2D2D2D", +". c #444444", "........................", "........................", "........................", diff --git a/xfwm4/menu-inactive.xpm b/xfwm4/menu-inactive.xpm index bd7c7e4..e1cba46 100755 --- a/xfwm4/menu-inactive.xpm +++ b/xfwm4/menu-inactive.xpm @@ -2,7 +2,7 @@ static char * menu_inactive_xpm[] = { "24 16 2 1", " c None", -". c #2D2D2D", +". c #444444", "........................", "........................", "........................", diff --git a/xfwm4/menu-prelight.xpm b/xfwm4/menu-prelight.xpm index 958dbb6..c1ca9ae 100755 --- a/xfwm4/menu-prelight.xpm +++ b/xfwm4/menu-prelight.xpm @@ -2,7 +2,7 @@ static char * menu_prelight_xpm[] = { "24 24 2 1", " c None", -". c #2D2D2D", +". c #444444", "........................", "........................", "........................", diff --git a/xfwm4/menu-pressed.xpm b/xfwm4/menu-pressed.xpm index d546a2c..cfa77c9 100755 --- a/xfwm4/menu-pressed.xpm +++ b/xfwm4/menu-pressed.xpm @@ -2,7 +2,7 @@ static char * menu_pressed_xpm[] = { "24 24 2 1", " c None", -". c #2D2D2D", +". c #444444", "........................", "........................", "........................", diff --git a/xfwm4/shade-active.xpm b/xfwm4/shade-active.xpm index 4dac8e8..4caf24e 100755 --- a/xfwm4/shade-active.xpm +++ b/xfwm4/shade-active.xpm @@ -2,8 +2,8 @@ static char * shade_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/shade-inactive.xpm b/xfwm4/shade-inactive.xpm index 9751094..3b42c60 100755 --- a/xfwm4/shade-inactive.xpm +++ b/xfwm4/shade-inactive.xpm @@ -2,7 +2,7 @@ static char * shade_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm index e50b07a..69ce622 100755 --- a/xfwm4/shade-prelight.xpm +++ b/xfwm4/shade-prelight.xpm @@ -2,7 +2,7 @@ static char * shade_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm index e50b07a..69ce622 100755 --- a/xfwm4/shade-pressed.xpm +++ b/xfwm4/shade-pressed.xpm @@ -2,7 +2,7 @@ static char * shade_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/shade-toggled-active.xpm b/xfwm4/shade-toggled-active.xpm index 1421f70..7464780 100755 --- a/xfwm4/shade-toggled-active.xpm +++ b/xfwm4/shade-toggled-active.xpm @@ -2,8 +2,8 @@ static char * shade_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/shade-toggled-inactive.xpm b/xfwm4/shade-toggled-inactive.xpm index 1e3e4bf..847bb3b 100755 --- a/xfwm4/shade-toggled-inactive.xpm +++ b/xfwm4/shade-toggled-inactive.xpm @@ -2,7 +2,7 @@ static char * shade_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm index 0cecaba..8af2d64 100755 --- a/xfwm4/shade-toggled-prelight.xpm +++ b/xfwm4/shade-toggled-prelight.xpm @@ -2,7 +2,7 @@ static char * shade_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm index 0cecaba..8af2d64 100755 --- a/xfwm4/shade-toggled-pressed.xpm +++ b/xfwm4/shade-toggled-pressed.xpm @@ -2,7 +2,7 @@ static char * shade_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/stick-active.xpm b/xfwm4/stick-active.xpm index c8610f8..c7fc821 100755 --- a/xfwm4/stick-active.xpm +++ b/xfwm4/stick-active.xpm @@ -2,8 +2,8 @@ static char * stick_active_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/stick-inactive.xpm b/xfwm4/stick-inactive.xpm index d4cc7fe..41fac3d 100755 --- a/xfwm4/stick-inactive.xpm +++ b/xfwm4/stick-inactive.xpm @@ -2,7 +2,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/stick-prelight.xpm b/xfwm4/stick-prelight.xpm index ea2a259..0d1418e 100755 --- a/xfwm4/stick-prelight.xpm +++ b/xfwm4/stick-prelight.xpm @@ -2,7 +2,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm index ea2a259..0d1418e 100755 --- a/xfwm4/stick-pressed.xpm +++ b/xfwm4/stick-pressed.xpm @@ -2,7 +2,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/stick-toggled-active.xpm b/xfwm4/stick-toggled-active.xpm index 25de32c..ee04ce3 100755 --- a/xfwm4/stick-toggled-active.xpm +++ b/xfwm4/stick-toggled-active.xpm @@ -2,8 +2,8 @@ static char * stick_toggled_active_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", -"+ c #DCDCDC", +". c #444444", +"+ c #eeeeee", "........................", "........................", "........................", diff --git a/xfwm4/stick-toggled-inactive.xpm b/xfwm4/stick-toggled-inactive.xpm index c33b36e..9dec10a 100755 --- a/xfwm4/stick-toggled-inactive.xpm +++ b/xfwm4/stick-toggled-inactive.xpm @@ -2,7 +2,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #888888", "........................", "........................", diff --git a/xfwm4/stick-toggled-prelight.xpm b/xfwm4/stick-toggled-prelight.xpm index 5763b9b..1575562 100755 --- a/xfwm4/stick-toggled-prelight.xpm +++ b/xfwm4/stick-toggled-prelight.xpm @@ -2,7 +2,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm index 5763b9b..1575562 100755 --- a/xfwm4/stick-toggled-pressed.xpm +++ b/xfwm4/stick-toggled-pressed.xpm @@ -2,7 +2,7 @@ static char * stick_toggled_prelight_xpm[] = { "24 24 3 1", " c None", -". c #2D2D2D", +". c #444444", "+ c #f0544c s active_color_1", "........................", "........................", diff --git a/xfwm4/themerc b/xfwm4/themerc index e345ddd..740d09c 100755 --- a/xfwm4/themerc +++ b/xfwm4/themerc @@ -2,7 +2,7 @@ # Author: Satyajit Sahoo # License: GPL-3.0+ -active_text_color=#dcdcdc +active_text_color=#eeeeee inactive_text_color=#888888 button_offset=3 button_spacing=0 diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm index 0dbc3ab..52fb899 100755 --- a/xfwm4/title-1-active.xpm +++ b/xfwm4/title-1-active.xpm @@ -3,7 +3,7 @@ static char * title_1_active_xpm[] = { "2 26 3 1", " c None", ". c #484848", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-1-inactive.xpm b/xfwm4/title-1-inactive.xpm index e8a927a..212d7aa 100755 --- a/xfwm4/title-1-inactive.xpm +++ b/xfwm4/title-1-inactive.xpm @@ -3,7 +3,7 @@ static char * title_1_inactive_xpm[] = { "2 26 3 1", " c None", ". c #393939", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm index 4c7fd81..7f234ff 100755 --- a/xfwm4/title-2-active.xpm +++ b/xfwm4/title-2-active.xpm @@ -3,7 +3,7 @@ static char * title_2_active_xpm[] = { "2 26 3 1", " c None", ". c #484848", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm index 9a165cc..e5cabe3 100755 --- a/xfwm4/title-2-inactive.xpm +++ b/xfwm4/title-2-inactive.xpm @@ -3,7 +3,7 @@ static char * title_2_inactive_xpm[] = { "2 26 3 1", " c None", ". c #393939", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm index 372d7af..b2829b9 100755 --- a/xfwm4/title-3-active.xpm +++ b/xfwm4/title-3-active.xpm @@ -3,7 +3,7 @@ static char * title_3_active_xpm[] = { "2 26 3 1", " c None", ". c #484848", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm index 81157b1..1eacd85 100755 --- a/xfwm4/title-3-inactive.xpm +++ b/xfwm4/title-3-inactive.xpm @@ -3,7 +3,7 @@ static char * title_3_inactive_xpm[] = { "2 26 3 1", " c None", ". c #393939", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm index 85aa732..707d2a5 100755 --- a/xfwm4/title-4-active.xpm +++ b/xfwm4/title-4-active.xpm @@ -3,7 +3,7 @@ static char * title_4_active_xpm[] = { "2 26 3 1", " c None", ". c #484848", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm index cd1e555..4a86d59 100755 --- a/xfwm4/title-4-inactive.xpm +++ b/xfwm4/title-4-inactive.xpm @@ -3,7 +3,7 @@ static char * title_4_inactive_xpm[] = { "2 26 3 1", " c None", ". c #393939", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm index c88372c..31316b8 100755 --- a/xfwm4/title-5-active.xpm +++ b/xfwm4/title-5-active.xpm @@ -3,7 +3,7 @@ static char * title_5_active_xpm[] = { "2 26 3 1", " c None", ". c #484848", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm index e1385ff..aa33f4c 100755 --- a/xfwm4/title-5-inactive.xpm +++ b/xfwm4/title-5-inactive.xpm @@ -3,7 +3,7 @@ static char * title_5_inactive_xpm[] = { "2 26 3 1", " c None", ". c #393939", -"+ c #2D2D2D", +"+ c #444444", "..", "++", "++", diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm index 4dc55d6..675afd3 100755 --- a/xfwm4/top-left-active.xpm +++ b/xfwm4/top-left-active.xpm @@ -4,7 +4,7 @@ static char * top_left_active_xpm[] = { " c None", ". c #484848", "+ c #343434", -"@ c #2D2D2D", +"@ c #444444", " .", ".+", ".@", diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm index 834acf1..0a922d8 100755 --- a/xfwm4/top-left-inactive.xpm +++ b/xfwm4/top-left-inactive.xpm @@ -4,7 +4,7 @@ static char * top_left_inactive_xpm[] = { " c None", ". c #393939", "+ c #303030", -"@ c #2D2D2D", +"@ c #444444", " .", ".+", ".@", diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm index 9558840..3ed6265 100755 --- a/xfwm4/top-right-active.xpm +++ b/xfwm4/top-right-active.xpm @@ -4,7 +4,7 @@ static char * top_right_active_xpm[] = { " c None", ". c #484848", "+ c #343434", -"@ c #2D2D2D", +"@ c #444444", ". ", "+.", "@.", diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm index 5776746..e847a56 100755 --- a/xfwm4/top-right-inactive.xpm +++ b/xfwm4/top-right-inactive.xpm @@ -4,7 +4,7 @@ static char * top_right_inactive_xpm[] = { " c None", ". c #393939", "+ c #303030", -"@ c #2D2D2D", +"@ c #444444", ". ", "+.", "@.", From 0edb0d13e4a8478165b80150dfa3fd6239333334 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 31 May 2015 21:54:13 +0530 Subject: [PATCH 48/73] Style headerbar close button --- gtk-3.0/scss/widgets/_toolbar.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss index ab8d98f..f8866ea 100755 --- a/gtk-3.0/scss/widgets/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -102,17 +102,20 @@ &:hover, &:hover:focus { background-image: none; background-color: transparent; + color: $selected_bg-color; box-shadow: none; } &:active, &:active:hover { background-image: none; background-color: transparent; + color: shade($selected_bg_color, .9); box-shadow: none; } &:backdrop { background: none; + color: mix($titlebar_fg_color, $titlebar_bg_color, .6); icon-shadow: none; } } From f30b5ec971d67c631f8b33fc5dd38f2ad6c8d7b1 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 31 May 2015 22:26:05 +0530 Subject: [PATCH 49/73] Fix scrollbars --- gtk-3.0/scss/widgets/_button.scss | 27 +++---- gtk-3.0/scss/widgets/_scrollbar.scss | 115 ++++++++++++++++----------- 2 files changed, 81 insertions(+), 61 deletions(-) diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index f54d96b..60c81cd 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -2,6 +2,8 @@ ! Buttons **********/ +$shadow_strength: .3; + @include exports("button_extends") { %button { padding: $spacing ($spacing + 2px); @@ -73,16 +75,13 @@ } @mixin linked_button($bg) { - $border_strength: if(lightness($bg) > 50, 0, .1); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - @extend %linked_button; - box-shadow: inset -1px 0 border_normal(rgba(0,0,0,.12 + $border_strength)), + box-shadow: inset -1px 0 border_normal(rgba(0,0,0,.12)), 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); &:focus, &:hover { - box-shadow: inset -1px 0 border_focus(rgba(0,0,0,.12 + $border_strength)), + box-shadow: inset -1px 0 border_focus(rgba(0,0,0,.12)), 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } @@ -90,7 +89,7 @@ &:active:focus, &:active:hover:focus, &:checked, &:checked:hover, &:checked:focus, &:checked:hover:focus { - box-shadow: inset -1px 0 border_active(rgba(0,0,0,.12 + $border_strength)), + box-shadow: inset -1px 0 border_active(rgba(0,0,0,.12)), inset 0 1px alpha($dark_shadow, .07), inset 0 -1px alpha($dark_shadow, .05); } @@ -120,28 +119,26 @@ } @mixin button($bg, $fg) { - $border_strength: if(lightness($bg) > 50, 0, .1); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - @extend %button; - @include linear-gradient(shade($bg, 1.2)); - @include border(rgba(0,0,0,.12 + $border_strength)); + @include linear-gradient(shade($bg, 1.3)); + @include border(rgba(0,0,0,.12)); color: $fg; box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); + border-color: alpha($bg, 0); &.flat { - border-color: transparent; - background-color: transparent; + border-color: alpha($bg, 0); + background-color: alpha($bg, 0); background-image: none; box-shadow: none; } &, &.flat { &:focus, &:hover { - @include linear-gradient(shade($bg, 1.2)); - @include border(rgba(0,0,0,.2 + $border_strength)); + @include linear-gradient(shade($bg, 1.4)); + border-color: alpha($bg, 0); box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } diff --git a/gtk-3.0/scss/widgets/_scrollbar.scss b/gtk-3.0/scss/widgets/_scrollbar.scss index 969ece6..bfc210e 100644 --- a/gtk-3.0/scss/widgets/_scrollbar.scss +++ b/gtk-3.0/scss/widgets/_scrollbar.scss @@ -3,61 +3,84 @@ ************/ @include exports("scrollbar") { - * { - -GtkRange-slider-width: 8; - -GtkRange-stepper-spacing: 0; - -GtkRange-trough-border: $spacing; - -GtkRange-trough-under-steppers: 1; - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - -GtkScrollbar-min-slider-length: 80; - -GtkScrolledWindow-scrollbar-spacing: 0; - -GtkScrolledWindow-scrollbars-within-bevel: 1; - } + * { + -GtkRange-slider-width: 8; + -GtkRange-stepper-spacing: 0; + -GtkRange-trough-border: 2; + -GtkRange-trough-under-steppers: 1; + -GtkScrollbar-has-backward-stepper: false; + -GtkScrollbar-has-forward-stepper: false; + -GtkScrollbar-min-slider-length: 80; + -GtkScrolledWindow-scrollbar-spacing: 0; + -GtkScrolledWindow-scrollbars-within-bevel: 1; + } - .scrollbar { - border: none; - padding: 0; + .scrollbar { + border: 0; + padding: 0; - &.button { - &, &:active, &:active:hover { - border-width: 0; - border-radius: 0; - background-color: transparent; - background-image: none; - color: shade($bg_color, 0.6); - } - } + &.button { + &, &:active, &:active:hover { + border-width: 0; + border-radius: 0; + background-color: transparent; + background-image: none; + color: alpha($fg_color, 0.5); + } + } - &.slider, &.slider.vertical { - border: none; - border-radius: $roundness; - background-color: mix($bg_color, $fg_color, 0.21); + &.slider, &.slider.vertical { + border: 0; + border-radius: $roundness; + background-color: shade($bg_color, 0.5); - &:hover { background-color: $selected_bg_color; } + &:hover { background-color: shade($bg_color, 0.3); } - &:active { background-color: shade($selected_bg_color, .9); } + &:active { background-color: $selected_bg_color; } - &.fine-tune:prelight:active { border: 2px solid transparent; } - } - } + &.fine-tune:prelight:active { border: 2px solid transparent; } + } - .scrollbars-junction, - .scrollbar.trough { - border: none; - border-radius: 0; - background-color: $bg_color; - background-image: none; - } + // overlay scrolling indicator + &.overlay-indicator { + &:not(.dragging):not(.hovering) { + opacity: 0.5; - /* overlay scrollbar */ - OsThumb, OsScrollbar { - color: shade($bg_color, 0.7); + -GtkRange-slider-width: 4px; - &:selected { background-color: $selected_bg_color; } + .slider { + margin: 0; + background-color: $fg_color; + background-clip: padding-box; + } - &:active { background-color: $selected_bg_color; } + .trough { + border-style: none; + background-color: transparent; + } + } - &:insensitive { background-color: shade($bg_color, 0.9); } - } + &.dragging, &.hovering { opacity: 0.7; } + } + } + + .scrollbars-junction, + .scrollbars-junction.frame, + .scrollbar.trough { + border: 0; + border-radius: 0; + background-color: $bg_color; + background-image: none; + } + + // ubuntu overlay scrollbars + OsThumb, OsScrollbar { + color: shade($bg_color, 0.7); + + &:selected { background-color: $selected_bg_color; } + + &:active { background-color: $selected_bg_color; } + + &:insensitive { background-color: shade($bg_color, 0.9); } + } } From bf32925cb7efe1f17887ada902ae5919d52440ce Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Thu, 4 Jun 2015 21:49:45 +0530 Subject: [PATCH 50/73] New assets! --- gtk-3.0/assets/assets.sketch | Bin 335872 -> 0 bytes gtk-3.0/assets/checkbox-checked-dark.png | Bin 469 -> 280 bytes gtk-3.0/assets/checkbox-checked-dark.svg | 7 ------- .../checkbox-checked-insensitive-dark.png | Bin 298 -> 168 bytes .../checkbox-checked-insensitive-dark.svg | 9 --------- .../assets/checkbox-checked-insensitive.png | Bin 282 -> 163 bytes .../assets/checkbox-checked-insensitive.svg | 9 --------- gtk-3.0/assets/checkbox-checked.png | Bin 522 -> 280 bytes gtk-3.0/assets/checkbox-checked.svg | 7 ------- gtk-3.0/assets/checkbox-mixed-dark.png | Bin 349 -> 197 bytes gtk-3.0/assets/checkbox-mixed-dark.svg | 7 ------- .../assets/checkbox-mixed-insensitive-dark.png | Bin 202 -> 109 bytes .../assets/checkbox-mixed-insensitive-dark.svg | 9 --------- gtk-3.0/assets/checkbox-mixed-insensitive.png | Bin 182 -> 106 bytes gtk-3.0/assets/checkbox-mixed-insensitive.svg | 9 --------- gtk-3.0/assets/checkbox-mixed.png | Bin 382 -> 197 bytes gtk-3.0/assets/checkbox-mixed.svg | 7 ------- gtk-3.0/assets/checkbox-unchecked-dark.png | Bin 233 -> 136 bytes gtk-3.0/assets/checkbox-unchecked-dark.svg | 6 ------ .../checkbox-unchecked-insensitive-dark.png | Bin 172 -> 94 bytes .../checkbox-unchecked-insensitive-dark.svg | 6 ------ .../assets/checkbox-unchecked-insensitive.png | Bin 153 -> 97 bytes .../assets/checkbox-unchecked-insensitive.svg | 6 ------ gtk-3.0/assets/checkbox-unchecked.png | Bin 252 -> 157 bytes gtk-3.0/assets/checkbox-unchecked.svg | 6 ------ gtk-3.0/assets/grid-selection-checked-dark.png | Bin 813 -> 362 bytes gtk-3.0/assets/grid-selection-checked-dark.svg | 7 ------- gtk-3.0/assets/grid-selection-checked.png | Bin 883 -> 361 bytes gtk-3.0/assets/grid-selection-checked.svg | 7 ------- .../assets/grid-selection-unchecked-dark.png | Bin 306 -> 157 bytes .../assets/grid-selection-unchecked-dark.svg | 6 ------ gtk-3.0/assets/grid-selection-unchecked.png | Bin 347 -> 168 bytes gtk-3.0/assets/grid-selection-unchecked.svg | 6 ------ .../assets/menuitem-checkbox-checked-hover.png | Bin 212 -> 128 bytes .../assets/menuitem-checkbox-checked-hover.svg | 5 ----- .../menuitem-checkbox-checked-insensitive.png | Bin 215 -> 126 bytes .../menuitem-checkbox-checked-insensitive.svg | 5 ----- gtk-3.0/assets/menuitem-checkbox-checked.png | Bin 426 -> 168 bytes gtk-3.0/assets/menuitem-checkbox-checked.svg | 5 ----- .../assets/menuitem-checkbox-mixed-hover.png | Bin 114 -> 81 bytes .../assets/menuitem-checkbox-mixed-hover.svg | 5 ----- .../menuitem-checkbox-mixed-insensitive.png | Bin 109 -> 79 bytes .../menuitem-checkbox-mixed-insensitive.svg | 5 ----- .../menuitem-checkbox-mixed-selected.svg | 5 ----- gtk-3.0/assets/menuitem-checkbox-mixed.png | Bin 228 -> 92 bytes gtk-3.0/assets/menuitem-checkbox-mixed.svg | 11 ----------- .../assets/menuitem-radio-checked-hover.png | Bin 171 -> 102 bytes .../assets/menuitem-radio-checked-hover.svg | 5 ----- .../menuitem-radio-checked-insensitive.png | Bin 181 -> 102 bytes .../menuitem-radio-checked-insensitive.svg | 5 ----- gtk-3.0/assets/menuitem-radio-checked.png | Bin 319 -> 118 bytes gtk-3.0/assets/menuitem-radio-checked.svg | 5 ----- gtk-3.0/assets/radio-checked-dark.png | Bin 593 -> 388 bytes gtk-3.0/assets/radio-checked-dark.svg | 7 ------- .../assets/radio-checked-insensitive-dark.png | Bin 473 -> 175 bytes .../assets/radio-checked-insensitive-dark.svg | 9 --------- gtk-3.0/assets/radio-checked-insensitive.png | Bin 389 -> 188 bytes gtk-3.0/assets/radio-checked-insensitive.svg | 9 --------- gtk-3.0/assets/radio-checked.png | Bin 637 -> 388 bytes gtk-3.0/assets/radio-checked.svg | 7 ------- gtk-3.0/assets/radio-mixed-dark.png | Bin 529 -> 370 bytes gtk-3.0/assets/radio-mixed-dark.svg | 7 ------- .../assets/radio-mixed-insensitive-dark.png | Bin 449 -> 160 bytes .../assets/radio-mixed-insensitive-dark.svg | 9 --------- gtk-3.0/assets/radio-mixed-insensitive.png | Bin 349 -> 179 bytes gtk-3.0/assets/radio-mixed-insensitive.svg | 9 --------- gtk-3.0/assets/radio-mixed.png | Bin 603 -> 370 bytes gtk-3.0/assets/radio-mixed.svg | 7 ------- gtk-3.0/assets/radio-unchecked-dark.png | Bin 485 -> 234 bytes gtk-3.0/assets/radio-unchecked-dark.svg | 6 ------ .../radio-unchecked-insensitive-dark.png | Bin 420 -> 143 bytes .../radio-unchecked-insensitive-dark.svg | 6 ------ gtk-3.0/assets/radio-unchecked-insensitive.png | Bin 335 -> 170 bytes gtk-3.0/assets/radio-unchecked-insensitive.svg | 6 ------ gtk-3.0/assets/radio-unchecked.png | Bin 517 -> 289 bytes gtk-3.0/assets/radio-unchecked.svg | 6 ------ 76 files changed, 258 deletions(-) delete mode 100644 gtk-3.0/assets/assets.sketch delete mode 100644 gtk-3.0/assets/checkbox-checked-dark.svg delete mode 100644 gtk-3.0/assets/checkbox-checked-insensitive-dark.svg delete mode 100644 gtk-3.0/assets/checkbox-checked-insensitive.svg delete mode 100644 gtk-3.0/assets/checkbox-checked.svg delete mode 100644 gtk-3.0/assets/checkbox-mixed-dark.svg delete mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg delete mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive.svg delete mode 100644 gtk-3.0/assets/checkbox-mixed.svg delete mode 100644 gtk-3.0/assets/checkbox-unchecked-dark.svg delete mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg delete mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive.svg delete mode 100644 gtk-3.0/assets/checkbox-unchecked.svg delete mode 100644 gtk-3.0/assets/grid-selection-checked-dark.svg delete mode 100644 gtk-3.0/assets/grid-selection-checked.svg delete mode 100644 gtk-3.0/assets/grid-selection-unchecked-dark.svg delete mode 100644 gtk-3.0/assets/grid-selection-unchecked.svg delete mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-hover.svg delete mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg delete mode 100644 gtk-3.0/assets/menuitem-checkbox-checked.svg delete mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg delete mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg delete mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg delete mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed.svg delete mode 100644 gtk-3.0/assets/menuitem-radio-checked-hover.svg delete mode 100644 gtk-3.0/assets/menuitem-radio-checked-insensitive.svg delete mode 100644 gtk-3.0/assets/menuitem-radio-checked.svg delete mode 100644 gtk-3.0/assets/radio-checked-dark.svg delete mode 100644 gtk-3.0/assets/radio-checked-insensitive-dark.svg delete mode 100644 gtk-3.0/assets/radio-checked-insensitive.svg delete mode 100644 gtk-3.0/assets/radio-checked.svg delete mode 100644 gtk-3.0/assets/radio-mixed-dark.svg delete mode 100644 gtk-3.0/assets/radio-mixed-insensitive-dark.svg delete mode 100644 gtk-3.0/assets/radio-mixed-insensitive.svg delete mode 100644 gtk-3.0/assets/radio-mixed.svg delete mode 100644 gtk-3.0/assets/radio-unchecked-dark.svg delete mode 100644 gtk-3.0/assets/radio-unchecked-insensitive-dark.svg delete mode 100644 gtk-3.0/assets/radio-unchecked-insensitive.svg delete mode 100644 gtk-3.0/assets/radio-unchecked.svg diff --git a/gtk-3.0/assets/assets.sketch b/gtk-3.0/assets/assets.sketch deleted file mode 100644 index aa048c3efd9dea2b415b3bf69efd6ad79d06da6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335872 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 Jxw@DHKvMPsw%GhH<%a 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

K)&t?>=;&v&ecT*^ zZZ^Mz9Gmk|fI^g@0_M57I<=@n6FOjqo4cT^&AQpV0MFsg8`#8Vt?G%XH?W zt1afXMb0fNk#oydenZwRdoimm_jrKbwwlw{xY(twdfKX|t?%;@X~{q)3R8wK8en!? z+u>u!RynuIxmCWcvTU8fEbP@*y=|3e>nc`r8eMHY&qZ{$^)B*km1o|sCdz5NvCzWqA4 zf?!8+zQvh4%2JhT=y8W0chtph?l9*ajdAvlrZl4^t+1av+A@H_$h2cPBbdl!rt&kh zS*$T z3mJCGuyYg(`4xM&b2V$R6FYaXi^Dj3r?Yon4uW0rNPxNSGS6Mk-<5(?q$Vv{$xlHF zGZbg;8izaYn#>fYVlKO8;CZmi{dc+lF8AMMk9O%`mu$P_+GR$&4sn#@oIs{s5t+;9(neBgXhqmlE|}1o;{)1vpw?c z=}r%N(HFb4$NuaY%^22mB?$IL#!l>Y@4az|k2&o%r@gP^?7bh7o{VJSJM78cB`ihf zdpEF|ZPqy6=1gy;YMmdLw* z5Th8wSR%5`MaTPp!>%4kL}8GsB2hGI_-nCpR+tYIr=dBA`UnAw2`nA?FTJPU$@_UNEJIvAg<5U3?M770BZlkM1Rr1Fbz`~N>94e8Lw zF?}4%Ng+yMM#suy_Qw{pgypPf6PwY+G3OuK$sS}lW(#+;7Jd0fup z_T{*2$7MQx5Ib`GD%X+eL|l@PjN~}~#Jf26#E0nU#Fxl$!oHlSK`rWF#wVK7fpEq% zkx5Kp8Z()V4o{rp8aKHe1SierWISHRY)-y`*_`~8)MOzm?taqUPnO_YI%025+MAR8 z7=|-XPR5xhui%a+@9~f)*oTwPg5Z=hPen%er=k;!*u)_|?taSMPkqEEq$C5G`5Zl* z%85Luitsh&amvn|s!t1A(VEWmW(X7b2^mkxcxoOCS;RIDa+Vv&drH>Ra-Np+bWG$s zEz9Xt=;m}fG9u6ET;!$_Ez!?u=bbi-)6P5Xywfvr-s#0G!LFXZ&VwL0^9rw`|1>gcQ;I%|K=-o>2HK16S4pQ5{Sp62JGkQ{eA z=WgfT!u`&DjQgFFya z4xX3od^sMYk6cAlrpcG4l)d>w=sY-S48aF1q7I=UwbYUz~Yy81~|#voG3>i_X7jH!eE+qRuZa z=T}y;iLLy`Zp`80F-~%t3tS9>OHqhRe9Y*QjF;^2rH{#k*>NG%9oU)GWxnwl{z$`Ek9tNuJl2F zSB7J@SH>_O-Cfzr0nT8Lul$ajSLD1R-&I+zhLDU`cpZ7Je#FOoMPa_CIQIK$CFHp( z&(%)YyQ}u@sytWaxoU=2&G4!`SC_JkUs=sM?9|nr?85A>nboy~$Z<`MYjRwZpvSkET5pr>ng{F<(= z9pX4AxyTjtb?r8HgW!4s?D=&$ufIwPQeke_^Pr>ar725!!l*$l8ezAtcR+X7?a+1S zTtCHGu5yE$*q!V4`?`*<+wbd7c*?UNxDlBsL?t?M+<1exc^8>($aF(*H}rNR6IsYb zUhMu2bG=a%*={sIwi}IULl^om5?$Rmf~+@Wy>W(fTtL83f|l`zHUAWf?N4;$6Mb}f>M~ttui?Cmbu)jgmZ7zqz-kd$M-a(D?R9iJh%EH&#e*I zwOiwvhxKlb5nTs$}K+QYl=V-N1ygS&R%uE)LWes?|QUGuqHi&l)} zSLD0;Omt?cC(XSs_#zW)$iJcve2V)G`SpvMRDKKL5h9?12e zH07wsS`Kn42p*cp!}uh?j33&whi~Aq9=^kS=;xt+9(wGDpQ8JRX7(^08PV0l&(YVz zFVWe<9O&(#91qJ-o=SX26>3wD`sn9jGuoq{hn>;S!=6lG8uM7lujuFDCU)^42p&Zy zF-b_q%gFvn_D3I(9(f)WMkkMS@<=C-#xRx%%wQICS%9-1nZ={UEMXbWe&p;&KF&N^ z%{n}f9v$Tbr#Z_xu5pvwL}Yvv1dpQ1u(y-MQB1>en76LdU^UY&VG6j=R7@wKAv9Z2F`dEg^%&L&%U8J z_TX75DpQp(>d}(c=>M5}Jlo7R_Th|YM>vkVJo6g!%=QRS2UV-_x89OlA>FSjGxAu$iswopLm0*g#xkDi{LE|?@C!RQ z$YG9fmaE(gB1L|UH+h?Pd5;hIgip~?T-PJF?u7<%`^u7PO)hed*62X0i~S zMPAHO)}ph>o7lxMPN1_WQ8B+LF-gcPyh;i_;3Lc{N;Yzk8(l?dNMqX21wBRSjvP_s zh%y-6MA1zYnWD%PMV=_~M3E&qXd_hEdHh z>O&p}k)kEUjz`l|G?}C2L`Tu&j3#F^`J%}eO_pd4X+m>aAy2ff=q}n6rZR(B%tcqx z^wtt}zmk1n0#_MQYOF?lH_OMs{+M2ltO*MlniKnzB^od-M^b zF})a!Im8&jXvU%c7-w~c1I#z3^I|$LRzMV@qN7;Oj};UB#L{)FcX*Ev_>eT% z;aKv;%F37ILm#p95$hX@QwRGHs~K{}>Oc?Vj5UEtOlB%`S->x>WGlb1Gl&%13}UCn z9AY~&wi(1WgV?!oZfxhqE=&=e9lIFLk6i-Y#V(EhV(Tw71A5|fmdc@>?-(N!Gz;}k&dIC964FV1&_ zVzzPYPaMymIBjUpkJy>3`o7jTR;+S`w8`!BhW*pZ{<3=X|i3s6! zKH?KTMOSg{R@_R|paFV{+ZZ|G$`RN6;_4=@ZsN)mSEjh~#FZzmJaP3CSC+Wu7tdMo zbP&(o#CbmiQH@OjW8OPyB}HF8)9UF_htqLRazSi7!ul^NPQf?Z^{fp7_T&i989S5S19% ztpxF~PYHCI;1zOG6Zc9mpI^{@f;FsX6Ps~Pf^Gc9PWIre1n!<-KZiKVP3~}?hdc@* zz2y9toc~fR;$x;SIsc{CcmuP1={<6hha!AKS;`SgU3Br%MBM+SDY*Yja=)~YMXW-` zmvr%xE)wcGp{^5VAT#co(Bmh}O98&3C|^^Y5|rdy>`FrCCv<*7^GRqP37gQImb9W1 zUFlA5`tlH2RfpQ#Ck|P8FNZJgIO$N1sl*s;(Z+8B&UN& zAusVVuVFVrKERnFW*Fkkkcw2NCT0?14k7Lw;_MK!2;rx)z zL8K(kO7aTt@;)E&F`tl%Pf3HjCvo2-?wiCclH|ZVlGvvt`Kf^Ca1!%K5{8*1`5qaQ zG^PczCb2U~CHM&bWiqVW?B9qZoQhAcflXNfUl=L9- zB$X%W1uh{^vUu2&WC;l&8E>J}WGVQHMhxQ&XYuEgxkIws*tuj6dBkI$@+^pyJQ7if zhPx(@L2R6t{2kuoL)<;Nc_mLzCbHoE$;~KvK?+lp(uAUq- zww;{Vwr$(#{g{+aMFpU|^Vlm5D!3Or=8;X1|5RBrRiIRk* zm>I?nmXKZ?CX(O;C3=rD>7qu5K7CNxK;D6R0_MDcw`=}sT| zF`QA1VIq@RgWW~h#&!;H5`9Mvps%Rk;*O&JKtz7!cm70YQFRqn{;0W-JF47K<%?R0 zs@QMT2DG6azN4rknS{=w`j(NnC^AkVw zH?fIJ0(2G4eMNJ_(Q48NJwH2aHg zR&*Ui_x9+2@h_2xOjM!~6ZaI|Jw?||^yH)SGC$TgM8HmCnIG#f{=qI|MJEf{$WI|kQ--S4Ll?28;{CB^;{CDYjVcU9mPpb2IP;E8@c1i z9Y?-6m8nJz8q$^!Ix>pM=q%1OX0Q;Q#aYHW>^6@3iKDYPPk6=)>@CixKrrri$QCyt z`iz?ddE)9bZW?@FadV)Xxb5(b$L)kJ;_4x;UBz{)apy3fHH5MaUBo@gaW3Fq<9*L> z{K??EE&#PjBOX2-LOcs=RGa3){}@!Uzgc`RTp=EggMx$#bN zCJ>Atmw0$v{8XeR9o`o|Bf5|8cH+C8__~i@2sabo&BS*z@k>ye1~jG_ZY6$8>>_>_ zI!gihknTN&FLBx1lPI2ZRANHPl8vx zL7s&F5{anTTf*4bT|%8EOhI|(ViyVhenP*W&^{7|;uaHbU?W>FGvPiCa)`s&SwcHY zc#8YzBB3r4KIaAcNa$u0ehCB<`KA(m$FKa3drBl*qA1vHB701fgPiCnk=-S#LPMI+ zlooWLGhG?QG!`LqqMhtU&O~x1k}r{biDXIilK%+fLm-$~p2QLO9(zihm}I0R4Ox*V zu{?=uQJZ?mlUSa_c9z)A63df#B9oZP4BU5OJ4>w7#49+*=Rh!tdrs04J5S>8lXydt z9@u#jJ5SP|0Ssa=Lm9zHyfw*a#$jHPWvpZk-k!w1l5A%ed+`1wc9i4{=efu&o}rH< zuLHrPKl3;CkkpMNbt6gLNK*YLt&g`Rl{KlXNo7si4H=Wll+?VWemCg@>^M6Ohs(OD{; zrOHcwN}#h;I!h&MDp^ytr7PX(!9YeanFTCn3Cq!6s!ixG)k&`M5SdfkZ|d;KnOe@& z@}-t9wJfPqlMZ`KodtPP7r-u4H=;56O5Kt+=qj~5spUyMlUd9~p49TBUc)-%NqvEf zT;V#mc#KX{KMw@c{6lu?v4WNO`!wE=W;?ss%RcsVkV72dI4AJdG^aR=d1;>Vg4cL^ z8v9Bcz;Zbinl zGNm;y-JirG0g15xbbdEo1~Osa=}J?bTGXLFely)F*5WtQ?O->4JDvBZJAn76JIpb> zJ)O6wJIxu+a|zw1dxiI>3*%iNnBEPf_x|(|@c#6^ne_Tk@BQh0GwFTf>GhC4C%Gv? zaVk&|In%p^^dnh{eCh2d{Z3>|Zzt)!KfO%pWk`RI2iSK8zm>snWhjAnXQ+a=XV7Z~ zy=Jig3=L^SQ<~A77PQ9QWoSzXgBgY#8AdaPsmx#&^I6C$^q65Cn~^ueIj(b)TYSy- zAD;ukj8TY2Okxw41SBFg>BvA%isC&POQDmD@?~s?d>K2?lRorgIFpevql_8tG~+Jz za1@y`+FQmO+~zLN_`s(?FjD}%Wh#k#%;X+3=`B-D>?D)h$yApH=rB_&bd^b-O!8!E zPba!Eim^;!5^`mlgU&MPEYmVpumPQA(pe^1Gs&9iD))H6L)=%UkAYxjHGEZST_LzAt@?>6#U1mPTY4nx(B3IB= zW_dEpljSEO@+NxSWXz_EY`Vy%>uhb%cQ$=z>p^eK$kv}hn3Zi9 zBN@eL#xNfDl1+wec9hM1WLr%r>)F6g_OOq`9OWDrxy%i2@i7q0{w)#s9{pw4SN1sM zBsclcQFa|=FN&VBSD-R_%C4X6-jm&XvWGAn`LgRLyL{QFGLMBUW)0hsF}sY}b(Q@w zPkF)nKrlx*!V`}KBqRyRNJ$#9(umfyLytN1m&1N?Ou^men8_SgqN5y}@eSoT#1YPN zJ`l|LEx+LXIsYIkX68(cnK`@Qd(GL8fegWZat_11oFlQDoMV}WxjAPs8}oC{XA#@* z?wsD8b07OT!D(d4c?sW9PIr{^0grgj%Rn&KPyET>{6kCdgc z<DTyo};Gnah1H2T*o+xJh`rNEfDk{mkQ<%5}pYBh^}(W zlUttL8OcOeF}0`4tO zHL6pCTGXa44QPnB=4nhb%*)f40Sw05^VnCO@wm-AQ}F&gc9drc%UQ`r_M(qGhq%oX z>>H-9OCXr9Fn%+i{_=T$KJU-x{rPI*?fJYtpSS0$hqvczLQ|U299`$rb-sbP*L=en z$tdhU-!x`0m-(!~H@(~3%G%NI>>hq9prm~ocY6%m@McazaH}ELhk&?XfX^B=;EivCjVoeVSaw|^V>s#@A-*e_#eL! znP|iyF7Zi0YSQ993&>l*o(kx)Kn?U+K(+#{>C6NsF_r1Kkpgp=$8uJ&hAkYxdkP#y zKLz9~@RG0j{^N5XSTKmL3P$8#WGpCS!R+KDH${-CpxY@}9s4a z>}DSaIfYIOpW|~NSR@|aRiqVd(S4B~^rj#EF{j92%qe0{5p#-ocabrSWdi0FS;1;T zS&try>_itu%r9c6Mchvjvx{8BPK(%Mkz0HW1dD!41l)Vk--t{cvf?`{S^|9(Ekjjm zP>aTd(1FhQ?V@@w>Q;*S{i43DqEFC&(HH2ysQ!zF@qw?iKcSCeLB1gz@)VPySTtf{ zKgHxJmK6IbmWuRbBo}$fPZ8uTW>3Xh(2CZ`R;&+0S;P{Svl6`((_1mU72AQG72C@( zF5x}JuJbMsEG}R1@W@wOU&a5&AGq=2(MgPq#bqq+c8Zs$B2}nMGnzA;k=SQ(dn`Vl zNlaxPr?|{D^jKVf#oq^lCBEYae&QFRpraD;Nk}>}kdxfBpab4tqAPY`+2>QJAC=%l2aCEa>Sos=An`!1=AlJi*3X11}NUAX6x$2h@VUgCyI$z1Ah{zcAG za+Z>>lzgRRDV3i>6r}|6l&V5i^i!%EJ?TS#Mj%fqc}lItos{xzm6E5FJf-$?2zg39 z!JbOJz@3+J=l&zw!O}V{9iAj~!Y)et{nCEFw0)Ew%n*h#95+$g%+gbs&J1Q^XQl0| z^a8e^i_*F%y@$Q%qx4BmbAe0T<{l4_t@QIiu#DZ7vBxrh;%>|6sEpl}Nl7+xl8d|) zqa>wiKpVOva~U^VW+HNyk+Y0^W#lU(OPPHf6S*wgDysw-HUlu2i0^?EiG=lT2Ay(%}rI)MYa4CqB^y((`s(1S_4`lW3_g4Le^@1 zk+a$$hBJ~ytY$5tY-2xqs&*CqRJ)1YRdZ9-?5*0XK(PAv{E42b%UnGpI;t*bbvdic zS6#m9vQ%$K6Wmz!R>)JmE4r&bof*t#9`;mSSJmaIE>HDy*i-dO$WvXO>h@Lr3G&qN zZPxf7fABYvh>cEb#HSc;xyEGfau0uB!y9V6;T<3O#OFY;W`H2!_>Ks8Yt0{sh

L zYs~~C#@lP!SIzWfA`9MM(~fEup*SU}L_PFTvoXCHf<4r9r!~hi0sYtX-kRQ7^A@-9 z)|#@`{1OP(`U~%>l@Rl5nO`d%`md$`S_LRW4Qk^iYMEI}r?plSiW#+bvWNY+$65zD z%n^=riqo9oEEl+p{nvWUTXa|JeIQs{SG9FjTTiurMn|>(#eLU~Mr?FeI~RE*~n(LvJd%c%U4^T+PbN&o7(nSCm#jz9n|r=b;{v)>-gO|RnbEo zzh9>g_0dJ0hBTrn&2X1>d@ptSGJwGhWfh*7dpgn!S?l&^1hUnghJ1B* zvYWje<2)C*$sO+ToR7HodO_lof>dP2j_TzjKXTNQqn?|pR};O}lc}Ce_2j81Pd$0+ z>8hSA^+sb>J^QKmm}k7?74D|q8{AI4_k0Kh>xU---}3`M;)d$~4;|IlQT-$&BRLt6 zv3^!`RbSTn_FiAk`lTpOMOx8`F8H^mem{mYfw?STA$D1RE$i9HF)pE}`ZCw|%{9j9K?+inj*Q6DATPRWP@e`grWq~KRReh%$kV{S8cb&v@-&dA!AjO3 zPlL0Z<09^(*{oh!G?e0-W#zwkmq>IM7ZmjFZ-}4jR+Sumoix72O>T3S`#j<)&jZ0G zKkz&9H;IPaP2_GOUlTXe#LYCxj2muJ0{7dbEX@d^13GJ>vnGA$kItHm!d{!`tjTQb zt;sN{wYi&VE@yK$)7;H8*Hd$QX>Kpg`(ZcDM=+6DEN2y~(NFVj>|{3=xPzXW z%iO|VTIi^SoGs*RAzusmTFBBO6It;cwaAS;EsCSN7Ag*+`5U{5WU zAWsW+$z3y`kkk++52e9OW1%ILT?w zaUO4Nd66ra*YZEY_<*;!w69hX_>qWse=9p`6_psoA~EUFN2@H9r5g6ost)yOg#KH3 zZ!7O?wT88LYb#k>9mn_C>K$gcGP~86K(Mv@Y_0p&KjR)+$0s%Jp>+l_(-)n#9>^%h zGJ(lVVJg#^!EEL+AN{wMr?viD>%X<$TFcT}Z>LU z`IEoVNt@UtAt`dU$xc1&zs+EVGMtf2LcTWgwUMWdUfP7RArNf)FHz8STff^jA%3^5 z-))-$J+$@vZFS!^6S`=d1^3uC2RZSrw9P|Bs!$z!XY!jMOW=*ZEx@G!X7|c*+u?#)6 zm%05(bkttX_HwqDuf2R7Wa;n?-|{^_Ay0>Y&|Qa2WF{Lq$%C#s$kRcd4))cdHSLh6 zgFGGj&>wj^EMyT&aZepqvl*Rs*v`E`u;VXySI5d!L-!pU(Ucan#GH<8XiIxKVOB?P z@7R?d^kxE+nZ^ueVtz;SJ1%DpcG}VWjyu_nU3NUgeIDYrJHFvdAlNCu5B!cUIu*wI zI~B+KJIURtD%EL#jGc7RNf(`T-RT1Q?xgQdcX@yrou2REVZaZ zQ*_a_GhOM2d+oZGt?XbIhcUCO9dLK7MZ(0#f@~Av%8$#?mz=%i>m^?=S$a)p7IRsEJiXSi7JKS- zj*DF3IuDSimpr|H;a7e~p5F5GwzJ-L)?1$5`6)nQis8O{+gWd&_O3=B7UQ1#M8nSe z`1?NI&?gyo-p9`Sq$M30$Vg_gksWXClaoA{*QW~AsfD-qv9CVOXi00lzmFaD=|x}q zGlD7Tqt8q>vI~3Y<3{?pkv?vukN*35Z(r~18<{A0YhPLWrpLSbn$=g|ef8b94PEF? zPX;lL3Al&8ce%$yUh(z!-|>-8d=3Qr1qc$J2-tnUANY}<`5(IOXZQV*AWOgG=&GNd z`eh{-`sr7c5|pAm6={b~`nlD9y&1w#wy1vN_@k& z=(~Rd8qx$e*Wd5=??7j|p^N_d@2~&<{jh`n0~n0?{mt(`oH@*A5ldJ~C>z+sc6M@z zqa5c9^7em@F8hB#p95qY;9dv(gL@i~o=jxHEe*&?Zi-Nxl2oD|-ZP*v`WYbKfMLit zU?h{6imnDMU=1=3ka56Ou5*(+JmoE6f#ARx*xA4&*x5jN2AV%GF9jIKcxEu0dFW!G z83Xk(a52kR&U*AQa5G!j$_{pOfy-Ru2C@u%ge(JfH1I!U8WbQLdK%=m21O(u$w^5n z+|!^u6h$|Ks#1-bG@>cZ(bFLP44RD0gZ%q8Xf1LMl5>!JgX9||%b;7hr$O#%&|~Bo zq@O|W0>Qz)vB6P@PAuZ0tHJUNmS?bkqX(CvJn{^dXRv(@ZiqaC2Qipo*wx@M*wtX2 z4xY(=o&|zK{-zeS@%KZ#VMr_7?vVC$pd+2>LN|KS3vV6LhyIv1#2pNo#az67hs3^jA8-iK~x8#_44Mf5#X-$UKO(5HdmuuS;vVcEz}A?$cq2})85bBC3s0+p$P z9K-B?nEel{gPw-zXqbM6_3(fHx36J(8m51mjrhRtCii?NSk2RX%A zuA!G8eoHr)G%-{T=q zc+Lx6fsmP2jN8}(c@{Xv1U5#i=6J#6F zm43{|y^L7EB9^e6m26}S+t|-(yl2D(bTUG|5ucE6WPl%t$S?du9Aq3R<4AiQS%hMg zN2ZZ>H?k2;arYzJ)0@5wKyM?@bA#LHZRCCIWTg8U`Iu+uaO695HBz3DU-Ntk1V??t zw?rlyF^P>_qmrVtQ92uyo{Z!|XQOmBO4d=bj;c=!TH$|&k8)$9`rxKUO=2q3n2G*I zEk%E$c5|G|$UMq^N4-JLQF4xwZ?t@)Wf>ip1lZ%~WXLl*6LvYe3RTh9=-SjnSEJ<_ zEzjuDjA1S!29?%yeckmyK*;J3HBh`D4rv6pP#y{i@?s)tMJ_mvmenLkR{^noe;hrbBs|l&8 zK|{QMLNh`zb3z}?oNyN3`h@G;;x6_x;XdX~c!b?dct#lJPWZ?t%%2z}JdyD3iQYXi z7O_b}a%7p9jtsb?iFwFJVTw|Z=Cq_0o#@RF-1|hknmCmi__ii4VHrA_sGo_Kka?oJ znP@K)<(w$zMENGkH%XRBad0n_5|I>nCS@cOm8n8?YEc(mO_FDlJd;M@8=N!_c_zs- zX)f+%l01_Ra)_hY)uhv0L8p^$1cH;lCk5r1$t?W+WN(?s@73^fOgIQ}r|TF;4@* zX%Ucb+VA{QnqX{Wf%HSB!aEqq7Q9`KMS ze4VYcY0r6uJx$Zww6}ra^oab5Ow;XX`d>sR7IDzy^u(kgJ??gTHsqaNky_Nj-A)?ikq9h1N}|+p6U9V{s{S|zu{}XcY)xHZ}=Ad&CuTrz0Htu zhKw_Elb8IIK&Ba$s7*Z@(2_26qbGWsae|BZR%YmJ#trOj#%=C!A05tkiLPeIGee#k zVYu%Zp98^}fABYvh=N=*(}cEkr5~di$9UZ0 zO#RKAhyG@6;Q(ild8Yl&e1@De<(w(sO!;QXGAkOsxmor&D?akfN{wC4DoZ)^HLD8M z(bX(@X2~;a2tyfxJhSAPHJw?=Gix_{*v}!3at@u&x)cb`{)R+&*X(w5K=-rz(4RpJ z#+=#1F=w_pv(1_9-Loe!ktvuvdkyQ@$Y%5~doQ|}ZT@UKo$Y>Rf1Q05JDqKhv+o6h za{~OpPq_Cve-WJoWW;{vWF?vHt1wQH@c&X1tXcn zd={~oWw`SN8`;bWuHc3i$h)C`ni}$e~ds_UECp_mBACYH?JWFEXhL^-co+a`uv9l$1wnUyKm8eWLYT~|^*x3@D zE@{blw&I?bMkEr^@q0`C-crA})bB0zdrLEsotzY+9NxIp8<*P2(!PvhEEBN*rS`vc z9{OLp6x}Yp!m~hdS$OPuSt8Pt7ria3g?!7-avr-_=1!K$xa>YUS@xK(zoC<5I$8D~ zVSGS8%j|5qewMrK<>oB^jtKm~k9h0ypV8fNZ(Z)K%M;_h%e{BG_b&I|<=(s8dzX9f z@}l?_mzTlYm$#-ZUFpF<2I1zGPhl4axQP7AuX3FS$iLjJFPC?PTr2)S7c2fH3hsVI z19ZEh4Iy--3+AophM6mR(wlztX8>}n7{YM$zhXX%Sb`m_2xS9qZN+wWa)_fG=M3j~ z%^Td>%5V6Ii2Ox#@==P~)J5i%4QYj5R?56m7b~Y@|0~y_la|*t5>|ynKc5no}tUehCu8Br;Vv(3+n6oAgX-P*$+~=CC$3E zdpzeA|M58xT>B&LWbLms$33hyb8S1i(UV^EWdMU2f_j1rWl92K$0&^Gw? zLgf$DRjAyda)-(n>UKiiPN*G+x}8wB6Y6$Cbr$M&Lfua2O>`Ejv(Tr!Kxd&J1HpCQ zqqB8Clbn>K#!aouOFoKIiZZzIbq#4uGjz3XGE;G5>z1RZb*qqLogC}7p__HOStrvv znbyg(PM&r0tkciBuUWnXg6qv%uY>j8zP<|8sexNsUz<9(rS%PHiEh@rr}ga!!CkG_ z)%uZ)!T#3U-}*_+M#l9E(A9cb*RMy;^;_7d>iE3Aj^iyOk*ZUsqdXg<5fgbf<|YsMaa$XU;+{6@bYmrYFrTA=;HF4K#@}!9hE0h`N($V< zrc|UME$PWbX1sM%R&rq8rV3Q18s5IizBVLXG2y-@XU=v#d z!7V?a(=9*qH#*r8l^E!Bi%z%1!JfC6xg{}4NJ=tf*rKB?1u23X-cpiM=wypdw&-L_ zUFy?<*0iM~ozcSp#f6H8#nSXRAD0 zM=_RhOk@^w@%vjBvIKLsnzMB^YgmhZwwk+jBRbl;1vk0%4ClGXC2n&M*|t9AIq&$$ z=Rj~-{}T;nDm0>SO!`3{|J*V*>p`3s$Gx7+P@xLs%4Q&F0-l*hidH>44*X-9i{ zFoa=@L|5Clv4ex0LQmVzBFA<)w%bg;wQ zcXX#0z3D?g`ZI{Zj6pX$+|G`PxSt(U(bbN%tjGR#*x!z=>_f&KhtbszS$AAU&K)h;L%&-^3sx>BvYX>~N1feeFs?YUJ4^&#qkLMV?*tX+UG#)~=Sg zr(HVT)s;CM;$Y_q)AecQHy*2Dh-g92KZY6{_Q%yK7R5x|p@wZ}0AoeeJfZ z-F)quZgHC@=weSaym?Pbym?Pr<4I zlWpHdHnRnJ_UUuq9^C9cH@iteqi_NT(0_NONk`6);#bg{oCwP`{# zCNZ0NxQ+cQ{ont;{*Jl(?Qy@k`|t6bm)OezyEx$82h2ZU9|!*6Phyc6dpMAejASMc zC6M7jSYjXG@>y&Iv7GnIx~VP=<1-% z2kqvdjt7`dI=qz~?85sG+tJ}uoaH<>c!E9-zYGMA{KTKw!;#2D zBPRMkQWtMMBI^-ZkH~tY3o;&&>4Ps}?EL8e_?^Gd z<)qW z?r=X4JgKXbfAcS~NQ|CNCPR*sa-7VJZcggvq)aDeIw{Xdc}~i6Qa>kUIoS!bPU_&K zx1T)A1uk-lD_rFUH+h6^PP(0w&v8E|U!$v25&0GSJ7s^T{vtXuo{EF6PRV*I4RW5! zNH%g%ky_NjH*u;NA#`U5!x@1cp0dMJ)0s&qJJHiAnNQtCN2laGCFd#mPRVy#meYR| ziKxUtp3_Ot-RWW!rxazWfUZuf@fmmU1yrp3f-USN)LL|2XoH!X8?m4hFNF4{me+lFrFnWXBBH$i}`2FKeLPd z*y$Pb&z$8vc6sI+ANd>zo{hkd{K20@BR;w~TOIE|TO02`EBD!!w5BsMp4G)!U7XeR zSzVuf#!I~Q?APD_5(u9AhHv?vABf1${KBuem2>8wGyk0ZoU@N}$w@^T(vppw0DLhJ=Y#xp6i7^&&hUfEYr}*xxF0V5Jx!1NzQPN=e$Gy^Wl;EyxiyIJMU)B zyP5N`aKq=*<9^R)p)A#?fzHnB?0gfNqqFlJvDfoDJ3k0}JHL|Egt86$IxpM#hdky9 z@|@S_`TqzD1TO^9&4mnPCM&wQpoa^!u%`?4X+#Je=!q^aj9?U#naV*QM%>LMcXH_}a$b`2(p}`cB;RFOF8{)B{K-Gab2$!i z$$^e8*TKBYZsD?dm(9C84D&8e!fq~ya)OI|;3HoG!7JbJE#_P?=gRLSqab#0r8PRg z5`ufX(gky_m~&+ybJ)gy^m$cxSAADk{r9i>?_V9lSSBFHRo~3j>C9jjvzf~R7P5%N z=;-Q7baeFqhdIhI?D^^??D*5jN87} zjULE)P1b9&UK@vu*JQe8-Zj5{?QM3R8>{RHQETX~cdGatJeToWl*>xP-Yk%)O!i z8+S1K#sj|2f5cOsVJ|oA<))q7{1M&Vl^Eb>h9(=+}2HZb<Sc?93uP5ExV;A_6udlH+EaD+cDAEZJpgtjN7}N4xQcB*=<>G%X+&q zb*P8E-flq$dNPcWxX0UW|F-^a&qRN>*Rz}B$b8#=Z$CuN+j8EP@3wq*WV!P%QLx85 zv5@CZGVJnB2}+``JLRc_uI|WlN1i*rk2?bxj68Sbxig8W$a7~K+u6lld;@n*qSHHP z`4kA=jY|>6F&=+^*BkE6Vs`@V0-_w$mULX5#K?@z!k@B7{R^I61Vba7t~_m{JZwU~K- z9eTLGiLIRCEEjOM_w{i94({N-JGlRh7re&~?tcjcAB5*S;t-GIq#`p}kn=$?+A^rK90)#4LNfg3L%;dZZ$8XMc69L2Z$B)6jvu;(hea{# zVR1@P8aMc`9F1v4OIp*0E_A0S{TRSV^!acclbMRH9=ef-JJ`t~+{;5dd#H0Or*(04j(%GY> z$n?nm9&KkAdpOEP?CsIDK=85N9;YB9cJWwmk8_X{_xU&vZs@TNAD2W|kL7tR&*Sp= zZXZ{r6>VuxN920k8=XDY+2f%M$NfFl*<+nOmi4i$kGHUw{n+c{lU(99FL=#=gav|6 z^!Fq@`g;DG+=bK%S?ui9>u6k(6}k^l2t)(jV`7dWy5?{^?EbaGwX5 z^Yk%Kc+M-#dg|>@-|&u)f#9>>_>+H#L}bi=X8yB;B*RXhng1*c*|5uJd8tJmn$m&} zbfg!9(Z#b}c>l9~c>goGpPk_x*OBp=E}rS)xvrm=M&Hl%{k#UXG2?lC8e!J+X0)Ug zt!YCD?&Y}*&+X{B`*=Qzv5aQ|GnvCY7PFL4Hn559?Bo)+xywED_gr5uz99y&h>MP1 z=;%cf^z8d+X##CP<{9lhGmL5^{PhrHrH-tZ+5eEmJY5gogF9h-Rg_vv*i(x9W)`gvUw znP0n`*Y@&S&ew9jmhZKEuVs0?0Qd5G87qxm1mDCb0sj7tH@r!YdwY|WY-A@VxyVC) z3gE483Q-jE-qfW5jq&z3_Vp$NxA~?s-v7pq-VA0KBbdls^zmj9yEu$JygA7k&ZGag zQSsKdvc8q|t*md;BI8?`-kSH;-rr7Q3e%XuLYAQCx0~3N4lVQG(u!@(2YEio^Wi>^cp347|-&uwW>Cpu%!=kA#E*__YjeD?0o0~p8<%>6uv`7B}y zdiWfQEJ2|m!qp_0{+qRk}Q>Lls$;I=Vi_Y2W z{ob|yy_xBYjQ{!0{~OCo-td<1`31lK-|zg%KY^hCMb{+46M=|CA}Y~{PE690fy`tj z8~G_j5lT{;DpaQ?^=Lp(1~G)8jAa`0*v(${bCAOv;{+GD%vJ93iZ{Fu1iuL)-#0Ok z@0-{pAvr0@NM2<8M#gWN(~{P-qdNl_$O0Czm}RVBHS5^UBVO~4@A*9t42B~XafweN z(xIbZPI6O%QdFiYgBXSP2gfr5GlNSpGx!!Wfe7w=3`EXwa)z5sD6)mqN4PbvxyiDOsQi`V7N%#?%8Ga>e zFfaTj%nSb=`?$eJJ_mvk5|Nl>*nNc5m=nRA2szMygm&0@gz4x#!ffWU0COUk6JagK zdC03kFrrQ)>MvqrMskr$T;(4Adl8@T9B+^K5_b~u4fYuE13w^VM7>0`*NFBSDGJev zMI7QHdnDN-r6N5U(NQEFMY6w0MbK3wSt2#Xdm?qD7rhz681xj$P9lYIjtj^f={7P) zdcg02VB~O^AKBcSsw8eokiAjWSvFUPh|Z>{)I2Np(rv&iHO^YqNgY+2q6tcku!>%QRIvwXB0W3 zxZfx}U>?meOF+0lNfnZegqDCbKjnH}2X0)dh zUFktj^dGe^{V+SKJwzSKFuujzM75Ww3y>$O4x_GMC7amFc61n3e^K=n^(4BAdLB0y zRYy@j@;`p$k3cY5kZ2^w-9&RY(ex56D>=wTValVUXgZ3vku8`RZ3hQ9%n|G;+9}*k zG&_oR0kfmIooJW2#&vvm(QfgcACM`U?xOw7U;G;gMh_5yNW>-{2}p{((eqP+QnM2cqTEG>C9&lOIXWJcB8xKSGmUn9`cws$Qu0vzXpOaWQ(D@81lu) zKqj(~mtqvB0+p#sJzCL*_Dm*}x!7fl^=xDla>S4$hC7R4e=+nHL#7xq#gHe4JTc^n zp{p2Qv-}O=&?(++NJCbfY_NFlKN1p`(~OiaCQ>%w{n% z#$17}V#*rR-ebxc)At(lAcwil6Q1F_i1|Ig@OK~>D+E+rDClBO>y|mM3-s z5+hISA{3AfAUWt7$?9tm=h;F5pcV4q7n`B;&^`? z?~fA?Hxnl-ImktBWQgN-;^-re`El$uPEG3IhT=4*GhNY3oC(ZCFLCq|M=x>o62~_f z=Mk@Y%R7ET*0?%|n~;oTMuxcADL`R#5VsQM#chRs#I=vOo!HGD_Hi6@;)Zb^{l~q? zW$YlX9mKVRxb7nE9q#e~JBjOd5R9j@c>0QGH}PVkr+D@f&z;0`C-Ksf zo-*hrp54T&MPr&EXS{CcBHmiQV?PHu%o)xhXS|y{#a+aE6$r*Ji>~8WqzZLufP0MZ zx8v(QzAoaorXBi--+_*F!9L=f9p6skk6}EMn8H-%vVcXnq4+D=#8$SW)A;hn_npVT z#{(YnHQPr%2Z9L_kraI-&_{w)=p;b~GU0v_Omo$WBfQQJS)pLym-UB&Zkgt8=@g;@#hC*k*eLD4DU5d|8OKC)pJWd6S;S(@NwSRP ztYR%@CGqwo8`#V?P7%g=E^-O;lbE060Z*~hB<3gi$p5g*B%cGpr140A+fJIAEMz4g z#nDC5{&;`V!FYdCxsy&{60?ypsVHS@m-H z!7JYIo*(!W2quq2Y~)X#47robom{@;ZYH^#NnQvyoV+^jH+dbp(vJb?EV<5-k7gV? zOFk2OO|G-#E3voa=eWRS?qFZZWlQl5;RugBDfF2lInh6M5U5bq7~-VnP8iGzKFxTlcB zWXCrgVjm&-v6GOJ$QV+N%E%hxWgFO@8*3Q`2$QL0kNld2lJOVxv(^r1h4&{ZmV zQpuBQ9rl!J6Y`{zC)EKCBTuR)xRX>bc+ES0LZ_*I3j|Xqrz~CA%Xj$u)ZUQ#3~ny< zMJ{oft6bv-x4DD2roP8R%uD?XpZNoCPid+K> zNYk2jbVUDYyf=+^rrE`AyfuxiX|AC2G~SlR{4`&1GilvNS~r^3{Im&3O?GmThy090 zuW9v~b{aDYWghmOb^(i6%raK8iq)(^rnGjD_87WLD^J?9=r8ScZgB@4rG3mB-s8U0 z{>aaPU^=~|(@Q$Nq|-~f3}i&kbUI1biav~C921ztY~~_ox)p3;8#@ER^s$LYd=in0 zw4}ptr_X{e(&r#I`beJ_yGUPsv~QLI=G<> zvSsLud>QOE!whDzh}GC%hOO*i7l$~@c`or2f8vfaMj$4!iGv&&<;a+ltmrMHOc`a$ zC{IRtGRl)tR~co==$ZSL_99c9!} z#?O4=k3cX}5E(N?LRXn&&1CPHo-J2 z7g@{T{aGvE{aNMCT8{>_M8>ST$f}F1y3VTWtT(xXw`TSGSzq#o_x!*|e&i>9<`>*b zR`audoo_$c>?2!T5|D_*q$V91$Vzq!P#Am4RtkBuHAR=%I-t*NvSl00XmpZo6I`(XPdTbk zohCG+J-W!zj{%He6x-OxLEJ`;Gnkpf4s)29!4?np!?Ejr3w5%Y4ph1}-lHZOM{%*#C- zyUD$Xy&UB!&v?lj-eXQ~b8>$U1oOlp8+MSV0Xomq1oxJw73SnICr@`KvYIXEGmq}_ z`mXZ&=Xw3}yuBFAFyzSVo5?$dv5aQ|lbFghrZWQ_<(-R;@@{1ZyV#9A=RJlU=MCc= zZY;06&g;hVdS6~U&HE8M%@>8ZB*4ApOGZlEcD@#L#GCSUp)a!L8^;FRRlY+U!OVPS z<#R{*E@M`{7rf$aAecW7c_~0i%3wzRN>ru_)p5u9Yg3Q<=s3TQ^XoXjj`R1SKW--f z5bQC(zVhoTzpnD@DE~|rvV>*WLH@PaZ~n8K$1UZzll+f(&1c+EemlzlcOY0G0+ESI zJVLO$0_m`$0`^nD%mR}MWghcc#8OtUk~NrJU>)n(#Ae(?fo+_^o(jlRKz9W$ahrQQ zz`hDR=X>m|!2kFac?-tE&I%^Q-U`ZAFgpdPi~b5Wq6y7tNo%^$9p6I1LFlib_Y~A$ z!Bxmta4Yf^bXx`Ox!_^+S5SWi^;S^Ef-)BTgTMGE5G)iCnF_@w3CT%GM)H!MLg=l~ zL}oDuy%k!3ofTTl5|*RGLL1RlA$bbPQ)oMGz0h7RaG7h|K(0cM&{-j!6?(%venMx3 zbXG{#Lb4W4NC>G(Lss%poGMhO25zyi{t7ooe}(%o65nKDnG4%*;dRJaSkA)o6_&5C zEQN1z7ke!H7w*)ccEif6;n$rW-x!O&??^ zIvjlzHNU967WM5F4P`FN*u)m}QuG|x(MwUi6xB;ny%Y;i3Nnz1%;Z7VVmc_+7QGi6 zz#xV&hVe|qtYRzKihC`#3-?hxz&H5);xTZS#p7Z3#S@X3q$ET4#dTj?_r=qa4tHBT z3nkH2aXl5ckK%eNu9xC^DQ+jlo8mr-cR)|YyV46C6`#Q@7O|9dtVhn`c2wMsivJr3 zmWV|hX)$#6s@GWskjb4mLunVY=iL%xy~sEKkNuULg>FiEQ^{2vLdKF|$XN0`H@JoO1aNc?xvLPO6_D9d)Ui<^jPX7`YI()DS1kr<04mh z$s6AD0l7;3hR#aqtki#jU}-m4Ix0FVt+UdymX@`2P6|;3w_ds&)p1j$+tPuKbU}Zm z2cW;w(^$w_WG-#TrH>(JX*o;FS6aT(vXuVFkJw}B&&X3Ih+URRM|$*CCM!A6RT+88 z$Wx{n&1r=^W#lQ-lRn5(W)5>%z+#rM9-Wri%nkks1j~9?+459E_hswRkR~+6oU$!w zNgLW@R#|T^+lj99U<~7##1y7tep&O&E@C-$TGsrsTiK3Xmi>;K+~x_-`JNB_%0Gc% zIbD>?kN1}=jQ5w5yIe&oQwJH#wL%x=bY1Q=`YxyMa@VVDkAx&91tDZ2E7{3IKC07zMl?o$<@Hs*AF~K$9y%(oqw-79 zQ~3>SMo;DSQ{H>Zdr$eZJVUfVDN8fj(~(Z}W(Z@LiCtBi!+ch-nziVtl71@PK;}yBrjor> zlCzSWmE@}=Uu9V;C&j%~PDNVeshpEs)TR#gX+%?WRau_O@>HJ0WTqicWqB$u!M#+L zr}7C-at6Dqe34t|wDLXv3k0iVpgId!h`+Dm4OKSa-l}Y4J3H9LZuYXD19)qdLmb7t zDtEZgBfPzeeN}mf+pO{t@2_G zyx2#Na#TQHHJc)1O&M#BVhna#b2>8B zbn`V=vW9hR=MYCY9thUbTP^oe%U#xTGqveGlO$W^NyI;*9#T0L-owFaZJS~{yGYb{x8En__!*~D%Rm;Q#o$#(Yd)SBW>zpEt^IX83I#)2KjyZMA zspH*s?&4dj^AL0E{K9Ac;4k!0Hv+n-Ykpljt?Pd3nq4;qc3RgS>t>)V<*7k!nxLP$ zc2(E6S62^p*J2-ay}#~eWUec7-2^C}WwxB&IWyg)G6{)LV_b^^S5DUDnfOy|39G@j4K!AH;s@ z+fV%{L?b4#NkVc`l99Z4PyIsZr@nmkn;~C)_fy{<>vu(0^#?E-8SBefe+%2#!EO$7 z20O0*miK(mNB+mp{Kmh5V1umWqab>0puYxnXhCb*(t*C{sKIbXGL0E5U=e4zhW9tP z%@fRQ@B?Nxw5NtpcWJitUYb0MISsD#y7$dNoM)EY8&I~qTAC0bHUZWo|uaS9;{s;sco7Xr35lKxk z%F}_4biv*m_rjdU<~05m-8bHieK&rL&Kp1H6>l-8u{n)@4FsFSA`5xZXA|8u*}zpE z@f3YD`M@XqZ4)=r;33}9)LWW9!+V;(#G9Jxs_EbS7YH`{2E8?lMoeOpfJCGsEq2$; zo110B?wZ+MGdpW$XU$sCnlALk4L4iOehzX3`J0_U=4O|Xx!FBrY4!%+RdchOo83Gv z<~L7CMlw;8Ml_{4Js84xW;2KRnB9CS@A&$gzM1B_Z~le9_!n<(5x|>Ugu}hGh)fis zqK6i;w1`6nGUMGXa*&fk6s0(2C`WZ_Q3sv0Xv_cxF^aKFV>)uSSb-h3c+Stbs}^p! zg`6$FAv_V$eM>W2n%A--b!kagy3-4tw=}Dzdu}<55uD@{?xUryTi(EZv~(XW?{JU% zxYw4CaU(6C@`Bg=$v=T$D?PQ+Q!72SicT!_(kdZ|NliNR)Jo1)a<v+a;Rje!heC}WwxWTxT%+s|MYvzfzu7O)U=+An1Vd)bc} z?cGUxJ+$}c_TJq764$xOBiwF#-L`iJ?RC&WmJX4KO+1p50=w;CryabjgWYu)#TdpR zXNQ@D;zm2HVjFhR!Tb)#I2j0bjDh|-x}T0o@w**Uq05fGg^uaTh)z3ZB?o49%tdbU zQIKlX#65MaM}1n*nznSJ3w;@YPCI^!JL_l{9hb45P3&e5a&~kZ9Y69{AlS*SJIUHf z51rzYjFiaRDKq(zrBe~~-^uTGT8jQVZDb2u*?}3IzGELc>0~dR4r6AgJ@p~ZHIY2nj&id*sTj#Rqt8;rgqLU1ja+=DO;vYaa4ajPlf=DJ^J88@kei zUW{WFOOd(jUiKkpS2?@N*Hyl*vUGioj=I`q*H6gP^-ul^1iK|C1^Vii7T;PoU3HVE zn>^jzcsDoRtr7Bclc$?qcC*WF@^qWZG-eWt{dHT8PP?t<0zUI`rQ||2=Y3gtB;BkN%8jA~N^z&K`4dGd*PP;cY#(BTo-`dd4FmiAahr zd+M^M-|v})?3mNjoSyl}PXP*IZqK6Fea{lqr2&o6dCz9FrxUXE>`8Bi@GT=4i@ZH` z-&1crH=(Ediid8$=@p*a`%$Emwdg- zQ4!xxuR6GeUae@$Fvc+fo%PaLuTb1WFP-(W+g^6qOJ}`yahLl%#LjxX#jbkE);lio zNq{`P_1QZGZnSr1bkn;fzKP!L&_!=O^qz!0^>$mmXR!=-)q5kl=)IqVoZ<{W^B4aH zf_(x+!OT8(*vHI1C8tbN@~ zUpf1_nZ9nOub%qaOJ95GI~Tj@yPOT|V04*I^*{S`n`dJ@a}UrR3bUjel19d&n{s&HB zDl^di!1ZimE8E$@0SZqvq64$&=>v+1PAMXu>J=}CK_f8jze5@GT1H#C&J9Z z_Axj)`WYNTKI~y|5sFcq3RI>lwWvc=TF{F2$U9hngLO7oUxW2EShm5-(AVJOoJ22! z&*8=fU*a~p8LXSZZfdam8T=F8G{oHuk#&fiL)^{~S%;(}BbmuV2})6xc62~*L;5h3 zVT@xUb~z-J<*Z~4zKbDWXStc70m7lbp>{J=heLHZREI;Oqr0K943%Z5n;I(5(3IHQ z&;k^uSRfF{~okr!`||a4}8K7hy96Ohy5D}ew&_Z^yMhW@b}+(!?#!P zoqT%>_welE z#t1!+(DMkhMl_}w&1peP+RzpmMs&aqMhwReMvP%B_Ap{5vvC_E7P5-9tY-_`ILkF| za1;HF(AS7hf#Aq!#2_|08mXg^iO|!?G^9sQBlR=Vdq#TC$kH@HzLEMFDc{IW^rjyJ z7{L@|94X^SU5(tw0S}S{z$E6efR(J~8u#)3QBQb_nWKKg%+VF`ZH}%@JsM&^qZ?!1=w{f>=vH*b+|k|X zf%&8R&>!E(Xzw2F-J@p{$`Y0%%jk7%z#Wa=!*?9w2zPkOb6)U)U->5x91|708WWQ^ zBqaqQ=xB_7##BS*G45uJy^N7_jGSZS8zbKsS;ox4y^LAJQsf!4kxg9W5?8swZFDt8 zo-y)_4M%t)AQHoI#yBb@b8t8Ov9R{<4vw`5axWvQXkMo9cX>f1j zGLe}qWFtE{$wOYebzFW5Vcxh})TII5KF+?zwZUzU>xlP{v!ihX8Nx6|;X4{9%eYl+ zW*csF+3K)&(0kz;%T%2E?IGQI`wV|-iu-uUh8!hXje#qW+k zjr$)T#yQTT^YJ<#??%U8=LWhTe~*v+$S?fHXZ{NWCj_yJ2~mhfd=g<76H=0j;@HK6 zN>rsD^^tReZYE4;IV)MsTI8OvlieIf#tFKZa5)g1Xde^pVqz}rVxnD7^!pP_p@)eT zs7w{AQv=;hw4;f3G|~Kt=1**hy-e&$ANtXs;n>Z@F-&AKq0D0e?scNP6YXfCE+?Ks zpA)}kyTeny@F)KSf|CO1X_B5M#UM6uNk&H8*(7h8R32F;$vLSuvQBD7OIp)~0Ssa& zD{wcH^fhS%`kHhQd!F=y4}9WB{s;soM<5bWai5c$(3TE##_vz=N_TqD8@)_6YqCxz zk6>u9oDn{1Dh^)%U?O@7Bu{KBv3YDz?6 zk(>}xkrw?-$w_YPcS;@H&lH)b=wymcrpP%(&MERuk#CADQ`WJOEo?`gDf*dmn8!Tf zIj?w&uBON{MV_e%NQhgWD$i7Tre-25@=UFceNC;6o0{sLrnW+-Q`<3xUEB`@r==r3 z{(hP_Ov^_>icpkdl%y18@y2Ntsf1geR*jnY-Dw^1?rGhyt7+apZ7|+H&3>kh#_Va+ znaNz{vxo0E#z`)6iQDL5y8D>!z0(tu6mOm`^K_Y~XCW^#PA^S4R-@nP>)C{TPxt%N z_hIMLk8qq5oaPK+oaF-MPd9)16<+d&_k7?7e&Y*&@?Ri0;~Sz912-}wKJw0xYes%b zAlr;8RK-qaG-oU;k#~l?Gd3XajIFqd8E#^Ro0uW*4Ebi<;1+jr4>SJYFaGA=KyYRx zQlvkq`L5S$$izct$%W+%q)&9?K| zDF`7I-Zk5d+1bg3+nt>U^JW*IFusA=-aK31v%PtCLt4?6_H@D9XZL3iLm0s*7GW>5 z*J3xb?PKtnWk%)X5qo&B7b=pQ+O~aS?e!S@Hh4b~Lvr?qO~z%2N?p=60YbeHh9x#xb3}oJYpFkMPF1&yaJjoO5NI=Wgbi zKQApgF=w9No>!Op=zE^N=jnT%zUP@auOpk-%pUe}kV72iD95q)d8au;82X=gfy=z$ zHShSI5B!Rb=ILkNzk%R37+Ukm0iA9EJC^96o;fxZ{)V?W-$z?=o% zz2G9=yui&YxX(jg;XW4p%x{6aKqZx3ihb7Hvi4KwF0Wm&PYO8If^mR%BXQ5Sf-%z#Et9 zf2r=5wngttcj9-K`rV~|cj*b-%+j;?{iWx*$R)0FgPYvqHurE#OLe?d$4hm*^lP3! z0>NcLA`pq_xUXf2(C4z`q{e+MD}|1hRiy^HTGj|Tm$`{$vslg!WL>t0@6f@rlgPWw zZ7;izEX$q*g3F8JcbAu@9M!2sZR%mha{E|r=gW1n+)kF;$#OH7yMg8H(a-Wue9K7e zWcfJ8GlSX8VIhlIgIz7RtL58}ce(zS>ukBcmg{Tz*KBXm*NP}aLoX}h5RU|;L^msR zv%;;dD1@6@;Y}+VAnOV_SF}Oa6~37jz39VGCNPPqY{kDDR_JZTAx?9KD_qAeS3Ke! zzLymr1HqN-OS3$R6~C&?PjG8SL$%34p-JkcPnLCDa%SXwNjpy9kI8SBN&a& zR?4(;BD2uh%6aH)EDcHf9`MBLR-n?c7M>xhg^uI>` zYi{#|w}IeVZ(Ey$EM!CGwcfe5Fm7h8%xk@EZC&J9E6>_}9N-{+e{C4&(dXLBTtlyG z&04G1wfDHs10G}c+NV6{Gk>7-wf~~`b&=8gx)`{Db@53-D$x8q$i+ zOvhcW)5*GdEMO5!(aXA39KtQElYiY+mw3ECUmww zE7>W4&eq%Wdiz~p3p-q|v-Lw5#&AY4nNVa~zZZS3-;X@&^|}5yr?`Y}HUx=4By_Ps z4;$=igWKBR9yjE}U2SlS8>*p;4NYlI2RbpAWvpa1TQGBj9d0ml!wWv}5j)vn4;#IC zquCqnVq;8Vk(~6{!A5toF)#TkgSi`!P;wiuKJAdL%CMbCZ0V9G=8=p+p3Q4n$42aJ^LFfRvrac3=4Bwb zB@cG7#qV$N`&;Z|OIh6FmI_p)3TAGpM?)IX7(3fyXIom)A6;zG#g=awjy|@y*)3D? zO>GHf3CnR$TV&g^0lVE|k6SKr869o0yDjhdjW7Jc-+|!P2t+0-A!MZ>GH= zBqJT(xg#^~a)(>lQ3IXts7nJ@;`er}Wg9!$gMN4H=K$_+$6=0fl2e@K4ClDWGhXrr zcd+9<`ro1d9lzricIa_uB=op5I&skBPW|u9gN}CUXlF$#A?Hpvv2zqNSb?lN*Wea+ z`aX8r(N1}Hx`Ul=V5clQuLOd->~)vl-Ibes*z2xR=zmu^%-B_hs_0~wTij(AyUg5G zkNW6mS0lR9i@x+{0Pb_wXvQ)LJK8me`Pk8}Wyrfrf4g+HOJBS6wd-rPyXb4zAN+-0 zc7H=SA`lbZ?AFchEeJq@w9 zJw54z&i2T(XAq;%*`D#}Y|k|2v5>{+Y>%va+}s|W?Fr*7*SOCM{>RV!!e{;q1os9B zPZH9T8=3c3rYdsom2_lIC_i+$i?UiS*JbT^v zUN^q?2jtl+&tALSYnOZF`7RZyNk>NP@4LL{^t*zzU>sZcoiF(NecrGy626grF>nj} zViAY9Bp@-~xi2ZnNQqhd{Pw=W*w;S0+E)_a(LV3rSDiX||Gwt__y5fP)6MK_Lq|Ge zC;KKci#fQReal#nKK9+kyZ3#Mcklaz?EC)Y??7OUEiC_54e}Uk^$V4Fv*~m^V@{pfGl%@v*8G;@U>hIuOR?><{a99S%mlFAA-g$rm}8v8y&QVL*V#{b#(RFi?Htm@q2Ks75Ip=1{{44YCx_)coEDuN&OuIe zakw;9Xh;*9(t?h3p&O%^h8sF8^WmNBM$W@>9+vO0e1~N@{G3<3<$L5g{F&ba!6W)P zl7!@hkcO)Iwsb(ABNMTwBU5qbN8I_5#pv|Na>4?^qY1E! zqkjLW-#=;}M>CL-%w)k$95wT3L5fh6V%XVHJ3CsIM(E|W?CIDdma>A?Y(bu5@*KO48$Na$d5+0*%+8M4*)e&JMiO`ZfD1JdOQ^s>4AGb{tP=m?(dI#!|@-n^W%1Y{CB?aCx7uzAb29cH+buba74ts z6DdheI=uaaeVxcfUh?DpC+z4%c`8wbnz)w}vYhC}V1_Y{@yuWW$B^;F&-{vPC*(RQ z$I0->aMBx3df&;cxQ&x$pEUdAa7HkiDNJV;bMXF?^DyJ2&QC63IXXYNl2xo_14lT{ zDb5haRqWy9E$(9vC-r#J9!|dJ6Z$-552s?0m}KbaRC?q*a(Nn(DQ{N)%sZor< zcXCPxr{q259!{-8mQ$Mp!PEA8+V7r@NgR@r0(&@}8Z%DY!RbusOiGb_x^ge4>i`U|t0Fdc^JFieMGY0zDmEMc;Qxv4OD!t!Bn zVb!RK&cb90t4|Ab7Sg>|7X0~mzP!ek9|b749QTg@7_@*T&x#8s|wlSe$|IiCZ; zvq54a^Vtk!Le8^to|W&cd}n1j+W;M%wac?Dk>_kzx-pIE=0DtQ$Y; z#?PKdp0o0twac@1c~+jY|L|`hcq$NF>$U-)9lA9tFrzDlAhxc4`FBkQ5QND}cBHzW4*yF{i=<4Ep+{r~5 zFUolFGFQ3IEgtg*JH8Z|s6-#8Fc@azTom_S=m-l1#;qPSKQDQnXk-X7II#Z^NM^|RY-h&sBM@mZlu?T8^Y{x!dU z%|5P$Cjya(jGMS-=CuSQCJ9Ngvuk#CEj0zu#Wh`AD?v&0ajh!VsY5-Q(+dC2xhC7S z&e-iWd%QLccY94o*X-`vM!w?!2RT9*=efu;e&9${QXx;)qI?7E#@m*@Ih-tmD?xbN$B zc3r2}{|y9hq^BD0`NmP~{D!~3;SD#gVCOgN{KjqWaF6>uB0KKorYtvW(2ypyr5)WFz*4rL@0+sTJi#e0aTR%Q zdgo1VycH3h-%3dq3Q&lml%O=_sEBXlmQHU?$Bu6;!mL}%Sk6jTvxfC-zzy8m#8&L! zmdbA`J+;1N2y^^za>A9is|&f9X{j!ZPtk)2%RMdsUX_jW73WdswM!W`xz z<87I4n|J$TAb2M}`n%JJ*68m}M>^4&u5_mdz3GGf-|5FdhA@NK`29QjxU&Eq-0}W9 z>)6azzQfJkImBtMaRc{q=M%rK0GXb?lt$s-vb&0-FA_2@Hp^~jzd+tp*g z|2PtM_1K;s>*8@7?C7x_J+`CAiAak1kIjFalDrh4FhwawdF<+O6>3tOCfLyr%RBsWEn<4Fm8hfjQm zPxSMoA+6BOlOFVDGIsW4F821s&YrBq{3q+!&LQmT$#Gs|A5Y%%1Ha*pp2+qz6=_I| zJWn%`75jNw5O03konG`|1a9c*e7yVV5|*=tZS3O!VVvVSHv_?E0en->q7#!unE5O{ zWsaXMbpmwsIyAPp zd~d!%rZ*9g=S^(f(HryM*wY&s-gw`eocPT*_V8vn_V8vh)0m0hf8+Px%waBW}@JiBj;QF zylp~Py3>>1$o=+PMxcwgGQOS1Lfq!tzxW$FdS|Ea{Qf&Td1n{z?Bbm+-X+90^)4yN zNKOdmzcc@xJ9t-!qPVknr6^4ms#6m?dS^%PTGEDgxW9MuzLV>nKHr5R+q>ngU?aP@ z&u8R)C-1v|koUctdhedz$H4C1%llrw_Zi8I-MueQ4Qk<5-q)oWa=dR%7X~nhp_u!A z6?XN0Jv*?o_Xl~%W1jFF`+5I{_xv0Pejh?6vXY%5xYO_JP@jf0p(Eb@eINQUiZM)O zI)^yTS=8V~Lc5lt-W>{e%Y8nqnDDO}5=m`Af;Z}#iWzM1Aiijkwaf=b**b2T;8 zF_wL>%jW$sqvr9LQS+&s!4%wW^E75~0hclxJ8SlhH``nD&D@GC&5!dO=GCmP=GS?j z&)5?Pwj^UtE%wqPUrRal$kHN5%b^^{@tnj`%&EmbTAs!}TI{3cMPA}%*6=E7wYBA!VY%RN;`Y$2?Sfsz17@XV;DgK=GPj*tXdCXB8MSot68<0L+f2E z#BN&`BX_Isy482xx(XRvebcRP1cGf@$eCT?LK?yybXHo4l&v+WgRYkQaX_>^zx3k2IU zk+)sm_I%`RFUFm>yQOx!YnQiOzV@Rz7Q1VAFYWH6eJ+>rXKp}__M5qr2U)^0)NTI& zyK4WKud%cCZ43m0dwdgnh7g7Q?D1Xfi6@l_9K#DH_;pjb`2*P^}5EQ zUYB}Z<592cXzZlR9J+4gcHCRnGnjXmzPesUoi25{-entm1HrvRD5QuI%BV!0z3S}U zpOd+iD_PEmn8#k<@ZSDFu-iPkV~J-ZvUaE9-EQ~W?PpJSE%JBogY4boIFC>GjL+G~ zR%Gkm&X1UV_YQvLH`MKJp_Mi|&_{PSz4(s02N(5B%RUZkViiH?9pdWgnIPb zW1c;SGLa)O*PiLj#P{8EIoERow{bVGVrMB=X8ti<)9tOVPE51Sffi2kofSVoI$?r7LNjL6uFhGzz3MfbKgZr>Ahj0|LaBG8d z4azn66i*}D;Pc2d_%iYg+Wnw!X7C5hU~mV!X{IL-3KURI71iv=VI0m;oX-p{; z;a-ONbN+Q7iXK9UXxvY946($Mz!<`qTXZF67j1UYW*2RC(T8B~(Z^uN(PkNa2Gf|% z1?VqYU(xm$y$Jn9>o59kzGpkKM#~y4YqS|g%Q#G?Vd@P#oGDD@Y|i04+{m!o@%Aup z5A*ggy$^esC;6Oj*@`;D%x_pnAQYqLm?*p-qt_UFkC8LxLN4J7uI3u9N1d3PaSt)> zA!a`6#<+_ZcM+p@%tF+UQ8(skp5=K~^BQmP7Vq%^vc+uVYqlU`Oc!<(8)PUWNg#s) zj^tG2ij^z&FSyfK*<$A*Q|z6{6Z;hZ;6>Dqb*r)K_=HWEOYA@SiQTkd_QUOccq-|r zJA5=nlu$}7<2aZJoQqu#pUy0>&f@GWJ`MTe?J0f?RYceq-$=aq#9zi0 zT!|gV%N#!s_Y}VjdE#H;UDS^^qxi4cj9taM;SpvsB8dAK5knj!NyltPWHABtM$F(s zE@3w6kGKwZGvY?fVZ>*sHDV*1_?E5wjGc_IlabyZSx*D{8F>J1V5GiA9>uX7hxbRC z^GNv<%pt*^63ikYOby;h@J50+61Lne| ziJZ(;T!T7Ec9-N{k`|%Aq?d3rNo!ck8~C}JWCux~us0AIrN>cfjfy6jJSvD_FQe+w z=O{ZEW!|Iga@1u0$TX(2n58_z3Ra=!sMk<))DCvjg8q_&=q-5|F(i?K?>M;-^^>d6 zU-Frp%{g3(UX$%I*)EgqGI;^p`GH^g9kr61Q7^fTcFZ=pD-cQv5JJx>GNkA`B^G;5 zahEA$2vbHm`cK&h^G_Ma!5oQMq?kp@NywQpo4MF|$_?0gie04GMamN1 z@hR%3Zs9w=4}{XpA*~d((%e~EHFdbRG~ZsDZ!c{E-cP%W1?VU3ULHVSX^-(FPvQME zb55Vc;T+FNoWiM`#u>PubUma`WjYsdAs6BMN%#Gvn`OEgrr&|u=?l4=htOa8a@05=A02k&l&r$KL;=lnKO>UZZpg`L!OK)xf%5{^q!&j z483RQJ!2VWobf*E`Iyi6l7C{x8QTJ(%qY~$bWfS?I#(dIl_{?V)O`$zi*M)w3lS$3Zl zO)T+@z@N)X#0_R8lSVojWRguDZZXR(W|>>oL6}{Z*=3nsmf2;UfW2o;!H%=cGHWK6 za|KtUzbt)a*<;oU^p~Z-tS@L}H?n5Qnk{R#8D`6vEmO97+4{nYgmVUWq-iuY~_1?2!wLnd(I)a`JBTz4t?aD$jO|>Wb~Ayr<}9USI(a} zk7=CG46frZ{FPg{6?@HbKRNQ{*lCXY$$1RlPL7N@&#{`1_=-(@!*+Jj5(wqmOKu8g zkZUKoqsbwkLMn(*!~RU-2#)4l+;i?FT*_>&M%LULxDDBI??b-awYWqkK8@;gFP!EMK^D3|777E|wZPxKFAMhc1E!@B-s8{$iJNY+yFSM`14))T6 z{)_CWXgDKCAcHZOM^PCQI0kztI+2s{4HlVy(Gv7pBx{kZMY0yXh>S%t6{$DI+hg)5 z#Jgj>JEoLFIhtcRg;P0$^SGE<%;5&^z--5u?U;vI&Ojhk96d?xms{GpMM?3@Y~HK*nJn z6=xxT#RbS+A$Ns*6*qAUc2lvChgpVsRIKGaKHx((u#rt{<_CVqjw96hwt@!y;El;&PH8I2zk32Q< z)MSy1JT-@KD2HKhHAiE2HD+3K8rSm~c2VQ~8t>QGN6mKJV$F~I#17P~X{L>K_F!i< zc2?6H2-PNH7PV$kn?WY#QR`-F!}z9ZBkaooxTjj#YA0g1wf0y$of()>t=-lBm4)2H zV(#Y=9_4Y?@*!U#bM0?5B4@3fwer=2zlzNsllG=PT~|!XA0*bPn|q< z^SPZnk*7|cIy;3;Q#(P?STLN^Z)-I H8awGf{^F%N diff --git a/gtk-3.0/assets/checkbox-checked-dark.png b/gtk-3.0/assets/checkbox-checked-dark.png index 36128053386c11438b9b60777cdf67dae127d235..8d3df52a685bd04767e96bea32a14624491ab9cb 100644 GIT binary patch delta 252 zcmVz)OE%>ALb4KW2m?sh;U%; zKm)B&#pxgnRiBpwa|hZZ9GE-M5-ELuQ2y~w_&x9}Op)AI8J0QbCn&r;Lo)tM1j{Tl zqh8FQ=3Nx`!@e-EOfxyWq@Nt|8K+0dB=U!SVPNb3B&)>k#OC_|00007 zA`u9hP|(uSXh&t^7Z^MBBlJJCqoUMS8xsp3KxIS=4AH~~A`w_QliYDxqvB0w=RVFk z_s(p_a2zKWkH;&fX=dmjHW&;V?RL9tq*AGxZQEHXB^ib>k$;5edDQRssoU+=r4S-( zS=Pj4bU-6;dc9s&BH;B~dvpyNcmf|b77FgDBbS_ArnTZOrRR%GA*sC|9PYdjTcT2a zgG^zO6d{e)0u0m@pW`QAG!N5jDLP3AJ_K*)u!$$olbj^NJJ&WmNS}Qn__N~p5E@s3CGl#F*eA2xvbFX zbiO7)@%`hKs;7JO_;N?nkvT;^zZoY3=Qo2V-~x_EXFaXV+ETnK2Lm4ihMW zXf&!s0YCwZjY`6C#SuUf5E`4hbqp|}m4gI)jt002ovPDHLkV1is3!~FmN diff --git a/gtk-3.0/assets/checkbox-checked-dark.svg b/gtk-3.0/assets/checkbox-checked-dark.svg deleted file mode 100644 index ae01bea..0000000 --- a/gtk-3.0/assets/checkbox-checked-dark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.png b/gtk-3.0/assets/checkbox-checked-insensitive-dark.png index ab056cbde35513718df74a3ed6f53e8c5d5c3f0c..bd03ec9ca06bffa204c6eee5fa5428de5994cd71 100644 GIT binary patch delta 151 zcmZ3*w1RPhWIYQ51H;x|=C6QMzNd?0NCjhZLPEMg`h-J_M;kW@WZHN&u*7++Ym$4M zeX~3FV9uLMV%F*EmK<`Nd_(P_HK%aF0u!B=4Zrs7pVyBR!P{an^LB{Ts5 DN8UVV delta 282 zcmV+#0psR3;WRj^nE+ ziiZoFBuVCZo&_$_bsdHnD{B}h3}Ka(?U!aNfjPF6Whrgju76VQI{PsJuIu{Hbt%CX z_I+O%OBo4pn5IdhDB^&0&mIoLaAEb=NC4dTy^cEHGgr07#&r*)U?jkq6vHq`RaJrr zbq2F%Bp`Mi$Kp87B^UuCfmZy8G)<$0f*@e|v - - - - - - - - diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.png b/gtk-3.0/assets/checkbox-checked-insensitive.png index 09c66155f4e0a6c9349ea307b76291d74421ac6e..e73b148d0987f3399da239c045ce71da691a794e 100644 GIT binary patch delta 146 zcmV;D0B!%80;2(t8Gi%-006c6H|hWY0BT7@K~#7FV_506>hY@oIN;-zUJMXv+)5aL z1YSt4f-V0~{NIjHfGK_Y|C#?gAPR6v??tuZ(ElU<*J4T|6dVBx9s??YOQR_ON*x1A z9EVAxDL^QJNTVx2C^`6l7sUaE2?<6P!RQ76{>`ZDfh11=01E&B07*qoM6N<$f;ap* A1poj5 delta 266 zcmV+l0rmc)0h$7k8Gi-<001BJ|6u?C00DDSM?wIu&K&6g007iUL_t(I5v7y83c@fH zg;N!UqM(bDLqG=?AHny30C&;FL2wePi{N*nsWG&np%=b1y*KCF^e2TeW)3?jAtx#p z9}0#&T;UEmF=O#^z@W~#Vl|ScltHh^HJH+E3k%VnnYHD=&fL3*4PIoAAd@j9 z#nesHSMVk)>JQLg+8Rv;S}c=ut12kOj}Vl)O=X}{rGt?h(o}j$y^ix6f}tPJUp}Cb Q00000NkvXXt^-0~f?SVqCjbBd diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.svg b/gtk-3.0/assets/checkbox-checked-insensitive.svg deleted file mode 100644 index 4dbe967..0000000 --- a/gtk-3.0/assets/checkbox-checked-insensitive.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/gtk-3.0/assets/checkbox-checked.png b/gtk-3.0/assets/checkbox-checked.png index 6b118323904b0edb65801e1e364fbc1537cbac9d..8d3df52a685bd04767e96bea32a14624491ab9cb 100644 GIT binary patch delta 252 zcmVz)OE%>ALb4KW2m?sh;U%; zKm)B&#pxgnRiBpwa|hZZ9GE-M5-ELuQ2y~w_&x9}Op)AI8J0QbCn&r;Lo)tM1j{Tl zqh8FQ=3Nx`!@e-EOfxyWq@Nt|8K+0dB=U!SVPNb3B&)>k#OC_|0000;2} z)2B!av6fM4xXwj^{RaO>e?n*x6hW;5H%_#7oz})eqD5a$P^8jmb1vP%EYKIOj`PlW z&YAaKl|rEqOQ+LkZnt|;Q51|)yWJqO zJ|weYG5w$636KCt$i_|-6JZ^1PaTws4P2f)h}aan||@Vg?)-0X!VOz!*~bX;ezj2u|r(S!tgXuK$Vu0CN diff --git a/gtk-3.0/assets/checkbox-checked.svg b/gtk-3.0/assets/checkbox-checked.svg deleted file mode 100644 index 0db2ab9..0000000 --- a/gtk-3.0/assets/checkbox-checked.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/gtk-3.0/assets/checkbox-mixed-dark.png b/gtk-3.0/assets/checkbox-mixed-dark.png index 7b5ee7a0926afc53f4d84683df15fa7ea2f55c2a..080fdfaee77696b865f5239e7fd8a32fdca35903 100644 GIT binary patch delta 169 zcmV;a09OCq0>uH4B!7%aL_t(|0qv7D7Q#Rj0RPo+cP@>)G`KsI=;uw1CaI83vOcpK zX$Re*dCWgpCxW_p^P?{etPI1xAr-r1$j}D^E2F3nt6>2Q>|bz4aL8r!QJ~G5Ae;Wm zO&msiYW6C_N;mA$MLeJ;ekO&LX23ZjgN-S@^U)UuR*GJGtRmudjB9?U*5CZ-3j=!v XO>LT{%g^f?00000NkvXXu0mjfV5Uq_ delta 322 zcmV-I0logk0o?+SB!2;OQb$4nuFf3k0003ONklKu*yt^4WHUM7Ibb@hOjLoQXwSXC!Mp^FG5MSw>N`Ns{E?dEQz) z5q;m^s;b({EXyuI5ENQ#A*FP(7{^g`T_>8RxoV|U;rqU`7=IHm2%5HS3yp$~(|AUL zZZ@DE8ZLnq5VOIOfCx6WG(dCGZ$jcM;l= - - - - - - diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png index 654d78a45f7e2ee73d7d9b1c997362d918032eaa..3646c7db7b52b3e247e1fa0997bdd8ef3d81da32 100644 GIT binary patch delta 90 zcmX@bm^(o-goS~DVe2pRS3t_d)5S4FBRDxBAzdJS!Xd_^jhiZ#D0+SHYJQLqRG{@M tPLpX~m)e2{J|Zu}cvdhqO>|Y*#du}5PTAHSGRZ*w44$rjF6*2UngG-sAzuIh delta 184 zcmV;p07w6A$^noWe+B>m03Y-JVE_OC0drDELIAGL9O(c60E9_IK~y*qW7O5vRT32y z-N?kmq{Bc0`1kMMmDjId`?G*F^YQWNu(Gm}pq+u?_wU~z3qck$k*pbH6Uai4UM7;P z#iDo^7{G$=tuJ4`fI=8u7|aI+91jl - - - - - - - - diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png index 1f73901bba0ec6fb81f8282e57e38f9c5823bf0c..f6ef803e3abdda172f75f836dc82eac4f075e5d3 100644 GIT binary patch delta 87 zcmdnSm^DE%kcEMPVe2pRS3t_p)5S5Qf-yPb<)>cJPFf#9fBm56c7A9?Eh6YG&|s^>bP0l+XkK!0#c* delta 164 zcmd1W#yCN;o{fQlLH_gqL?Fdj9OUlAuxgIkn69A4`hiKb+mMlS!r3KRY>_ON4zn6HC>ikZBpeiC;Bqhw;7Dd( z&`{l=<5(z>P|VoHdtzH+a`2m`#3Tld@P}PyIS<){<(OaoWINR>lA6x&p@}!%zj4 - - - - - - - - diff --git a/gtk-3.0/assets/checkbox-mixed.png b/gtk-3.0/assets/checkbox-mixed.png index 5cd581fa2d04549f82410cac3ec5c984c2490083..080fdfaee77696b865f5239e7fd8a32fdca35903 100644 GIT binary patch delta 169 zcmV;a09OD00>uH4B!7%aL_t(|0qv7D7Q#Rj0RPo+cP@>)G`KsI=;uw1CaI83vOcpK zX$Re*dCWgpCxW_p^P?{etPI1xAr-r1$j}D^E2F3nt6>2Q>|bz4aL8r!QJ~G5Ae;Wm zO&msiYW6C_N;mA$MLeJ;ekO&LX23ZjgN-S@^U)UuR*GJGtRmudjB9?U*5CZ-3j=!v XO>LT{%g^f?00000NkvXXu0mjfc5h5_ delta 355 zcmV-p0i6ED0saDzB!2;OQb$4nuFf3k0003vNkl0 z`7@5u@0*7^d3?E_Ks1hku3au46df~aQCGk;@$*LNx|XJCbQ>srIPw0|%}smQAHFXI zJO}Opf-}IHHe3N9U@m4L`~=a5Sp%@RB*q>L`!H69_Xz+F7z6)S|3A(CR(%vjF - - - - - - diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.png b/gtk-3.0/assets/checkbox-unchecked-dark.png index 3e0cafcdcd04d763e7ea09e097823cce046b0cee..439d96e7cebd01dc13b577a702be91328126150b 100644 GIT binary patch delta 118 zcmV-+0Ez$U0f+&R8E*st006c6H|hWY08dFoK~yNu?aH|gfFJ+>!0V};MKC1zG>D0< z`|sickT`(3_6Qb-z2mS56xlqG6;5#&qVo@*Lz9LfY230Tb|l$NRc+ReO;wp(o`K8s Y0!7m|S)k(AT>t<807*qoM6N<$f^La2M*si- delta 216 zcmV;}04M*50qFsd8Gi-<001BJ|6u?C00DDSM?wIu&K&6g005&&L_t(I5$%&r3dA4` zh5cO=>ayV4O{K@_L3^C(%nb@XfC&DKPbhRXWcCe2Fud;tCE?>ZF4Ht^Qp%bA5jp42 zd7dkG&h5i6c%>BMoRchStt_R)LI`gqgz#ExGK>yr1SZDl6;Uo%lG@)y;JU$8LxB=_ z0s?wL0e)#71NMAk8xT=S+1qCIS;2%+5@Il5xiMz8)^2U7mhM748vHtrWBmdgD^2F_ S#DrJ?0000 - - - - - diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png index e98cc68f54be28e447226892d0b6cfc1722602f0..123b3c168d3a548887fe5a1f4bff8636d91e37da 100644 GIT binary patch delta 75 zcmZ3(7&k%Em4$(UVe2pRS3pYD)5S4F<9u>LLb^cughPx+8#h%fQS|!Y)%;)u(=Sa0 eiAa`3(hTt{BGPtO1Z2e+B>m03Y-JVE_OC0drDELIAGL9O(c60A@)S)6nH`=!7)J9rT_o{07*qo IM6N<$f+dqeLI3~& diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg deleted file mode 100644 index 3488e66..0000000 --- a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.png b/gtk-3.0/assets/checkbox-unchecked-insensitive.png index 80c76dce46f8dc82e4a7d7333f1d42299ff440ef..b3f42cf4dc690e73a32fdae8375ec8d83c5d5753 100644 GIT binary patch delta 78 zcmbQqm^eYwgN1>CVe2pRS3pX`)5S4FBRDzY<o{fQlLH_gqL?Fdj9OUlAuxgIkn69A4`hiKb+mMlS!r3KRY>_ON4zn6HC>dliFdxp4;F)H?@Kh_{ mn1X1-mm21$Ze5#<87%C%s - - - - - diff --git a/gtk-3.0/assets/checkbox-unchecked.png b/gtk-3.0/assets/checkbox-unchecked.png index 8fa69726930c8f5cbf3ef1a72676d6b31bb81096..6a03e258f2feafde46e8d0151166c6d7352f2f0e 100644 GIT binary patch delta 140 zcmV;70CWHR0i6Mm8Gi%-006c6H|hWY0Axu-K~yNu?aDC?IVe^A`#JER6lydRACss>R&1a?Tv%8D`Efu002ovP6b4+LSTZ=Sv<`E delta 235 zcmV97 lilW78rW6FWZF`;UcmSKuU6mo - - - - - diff --git a/gtk-3.0/assets/grid-selection-checked-dark.png b/gtk-3.0/assets/grid-selection-checked-dark.png index 6b9603656ab9c27844b4100aa147b5a3cf362e30..036b9de11b1274c006df7ef6dd4332873c43527d 100644 GIT binary patch delta 346 zcmV-g0j2(}2I>Nk8Gi!+002a!ipBr{0Blf9R7C&)0M$f1-c3j1Pe|cTNa9XN|NsB$ zQA+JnOXN>U@l;LaP)YAoO!8@C@Ka3jRZjit>iz5L{`~y&c5(A}arwTx`N6*a_4V|F ze)zAe{p#uUiG=&s)%A~x^@xP^j*0i5oAiBn`MbFGo0g+P6n|m>000JbQchC<9;)W< z=fGUjxBvhEr%6OXRCr#!(?<@&FbqUdingiZ?)2X7f5!yc44|m2lG*+TXd@CSu525f ztyq0}txcDh(X}GhgG+AEOpS4wnTl+e1D&Nd58B^>{=7TnKz|gG6+pDh8X(#?cp}=j zBS5kP?5Ft@=~Doc$a4Aa0JC@zc7W^R1$qeF&5JvF0KD)+2Y^5i0R%b#1bP&>$MZG* s?MDF=zkTs=il~6D(1Cz;_p!4(8vSWjE`OK1mP{ruXqx7T-dc`# zXf~T9dZ|{cJt&vUH-z;KAX$Y%p(MZ$BoYbg7dX2D67_nW1c_zWbsa-^e%-RHbAkZr zx-JQTL_fP>7~r!rl}hQR0G?*g`|UkP0V6Pxa$SHH1_{h0S`l_YfY$~-0$U$Assd;# z^Vp`S_MoOlyninQ7(Bf#L#K~iqKtiz7C%0r`L_>o4)}P*o&p8{`1y&ev~O2|l4gp= z^Jgh*=X~Ip#7aN~-;vtw17zP>E>;3;ls#9$mzJN=>i73PLa`Cp47~K|1wDOzC-9gL zEJ8M@(p4)M`z+hdbAUg7bz2|1jDLz_GXg@RmrM7kyt*Kjyd+pQ z3^??-vmP7>EJ6qrM`y_1o)tYqQ^&5*q2Wo$OA^>;BT>Mm0p%x&kf=e8=2C(RDTob4V{Kwnv@W@H}_Tz(m#ed>y<#a)hiF<9R|GhQPaT2P+FbD;t z1LK$VH?*?mwm_qUtM)e~00kz&-l-$YsK&$0LlIyAM1aBBxH{+cu%ij1VOy_YDvnI8 z_;I6

pPL4ouNYhHcv;rfC*i*QKr6i=+o|9K+RW_11sCobqQ1U(csSp8IxHYlYnv fHyY#nd_DgShA&<5tLSpr00000NkvXXu0mjfrgeHQ diff --git a/gtk-3.0/assets/grid-selection-checked-dark.svg b/gtk-3.0/assets/grid-selection-checked-dark.svg deleted file mode 100644 index 4f6efb5..0000000 --- a/gtk-3.0/assets/grid-selection-checked-dark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/gtk-3.0/assets/grid-selection-checked.png b/gtk-3.0/assets/grid-selection-checked.png index bb975c1bd54d2e7a7601b25dbbc4ccd6042095b6..53ea861967c5de1fa9bc18329c92e198b7c89342 100644 GIT binary patch delta 345 zcmV-f0jB=*2I&Hj8Gi!+002a!ipBr{0Blf9R7C&)0M$f1-c3j1Pe|cTNa9XN|NsB$ zQA+JnOXN>U@l;LkQ%vwvO!8@CgxUL>i+!v^LBCZRZjDFarwTx`N6*a_4V|F ze)zAe{p#uUiG=&s)%A~x^@xP^j*0i5oAiBn`MbFGo0h;tNPmF<000JbQchC<9;)W< z=fGUjxBvhErb$FWRCr#s(>D^sFbqUd5E8+l?40BM?`V&j_0SBJw*7C04MC*1a(#5J zV)gB{u}xyu)QZ@&KDpK~Y3nny6}ct{8b^H|^vi+nvOnfPcM_2mK(xySAlkQhBHDLr zfMf?a4C6V{0a6B$>H6ORMwvy}0dCVQ&_m$wvv{EY0ti7500cS!1bP4<&;j6|uQxit r(qFFl?Td#~JiYSql46}Yf6a)I?}hL<%ON5hLOU@FIGWGhc#}iASR+K7t;4!2=RJNIVe}@X}yB7^C8$ zqNM`0A}E;ctNV=klcC+EPKv*RN?kw`3ccXxM1qfvxHA=knBf~ILAo6RDXO0A5I zjm3SFlamjIhKBCOVlgx|HNo%q>*HN-m&;|8N+qPzX(W@$hlb_$QCdzotJg&sWHRJ_ zE9Sj)yVsWMhJTSoCiBhjRl?~&r#9K%2Hc6P^&48-)h4%`R9Tp=ulBen0tjZdZ)A7y zaw?6DH52_;+j0G7S52b39stFt$V3zTAA&1rFUrLyGgilvJAn+gS z+n9a4jGe8b&O)(RQUdfaxaNU+@G}=$(9sp%BZx1q2!E&tkM)OfZ6vDB8r^ydunhqh zl*&PzB$e-asSEE5Vfa=Dg25mR!>AEaBY+DsgFnCjiG^n?Km`~cIf#Qe<4ZW7Hs`HDimgucOunkQ~#wmT(UjFxL~v0lLPv=u-P zSTT?>s((2@ow434h+mEg9r=9z z(3ac5DWt{&9LPAIK7R~(vw-C6hROpDrifQFtJvN&@o{m>3Q>vOyX7#J%OqO?Ocv{> z5@!dFtAt#9vAIXYn>kBVRcQpyC2R%I0~EkGpMSg5u28y&DmEI0+X`T(Y&Gs(mY$1k z>S-t9C~z)X;{ipoKB`67dE%(>eFgAKI}t6d0W81UM%#%X;#XP`4u>62Ij&K!IC?-P z>LR#9PW2jy^|Y#^nTLy1j&s^-vXng$CtjD-`LBQLVVf*6c~A6P7sV;w)%eTCN>yG~;gHEo x>i@r-($m`Ye3VzUMl-rz)aY4;oL-mf`Cqgh?2n#J^P&I%002ovPDHLkV1hqxr!xQm diff --git a/gtk-3.0/assets/grid-selection-checked.svg b/gtk-3.0/assets/grid-selection-checked.svg deleted file mode 100644 index 3b84ed6..0000000 --- a/gtk-3.0/assets/grid-selection-checked.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.png b/gtk-3.0/assets/grid-selection-unchecked-dark.png index 2f40f868a21f966375013f046a47d7ba8d7e0357..b0abbfdf7373c31edb306badc371aa380565adf0 100644 GIT binary patch delta 140 zcmV;70CWGc0-XVn8Gi%-007x@vVQ;o0Axu-K~#7F?bWxH!!Q6u!8u92ASYZzZ~8Ck zTA&N@HlJ`m`~(^$KkW)_BpE%LqjQa!D{$2U!L zF3a+$weD!*^M9{pSrkn_P19o-hAVyj1(I*uwkPJd&VQ>Q#5~W6LOeqVou$n$ z-unXuP{x=~0E9?6)>`D*R8?ghfls`7>h0MAZZPr74ME$SU=9%tcL>05*>A8-cIppM z0*C=IAO^&M7!U(uKn#chgQl|90UH6r8X>@>>1|!tTj$(9)}<^m07pL@$MLp$Iptc! o_54I_C0SLA+8YBk<2%>$HwS@T8t1&5hX4Qo07*qoM6N<$g865D0RR91 diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.svg b/gtk-3.0/assets/grid-selection-unchecked-dark.svg deleted file mode 100644 index f925043..0000000 --- a/gtk-3.0/assets/grid-selection-unchecked-dark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/gtk-3.0/assets/grid-selection-unchecked.png b/gtk-3.0/assets/grid-selection-unchecked.png index f2b67fa6aec42b5a66da66ac72edd03e9e93eca2..675ed592eee4b1c273cd15209a50883487905d94 100644 GIT binary patch delta 151 zcmV;I0BHZ)0;mCy8Gi%-007x@vVQ;o0B=b|K~zY`?bV?H03i%R(MZN%&~C>HtpJB- z0R-d(6F^V4@lW;x$f<~GWxH6VYLT1(#Felh3xghki|EWHm`ogvPF#Y8MK8h;bYMXi!fHYYVE=)niyPJDy`)Lg5Wc?e zb@>IU@_m1urs>Ib-MwwwJ0S#)7q4lWsPFqn+qU;4NzQd$zkdbbS(ZJ*Fx+^aM~>qx z4%UCzbsaTLLuFaM;yB)kJkKvt6di*gAj`5yN~wRp_wROpIKrnQx)pbmw|wV1bGECQUs!9r$ezw%LJyBWve;0XDz}*Z><~18jf|umLt8 z5tsf|U`v(No - - - - - diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.png b/gtk-3.0/assets/menuitem-checkbox-checked-hover.png index 7a27aa2834d7a67aa996df90cada52d45d55bb52..a9a4586c17e14dc20c4f969f45188821e58f5776 100644 GIT binary patch delta 110 zcmV-!0FnRH0e}IJ8D|6l006c6H|hWY07pqgK~#7FV;H>PzsLVa|C8}a|M>s^e=dIM zNvMKb{vY`-hAE9ua0DoL<-Zt08eM_t|I0v$+X!hKN?_8sl&t+pF delta 195 zcmV;!06hPI0n`DI8Gi-<001BJ|6u?C00DDSM?wIu&K&6g0053jL_t(I5o2H&1tf*Q z|Ns9jfp`lL`@=M{z!-#RkY=EoULa-zVh%#;QRJaE9|O{7fVc!j5}5;(oB+ggfLIVF z4rGIzO;|HX15`7}mX$y(2*d<6Gs0|w8Xy3qX8^GZ5I+WDaXcUf`FRB+BV!McCJcbK x3IOp6AO^Vvzn^g#2Q{P%NT=XZGb)Y<0RYfaa+e-qK>z>%002ovPDHLkV1nK1K}`Sv diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg deleted file mode 100644 index 8ab7153..0000000 --- a/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png index b3ab5ce500d30ca204267cd96bee222b6d3e56e0..c0c78f9d5092d142c625b4372c7c0ace1b8cdf94 100644 GIT binary patch delta 107 zcmV-x0F?jN0e+AfWdr~K0JZuz>Hq)$MM*?KRCobn7`))W%>StW>iDFS|EK-e#xHG! zD(Law?>`5oG(v$NP%z{_2V5E*0Hs2J65$AG97m03Y-JVE_OC0drDELIAGL9O(c60Fg;VK~y*q?T|4G!Y~kp zqm_anb?V^SivRyVx!IvO=~C(ULR!*;l(^@?myq1O++Cb2s{Z_fhWrOi@R9eVB~vo@ za13~x4mpa=FAT$CvLoCHwD5*sNV4W - - - - diff --git a/gtk-3.0/assets/menuitem-checkbox-checked.png b/gtk-3.0/assets/menuitem-checkbox-checked.png index 4f609d66c9bdb6af0fbc41c794fd0c43bae31cb0..6483d991d664053a91547df782ea888f9c3f442c 100644 GIT binary patch delta 140 zcmV;70CWGU1E>LzB!6#7L_t(|0b?KyjDnAWULGHUeII=Y@=hj8^T%MHA0I<}|9=ef z&Lvy(`w-trI28gFZ21`Md*nr+n-~e25dfqaq!3770U3g!nGksH=_&dl*yl1x!-o*x u+XOTdHUwQWiH7*D{TSk1OIY{wywiUD{nb*~Z#4&`mly*;nwdLuc6qY1@~r~8f&JhAzdRrVf%q@7 z0oa@f5@YVj-r>c~A-s|isQK5g?=y=h+RgxqgS`VY0K{RMQh#!K6T^Q7fxEA-h4n9r ze+5zm)a=Q_DGJv70OedDsDhSv?K);{W#hA645mO2C4;Nm;nsP z1~6W@bKoZrJAcm>ISDOSCT3C0$npG48Q>7bQl181IPgdEC_?52?RiXM)5aT6iOf)01^W6!HEV+gTz3A u1@bdI - - - - diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png index 8b11a27eb1d5d19cfddd4ebf6e7b0e488530a561..34f1d0e54a5303717a8df973ad9fdf623d2f2d81 100644 GIT binary patch delta 61 zcmXR4oFHkz!oa|=^_Tf8ASL1H;uuoFm@JX_;QzJ%Cla(3S)<(|elRd>bd}q|6Pq9n PRKwuu>gTe~DWM4fX$BL> delta 94 zcmWG6njjg;#=yWJ|M`C+kYX$ja(7}_cTVOdkfY=2;uvBfn4BQNdRT!);^N;A|NsBz vbTE`IDb)DSp{$(DxJgFXD1C};k~0ItS9?|#>sk|DpgsmqS3j3^P6 - - - - diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png index b49cb300e4b84ff258ac7daf222a2a070852a897..63d71935b239223210ac900a21c4db59b1039b74 100644 GIT binary patch delta 59 zcmd1xpCD<*!oa|=^_Tf8ASLGM;uuoFm@JX_VE^&|CMqu+BMzQmV(6C>y=mDwUje9s N!PC{xWt~$(697jW6Vw0z delta 89 zcmeazogf*)#=yWJ|M`C+kYX$ja(7}_cTVOdkfZMD;uvBfn4BQNdRT!)V&e}-R*hr* qt}-fL1UudCN%fxa;s - - - - diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg deleted file mode 100644 index d150f8f..0000000 --- a/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed.png b/gtk-3.0/assets/menuitem-checkbox-mixed.png index 1081f3a5101fbf2f2391977706e3dfadf491c37d..a69e7532668c83a118e0f5bc217a6c11e7c7e169 100644 GIT binary patch delta 62 zcmaFD7&Ae|LfO;BF{FYqSz=m(NDa@oo4*W?e785_nWTK4f#sf&j&rUE0|S?z`lG|r Re^MBLz|+;wWt~$(69Ba<6-WR8 delta 199 zcmV;&0670# - - - - - - - - - - diff --git a/gtk-3.0/assets/menuitem-radio-checked-hover.png b/gtk-3.0/assets/menuitem-radio-checked-hover.png index bfb97eafbb2b72366bc889cd5c63efd6696a411a..46a45783285afd8185f9247fae6a653440570966 100644 GIT binary patch delta 83 zcmZ3@m^MMumxY0WVe2pRS3pYF)5S5Qf-zYl>4E+2|9$_@H*9!pFCE6}z$x+Kz`6&L mF$ayCxHzI5Z%lONW?+ceXdkMx=Hg?ZMg~t;KbLh*2~7Y1@gAT6 delta 153 zcmV;K0A~MYs{xQ1e+B>m03Y-JVE_OC0drDELIAGL9O(c60A)!;K~y*qV_+Bs6o&vK zHWU8;|IY#x&j4Z{sQeZnJ%f>v@eh;_r$7p^0g&bdBncRM3X&L@$%HNd<-=@7mc}N= zfXe`6jd - - - - diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.png b/gtk-3.0/assets/menuitem-radio-checked-insensitive.png index 9bbb22a31c67cc50ff688a90b2cecd1e511c0d79..04e72d4f1276beeaca4f7cda29d14ff5bab8c412 100644 GIT binary patch delta 83 zcmdnWm^MMumxY0WVe2pRS3pYF)5S5Qf-zYl>4E*_`py3h9WuVn=UmOSz(q=AR${mS mbGU$W0HdQehjmc~BSZ8jy{i_#{d9mD89ZJ6T-G@yGywp2^BTSY delta 163 zcmYe>$~Zx?o{fQlLH_gqL?Fdj9OUlAuorQL77k3;Zcx- z4$stj?j`dXKh|r=`xzdNT)~s65YE)$_(|am^AQDSduBtf1gD3J76!8gl{l^|bQ?Y} zVsI6-e#apb^1=Wvck^^8dq=HG1mAuq6>O*Sb&p^qu5g@K{5hf8SNDf$0E PyBR!P{an^LB{Ts56Dl-& diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg deleted file mode 100644 index 0bc947f..0000000 --- a/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gtk-3.0/assets/menuitem-radio-checked.png b/gtk-3.0/assets/menuitem-radio-checked.png index 067e6e8b3eb657337424c932b3c3fe0668e1e58d..4affb3e7f0f801f627273627ebcd9af3b476a613 100644 GIT binary patch delta 88 zcmdnbR5n2+$kx-vF{FYqd4Zq=Yxvf!H|4$iCJe0J6kAQxm19Dr;=1|S2OoowTq zS(sT%7#JBPK^VjaiGk#R7{yX_13-LcRu;A>AdLc`Vju%hfApYmfRbPrpy)*95Oe`p z`S+h+SE1@-V8A8@QUfv(8Gu~Cc>mGGle%hloIt(?Kj7R*{x-2Cp#3s4~b z1!8z?pacj=GZ3=?F&hxGLfJry;SUi12I5~(HckV8^58%MxePhLKv4&>8H7=y5#0qq pc`yKpg8~>P9gj01L6i?92>{HVJD?@flvn@&002ovPDHLkV1j}Pb~*q6 diff --git a/gtk-3.0/assets/menuitem-radio-checked.svg b/gtk-3.0/assets/menuitem-radio-checked.svg deleted file mode 100644 index 7005212..0000000 --- a/gtk-3.0/assets/menuitem-radio-checked.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/gtk-3.0/assets/radio-checked-dark.png b/gtk-3.0/assets/radio-checked-dark.png index be4856c74d8709123bda2b08f753dd99b00bf257..36c150d75f4fc58de58c2c82c5ed6f347a52638b 100644 GIT binary patch delta 362 zcmV-w0hRvI1cU>SBYy!)Nkl@3lv7HTD|}pI{hgY@2J1 z-RFjv`L~iU=~R8E+9Dq7#@l;eJ-y<)Z%qFP%zub6Icg#+2A@8?wd3lwKLhjpcVJ%r zDY7CWM-30&BgQ0(^3D$8!&4;$i*ALigic%$8!F+ z0nD1M{uRsC=NWk*98AGmzzYK_=8TWETdu~E3O+=7A(c<`qFhY9t4^Q`{y zLYg>Xc}*H(9D>yF#NkMce0u(9LVI67sehQ4+Cz-VQH%Sp0K3CNFNK|gTmS$707*qo IM6N<$f~wTD00000 delta 569 zcmV-90>=G>1JMMKBYyw^b5ch_0Itp)=>Px%3rR#lR5%fJQ%z43Q53!N-t=SI&{S*u zpiNszu)!Du?DPk?(1or<68#N=iEQ`r z#p0slIL|@Wwrz`L9j1dI5YO`jB7V2qecI`CUKw5_P^nbjq|@n#sZ>goQW4nzDKZ=m zrQh#Muh)CqYPB9Qr}-$C%L|!IW(n0pvJqeh@pIJKb>RQOJ}dAGsQMzAOh#ZUSjqNgQm*t z#66k5d|MKBIy@KilVXXIo&Bu{LuFj-m;&)CXQr`5id-4L8Tz9S#!Lam$qBimApR%l ze|AbPPzY|u6F;^;p3sQL$iexhbGe*@#ks>fFt+V(VSgMgIp@3#yq;|S`5<3@y+`bD zOyam$*oS9aq_eeJZ5KOWo7cpJiFd^u=RT?|*hsHluV3Kpxp1Cv!w8}gc-mo(7-GqR z>xO+}qt^5Jd>NHz%qXTC^J^-jZGIE48;!;?1*5@T*ImnIvwso01(G7s7|Hk|S=mG7 z$A--OF*3@aMb1>K)%&>Ed5BzN7y@5Wb*0&CzJt4e3>7&5Z};V0XnSz%00000NkvXX Hu0mjfFI5#H diff --git a/gtk-3.0/assets/radio-checked-dark.svg b/gtk-3.0/assets/radio-checked-dark.svg deleted file mode 100644 index b91357c..0000000 --- a/gtk-3.0/assets/radio-checked-dark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark.png b/gtk-3.0/assets/radio-checked-insensitive-dark.png index 24403ff4f59e8cbff97f52caea68a8388e063a1c..b89373993d64a30c1c2e58fcd8c8daece86fb417 100644 GIT binary patch delta 158 zcmV;P0Ac^x1Fr#)8Gi%-006c6H|hWY0Cq`4K~yNujgh+zz#t4nub_4TLc)lNJPU1> zV-uRpk^-4HkrMD#mY@HCngbysAt8d`@G=4;8!^a+!y~8)cXs{|jo$nTFr3NvrAe>7 zHu1&Qi0U*skD(?Lh(J=OR|R^VK-vJ7EtW$r*IXWIdCZiKJ|gcRlpQdpQWO-f4(J1rGKdU#PVvgh3ESF0&pU+pb+3dRC@82sf4bbUy9t3z^sZ>&+I_Z}{ z)9I8zkKJzfg7+LhWES8}wOTb&Hc!6_HfhaBpu>8-{y7?rLQBt-P3Bz%Uoc>Etyb$y zG9S~kiVTf1wSQcOXnfyKtJ_v-1^3}IZ5K=sz#J9TC96IeFkmgK(rK$zR;FtD&Ax$2 zu&KvC6lpECkc9QP!lbj3ecNK*EewMst_U9thhcH_?)rcM>#+*i#8(gmes&fvz}3kf zMbRn@!#xYPp(hO6RqzD^HesSL>b22m?8C5pKA-M88$*!HlgT8Zae4U7TFJRmFt#7W|LfoR8*fU}gkPD&G5`Po07*qoM6N<$f_ZSy A*8l(j diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark.svg b/gtk-3.0/assets/radio-checked-insensitive-dark.svg deleted file mode 100644 index f5cfbe0..0000000 --- a/gtk-3.0/assets/radio-checked-insensitive-dark.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/gtk-3.0/assets/radio-checked-insensitive.png b/gtk-3.0/assets/radio-checked-insensitive.png index bb07e1c93aa4b9eee20158ae63da1e497c1cc8e1..f95b5f54d96a169bec903ff6e783d3144a0ac6eb 100644 GIT binary patch delta 171 zcmV;c095~l1H1u{8Gi%-006c6H|hWY0E0-0fhsQ8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00BQqL_t(I5v7w`O9L?w zMq6(!6$G`~f`|cq@YVnSBYe^)k%9_ZY%5->c*Ao-vkY5>f*+hscCs^>OlF&nd9^X^ z!7g-W%TvZ7+`!w+mWO71VSWS&?%@&ML9M|CbYTD&kQD=*V1HSMEBMH(^N&?b`|tv% zE-(8)?z{z;@C|>-wF&gVtj0?`JaYnfUQ~XYplt>R@C8p$ - - - - - - - - diff --git a/gtk-3.0/assets/radio-checked.png b/gtk-3.0/assets/radio-checked.png index f2da6f65808972251f6a0c27251366f62991e1b8..36c150d75f4fc58de58c2c82c5ed6f347a52638b 100644 GIT binary patch delta 362 zcmV-w0hRv!1cU>SBYy!)Nkl@3lv7HTD|}pI{hgY@2J1 z-RFjv`L~iU=~R8E+9Dq7#@l;eJ-y<)Z%qFP%zub6Icg#+2A@8?wd3lwKLhjpcVJ%r zDY7CWM-30&BgQ0(^3D$8!&4;$i*ALigic%$8!F+ z0nD1M{uRsC=NWk*98AGmzzYK_=8TWETdu~E3O+=7A(c<`qFhY9t4^Q`{y zLYg>Xc}*H(9D>yF#NkMce0u(9LVI67sehQ4+Cz-VQH%Sp0K3CNFNK|gTmS$707*qo IM6N<$g6RykEC2ui delta 613 zcmV-r0-F7V1N{V$BYyw^b5ch_0Itp)=>Px%H%UZ6R5%e`lh3OXQ546|+Qo}f)= z5?HICe9)@J+X)gvy6*XQ5-tmB(a!&%MXPp_Lg3ThT8Y{SC2Fh4S8ZAuCTJ$1qRyzd z`@J>u#&_W`=brQZoH=*qT!k*IcszbNlgS*1LZKs%$8!_u)qiUBZ8#iOE0xMgqtW=~ zL=@+yP$)c!Mx)Onk%$@$2Fd61$@F5epvh!HgTY|a>-C=Ia=GVDPWshq^;N6Y;^Iww zHk)w)@#S(U4L)MXK?Chhfnu@vxZQ5^>2xXq(=_>Jv)M7kP!Jku!JvqmNF?-hI{hvd zi!rq9a=A!R6o2BJ+Xf+Hj8s*XIltdeqN}_8e*cA<&*vWqI4wS!gdsLoCUxHYq{itF z`uu)G^Ql2su4$z1sdl05cFO{RKyNP`4j<{dE~^6;t<%T113GK|##XNGhq3JD@ZMFa zLnmOsGOyQrOVc#FZ4~(a>5s+QPsEVJ(QrgCU>P=+A%6)G5x2o}=U>h$@SovKeBCc% zP|kJ2yMD00v&ZIQ42)pEve9T%!H`&$alYGeoo?LOCy&OY!AH#c3($fAOUY#NQnT4K z=kvMz?}lN>p%DTu1k&JRkdPBc%a6L - - - - - - diff --git a/gtk-3.0/assets/radio-mixed-dark.png b/gtk-3.0/assets/radio-mixed-dark.png index 6fced71380018bae50730302ff30acd72a3c8a7f..044085f9f004426765bce3d13927fbf1594b14a6 100644 GIT binary patch delta 344 zcmV-e0jK_v1o8rqBYy!oNkl>5?sr#`*u+;1#i1k78+Z*tT`tQapU`gi2&?Uw=b`6^&~*Fh^p zQdJw_NPx$%Sl8*R5%fhQ@ct7K@^>R|9>aDVGwisE(R@%Vly6gmM} z({)`a${=i6mM~3IK&01dwGL~w+L^<11(M0+WiS}r3OJ*nW&AnU2$?{~oz9VUABh$V+y4W(}* z^BT_Wk_aAU&VQZQtBNWrI&PY`Ey+CRBx9U|0_2cOfq9c1i+{Z-6wy9Jq uwT{lrL1=+{5P3t^e5q8rh5KdW - - - - - - diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.png b/gtk-3.0/assets/radio-mixed-insensitive-dark.png index d20db95f0ba9a34b317aedac66151ec3c6582bf0..ff19d99d2e6ee9d8ea5917b21c8ccf6cd00c3e26 100644 GIT binary patch delta 143 zcmX@eynu0nWIYQ51H;x|=C6QMx~Gd{NCjhZ1G5;L9a|t9r-Df81LjWwi~$~#9Jx5X zm|Q0`7zA(#b19d2KWwN;*d560zPW>SmHd3kML$FsQYBRs&IDil?j`sk#3ZDVg^x9T vQ34l7l;eeoEPFi_7I3heK0Ki$ahJi^N9`X|lGS{ml?)u7u6{1-oD!M18Gi-<001BJ|6u?C00DDSM?wIu&K&6g00DbRL_t(I5tWm@P69y? z$M^R5I0D2_QFu>4VF4u#c9s@)T1rfe&!8`1W3;ui^94vQS88Dll?4fn9WjCMd57~` zSps6>-6U|gJM){_+4-NNep#hb*{juRC;5E-)Nz~x+{@+iZGSqQK6bm^r@>(GwTU>J zi)OQVQ79B{Ju+FGJ7zF-HJ%L5PifM zL?X9(=(=Vg>k9wnVx(g48igT}v<3sKktYgUWlWTZSQuE1wvi_aOKQZzz?#NIQLn!5 z?@Q)7H@%wkPChC#C8Qh#!3_aFHzzN>Uhf%sMp1MmODma@851!`mwx#U7V^8aFuon( cr~RD20Rsrc+D$l^#sB~S07*qoM6N<$f=s~3!~g&Q diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.svg b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg deleted file mode 100644 index 6b93fc4..0000000 --- a/gtk-3.0/assets/radio-mixed-insensitive-dark.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/gtk-3.0/assets/radio-mixed-insensitive.png b/gtk-3.0/assets/radio-mixed-insensitive.png index 9b962722b17dfb9d0e7ee32786fd95b01d1f5a3f..7ab9561d92f903ece1408a785fb9c02635f13fa8 100644 GIT binary patch delta 162 zcmV;T0A2sx0G%mVzn^Ao*sX zqE5>qp+-&t2^0bQ8cX*q|A=}7%MKX@1({v2G{k8l+EU{bG3xpjZ?*L>%X=##cQhI@+0k_^l9a3FWJrofRCyX4v zv_PJG53leC=j7NL`e0P6CWUtn;K`|SZh(#v4B!{uAyr1=_1i{ZwoO=Fxu$nT;ZyCi z?IrjO_D0-x@K+! zKj23CUz4OLFh*$x3pY?M?1B#afOBs2v!G(-}W~;vCe9j00000NkvXXu0mjfY6p - - - - - - - - diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png index 54f75103a15bd24be5e7769885584aa648e6eb81..044085f9f004426765bce3d13927fbf1594b14a6 100644 GIT binary patch delta 344 zcmV-e0jK`k1o8rqBYy!oNkl>5?sr#`*u+;1#i1k78+Z*tT`tQapU`gi2&?Uw=b`6^&~*Fh^p zQdJw_NPx%6-h)vR5%fBlRIl_K@i9HJbV&CV^D-( zk>bL=-p>#O6NG4;7}7|vOdu(4=Qp@Ts&sM{0!Gtolg38W+B_gd3W*3Bu~6}G)Xn@i z$>AKi10%aL|KFV1aaUq%77mBE5{bmI&*wX`*=#?Np3P>@-G6SkSSS>3E0xN-5s{3W zOeS*~3tximRqC - - - - - - diff --git a/gtk-3.0/assets/radio-unchecked-dark.png b/gtk-3.0/assets/radio-unchecked-dark.png index 535c85caaf7f38ee2deed5d22a44a89e5cbd33a3..84bcdbe15ebe004bd04dde37ba87a69ebd833239 100644 GIT binary patch delta 217 zcmV;~04D$C1L^^g8Gi%-006c6H|hWY0I^9#K~#7Fb&UmX#6SQ8r`-PF$_%3N?lJRS zlK(%aQ>KkAFiGYUY_Q864SA>9;1Bj_Qz!5wgQ{)v12?pI=INWdmgxr$G*1b(Y{Vu# zLUIu3*>XfvlV;PFNVRlOwWXgt_&n*ukXSm144_Vv=Vbj%(^8i6(i0DC*=9*IF$tzi zTXD&ZhQasIv#w!!$p-=pI{rn1jH-@F;0LZLn9`#od#b|Z4|a_D6tb_{`HWux9vLe* Ts%y2600000NkvXXu0mjfrK)6! delta 470 zcmV;{0V)3K0p$ab8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Ey#L_t(I5tWn6O2a@D zh9{HszNr^*(UNvo6cKz0SFV+UZhQeRpc@}S!AEeR(CW^&5Zrp9tG3cE1dX_AOOwX` zPjf=7Q0;*vbLO1yKa-g=hWc%b#bU9VNF=sR(_CiQ^SqbgaDRBy>2zvv-{Xi8cM65V zVJ4F~18iEBr3_;n_I+QuuB#y8^?JSIZnt|OTqIB`m9En1^iC?3Qd;W>mPCq-Mk6&C z3{=10zizkNyNsE9*|vR<&1O$fJ%B}kE0}!3m8~KF3wE!;FQDpqGMS8$DLM(p=a@@| ztcj)Xq4FmF`+o;SAZ{YaIgVi(t9aGeY3{a6GVrHSfDBm*tni;{q4HD#$srT4Q?vgL z`Wnac#3P#3$l!U_XplNOZC0M$$>yqaJLfBv${S9?lJlRY#>#9cbfnv8G?ut~4xA%) z*nf?=WXJ}ch>m*5=kqp{*JTy5+afBJ(Z;+Jm(6DLluxlhfCI;I?sB=@2ZkGf$L9)1 zKwc(Pc2Rj>U~&1NSYr~m)} M07*qoM6N<$f)?uK?f?J) diff --git a/gtk-3.0/assets/radio-unchecked-dark.svg b/gtk-3.0/assets/radio-unchecked-dark.svg deleted file mode 100644 index 214ed94..0000000 --- a/gtk-3.0/assets/radio-unchecked-dark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark.png b/gtk-3.0/assets/radio-unchecked-insensitive-dark.png index 6c8f7c870b7bc10d9afa92806b432e3e897e39c6..b3bcec8de1a0e726ce5d6d1662935b7189eca507 100644 GIT binary patch delta 125 zcmV-@0D}Ld1CIfa8FmB!006c6H|hWY09HvvK~#7Fg^@P`gfI}qbU^K#|Nl@bGTcbz zMz7gfFk~8yjA7x1p)*c)3@0Mv#duVY4-LRV|4isCU>JWikpCuRXnzx$OpqhwlJc42 fQ2NyRv*dTLzDg7&ykr5c00000NkvXXu0mjfR;)Ca delta 405 zcmV;G0c!q_0i*+v8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00CY}L_t(I5tWm@PJ}=Z z$6-&tLWrTFkSCz9I7%8yOA9+KH73Sq(3h|=+S=Lq0wjb|3uCA(NNDVc351Uv;QTkY zmy3D{OajX?^PAb-`L8VfGTXNIJ;>}d z`~HZg)Fs{~xFB8Z7x!RA&y|4T`y>3h*ZBtnX1-{n0S+!L00000NkvXXu0mjf{#m>l diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg b/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg deleted file mode 100644 index 0fdfaf4..0000000 --- a/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/gtk-3.0/assets/radio-unchecked-insensitive.png b/gtk-3.0/assets/radio-unchecked-insensitive.png index cd409f7ef235ec5fffe17438c0158af2cdd2e290..4ea0649d0f12efc0e3ee5ba1c9082e5556a50048 100644 GIT binary patch delta 153 zcmV;K0A~Ns0;&O!8Gi%-006c6H|hWY0C7n~K~yNug^{}rz#t4n-H>G%)&&&{Ao*rs z4KEUEBOQcmfAW4VKl8%(awCieqRR@CfYa0yd&F(uu zdWj^w?KhY(K~Dgb(2hX!fZLC7hjiC;4@HE_Iko$&^SdACv=Un_mdJ4p00000NkvXX Hu0mjfgz`Y2 delta 319 zcmV-F0l@yM0nY-E8Gi-<001BJ|6u?C00DDSM?wIu&K&6g009X}L_t(I5v7ycY63A7 zMQe)}M)0AEK9piWf589$2;cftM6iMkr9x{5@rG*!D+3}-=!TVKlAM#0C)BENa2|SxN=oFH$clB4B-erP*v{4<2T)bx9x?c%9y?he5$|O zPDx@+W`cjo1e(MfO_ec)m)HbN;@hUkXJ5Mm?Ww~wNmV)5n58>7fQj_KCaI#pqz}kV zpbYGS4%@&zH#oX-0FV0yS1a3Iffq9ZO`^H3hN115{SRC@22;n0)@3FA&S!dUGhW!K R$;|)&002ovPDHLkV1j(ak#PV3 diff --git a/gtk-3.0/assets/radio-unchecked-insensitive.svg b/gtk-3.0/assets/radio-unchecked-insensitive.svg deleted file mode 100644 index a0f2168..0000000 --- a/gtk-3.0/assets/radio-unchecked-insensitive.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/gtk-3.0/assets/radio-unchecked.png b/gtk-3.0/assets/radio-unchecked.png index ada911bfd8ab78b984f3598f5991a61583b9137f..896e45f96c59bac73bd4f054ad07a35366c69f54 100644 GIT binary patch delta 273 zcmV+s0q*{V1fc?u8Gi%-006c6H|hWY0O(0XK~yLeb-~T50dW|>;r9k;E^YRdj1m`Q z=N2r)hD0osDOTe|vp^}CS@>wm=6OV3oSa+qd)r_e_&vAiqKwMk>A*5=VKh@cS*1z%Yw za~5_PR|yVWoVoXWXD;g9~7r{^e-6Be$nxG ztYb(RV@Jc#f&oiwwVJ^v>=%y5m_P$97_j!O^?Lob-*4~RgTn>?E({p7V8oWCR;%@b z0>+mA$9pEop#}}KBJA$@YrE<7dK>;=?AgcoBJd87Lk$`i;G4aX%Vx7mp-{NwgOd0A s{pS#`*XxhTWYVZst8dL_b1EAA0Z_JG_45hu#{d8T07*qoM6N<$f+02PivR!s diff --git a/gtk-3.0/assets/radio-unchecked.svg b/gtk-3.0/assets/radio-unchecked.svg deleted file mode 100644 index 2f05a0d..0000000 --- a/gtk-3.0/assets/radio-unchecked.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - From 2eb7b32c85c9a5aa434b1ae4cb37f85626775df9 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 6 Jun 2015 09:57:00 +0200 Subject: [PATCH 51/73] Adds unity icons --- unity/close_dash.svg | 1 + unity/close_dash_disabled.svg | 1 + unity/close_dash_prelight.svg | 1 + unity/close_dash_pressed.svg | 1 + unity/icons/close_dash.svg | 1 - unity/icons/close_dash_disabled.svg | 1 - unity/icons/close_dash_prelight.svg | 1 - unity/icons/close_dash_pressed.svg | 1 - unity/icons/maximize_dash.svg | 1 - unity/icons/maximize_dash_disabled.svg | 1 - unity/icons/maximize_dash_prelight.svg | 1 - unity/icons/maximize_dash_pressed.svg | 1 - unity/icons/minimize_dash.svg | 1 - unity/icons/minimize_dash_disabled.svg | 1 - unity/icons/minimize_dash_prelight.svg | 1 - unity/icons/minimize_dash_pressed.svg | 1 - unity/icons/sheet_style_close_focused.svg | 1 - unity/icons/sheet_style_close_focused_prelight.svg | 1 - unity/icons/sheet_style_close_focused_pressed.svg | 1 - unity/icons/unmaximize_dash.svg | 1 - unity/icons/unmaximize_dash_disabled.svg | 1 - unity/icons/unmaximize_dash_prelight.svg | 1 - unity/icons/unmaximize_dash_pressed.svg | 1 - unity/maximize_dash.svg | 1 + unity/maximize_dash_disabled.svg | 1 + unity/maximize_dash_prelight.svg | 1 + unity/maximize_dash_pressed.svg | 1 + unity/minimize_dash.svg | 1 + unity/minimize_dash_disabled.svg | 1 + unity/minimize_dash_prelight.svg | 1 + unity/minimize_dash_pressed.svg | 1 + unity/sheet_style_close_focused.svg | 1 + unity/sheet_style_close_focused_prelight.svg | 1 + unity/sheet_style_close_focused_pressed.svg | 1 + unity/unmaximize_dash.svg | 1 + unity/unmaximize_dash_disabled.svg | 1 + unity/unmaximize_dash_prelight.svg | 1 + unity/unmaximize_dash_pressed.svg | 1 + 38 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 unity/close_dash.svg create mode 120000 unity/close_dash_disabled.svg create mode 120000 unity/close_dash_prelight.svg create mode 120000 unity/close_dash_pressed.svg delete mode 120000 unity/icons/close_dash.svg delete mode 120000 unity/icons/close_dash_disabled.svg delete mode 120000 unity/icons/close_dash_prelight.svg delete mode 120000 unity/icons/close_dash_pressed.svg delete mode 120000 unity/icons/maximize_dash.svg delete mode 120000 unity/icons/maximize_dash_disabled.svg delete mode 120000 unity/icons/maximize_dash_prelight.svg delete mode 120000 unity/icons/maximize_dash_pressed.svg delete mode 120000 unity/icons/minimize_dash.svg delete mode 120000 unity/icons/minimize_dash_disabled.svg delete mode 120000 unity/icons/minimize_dash_prelight.svg delete mode 120000 unity/icons/minimize_dash_pressed.svg delete mode 120000 unity/icons/sheet_style_close_focused.svg delete mode 120000 unity/icons/sheet_style_close_focused_prelight.svg delete mode 120000 unity/icons/sheet_style_close_focused_pressed.svg delete mode 120000 unity/icons/unmaximize_dash.svg delete mode 120000 unity/icons/unmaximize_dash_disabled.svg delete mode 120000 unity/icons/unmaximize_dash_prelight.svg delete mode 120000 unity/icons/unmaximize_dash_pressed.svg create mode 100644 unity/maximize_dash.svg create mode 120000 unity/maximize_dash_disabled.svg create mode 120000 unity/maximize_dash_prelight.svg create mode 120000 unity/maximize_dash_pressed.svg create mode 100644 unity/minimize_dash.svg create mode 120000 unity/minimize_dash_disabled.svg create mode 120000 unity/minimize_dash_prelight.svg create mode 120000 unity/minimize_dash_pressed.svg create mode 120000 unity/sheet_style_close_focused.svg create mode 120000 unity/sheet_style_close_focused_prelight.svg create mode 120000 unity/sheet_style_close_focused_pressed.svg create mode 100644 unity/unmaximize_dash.svg create mode 120000 unity/unmaximize_dash_disabled.svg create mode 120000 unity/unmaximize_dash_prelight.svg create mode 120000 unity/unmaximize_dash_pressed.svg diff --git a/unity/close_dash.svg b/unity/close_dash.svg new file mode 100644 index 0000000..752e8a0 --- /dev/null +++ b/unity/close_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/close_dash_disabled.svg b/unity/close_dash_disabled.svg new file mode 120000 index 0000000..0749829 --- /dev/null +++ b/unity/close_dash_disabled.svg @@ -0,0 +1 @@ +close_unfocused.svg \ No newline at end of file diff --git a/unity/close_dash_prelight.svg b/unity/close_dash_prelight.svg new file mode 120000 index 0000000..64b2bff --- /dev/null +++ b/unity/close_dash_prelight.svg @@ -0,0 +1 @@ +close_focused_prelight.svg \ No newline at end of file diff --git a/unity/close_dash_pressed.svg b/unity/close_dash_pressed.svg new file mode 120000 index 0000000..ba6d4fe --- /dev/null +++ b/unity/close_dash_pressed.svg @@ -0,0 +1 @@ +close_unfocused_pressed.svg \ No newline at end of file diff --git a/unity/icons/close_dash.svg b/unity/icons/close_dash.svg deleted file mode 120000 index c20c766..0000000 --- a/unity/icons/close_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../close.svg \ No newline at end of file diff --git a/unity/icons/close_dash_disabled.svg b/unity/icons/close_dash_disabled.svg deleted file mode 120000 index 2775794..0000000 --- a/unity/icons/close_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_unfocused.svg \ No newline at end of file diff --git a/unity/icons/close_dash_prelight.svg b/unity/icons/close_dash_prelight.svg deleted file mode 120000 index 247f20b..0000000 --- a/unity/icons/close_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_prelight.svg \ No newline at end of file diff --git a/unity/icons/close_dash_pressed.svg b/unity/icons/close_dash_pressed.svg deleted file mode 120000 index 5f40ad1..0000000 --- a/unity/icons/close_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_pressed.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash.svg b/unity/icons/maximize_dash.svg deleted file mode 120000 index 4c8ea97..0000000 --- a/unity/icons/maximize_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash_disabled.svg b/unity/icons/maximize_dash_disabled.svg deleted file mode 120000 index ae51f77..0000000 --- a/unity/icons/maximize_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize_unfocused.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash_prelight.svg b/unity/icons/maximize_dash_prelight.svg deleted file mode 120000 index 4c8ea97..0000000 --- a/unity/icons/maximize_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash_pressed.svg b/unity/icons/maximize_dash_pressed.svg deleted file mode 120000 index 4c8ea97..0000000 --- a/unity/icons/maximize_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash.svg b/unity/icons/minimize_dash.svg deleted file mode 120000 index dc045ff..0000000 --- a/unity/icons/minimize_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash_disabled.svg b/unity/icons/minimize_dash_disabled.svg deleted file mode 120000 index bfdfa65..0000000 --- a/unity/icons/minimize_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize_unfocused.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash_prelight.svg b/unity/icons/minimize_dash_prelight.svg deleted file mode 120000 index 7777dbd..0000000 --- a/unity/icons/minimize_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize_focused_prelight.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash_pressed.svg b/unity/icons/minimize_dash_pressed.svg deleted file mode 120000 index 523611a..0000000 --- a/unity/icons/minimize_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize_focused_pressed.svg \ No newline at end of file diff --git a/unity/icons/sheet_style_close_focused.svg b/unity/icons/sheet_style_close_focused.svg deleted file mode 120000 index 2775794..0000000 --- a/unity/icons/sheet_style_close_focused.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_unfocused.svg \ No newline at end of file diff --git a/unity/icons/sheet_style_close_focused_prelight.svg b/unity/icons/sheet_style_close_focused_prelight.svg deleted file mode 120000 index 247f20b..0000000 --- a/unity/icons/sheet_style_close_focused_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_prelight.svg \ No newline at end of file diff --git a/unity/icons/sheet_style_close_focused_pressed.svg b/unity/icons/sheet_style_close_focused_pressed.svg deleted file mode 120000 index 5f40ad1..0000000 --- a/unity/icons/sheet_style_close_focused_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_pressed.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash.svg b/unity/icons/unmaximize_dash.svg deleted file mode 120000 index d96076c..0000000 --- a/unity/icons/unmaximize_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash_disabled.svg b/unity/icons/unmaximize_dash_disabled.svg deleted file mode 120000 index 9832785..0000000 --- a/unity/icons/unmaximize_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize_unfocused.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash_prelight.svg b/unity/icons/unmaximize_dash_prelight.svg deleted file mode 120000 index d96076c..0000000 --- a/unity/icons/unmaximize_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash_pressed.svg b/unity/icons/unmaximize_dash_pressed.svg deleted file mode 120000 index d96076c..0000000 --- a/unity/icons/unmaximize_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize.svg \ No newline at end of file diff --git a/unity/maximize_dash.svg b/unity/maximize_dash.svg new file mode 100644 index 0000000..bfd992c --- /dev/null +++ b/unity/maximize_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/maximize_dash_disabled.svg b/unity/maximize_dash_disabled.svg new file mode 120000 index 0000000..a933b39 --- /dev/null +++ b/unity/maximize_dash_disabled.svg @@ -0,0 +1 @@ +maximize_unfocused.svg \ No newline at end of file diff --git a/unity/maximize_dash_prelight.svg b/unity/maximize_dash_prelight.svg new file mode 120000 index 0000000..3efa75f --- /dev/null +++ b/unity/maximize_dash_prelight.svg @@ -0,0 +1 @@ +maximize_dash.svg \ No newline at end of file diff --git a/unity/maximize_dash_pressed.svg b/unity/maximize_dash_pressed.svg new file mode 120000 index 0000000..3efa75f --- /dev/null +++ b/unity/maximize_dash_pressed.svg @@ -0,0 +1 @@ +maximize_dash.svg \ No newline at end of file diff --git a/unity/minimize_dash.svg b/unity/minimize_dash.svg new file mode 100644 index 0000000..c838c2b --- /dev/null +++ b/unity/minimize_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/minimize_dash_disabled.svg b/unity/minimize_dash_disabled.svg new file mode 120000 index 0000000..ac8c42d --- /dev/null +++ b/unity/minimize_dash_disabled.svg @@ -0,0 +1 @@ +minimize_unfocused.svg \ No newline at end of file diff --git a/unity/minimize_dash_prelight.svg b/unity/minimize_dash_prelight.svg new file mode 120000 index 0000000..752db6d --- /dev/null +++ b/unity/minimize_dash_prelight.svg @@ -0,0 +1 @@ +minimize_focused_prelight.svg \ No newline at end of file diff --git a/unity/minimize_dash_pressed.svg b/unity/minimize_dash_pressed.svg new file mode 120000 index 0000000..d2b384b --- /dev/null +++ b/unity/minimize_dash_pressed.svg @@ -0,0 +1 @@ +minimize_focused_pressed.svg \ No newline at end of file diff --git a/unity/sheet_style_close_focused.svg b/unity/sheet_style_close_focused.svg new file mode 120000 index 0000000..0749829 --- /dev/null +++ b/unity/sheet_style_close_focused.svg @@ -0,0 +1 @@ +close_unfocused.svg \ No newline at end of file diff --git a/unity/sheet_style_close_focused_prelight.svg b/unity/sheet_style_close_focused_prelight.svg new file mode 120000 index 0000000..64b2bff --- /dev/null +++ b/unity/sheet_style_close_focused_prelight.svg @@ -0,0 +1 @@ +close_focused_prelight.svg \ No newline at end of file diff --git a/unity/sheet_style_close_focused_pressed.svg b/unity/sheet_style_close_focused_pressed.svg new file mode 120000 index 0000000..ba6d4fe --- /dev/null +++ b/unity/sheet_style_close_focused_pressed.svg @@ -0,0 +1 @@ +close_unfocused_pressed.svg \ No newline at end of file diff --git a/unity/unmaximize_dash.svg b/unity/unmaximize_dash.svg new file mode 100644 index 0000000..74a1d70 --- /dev/null +++ b/unity/unmaximize_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/unmaximize_dash_disabled.svg b/unity/unmaximize_dash_disabled.svg new file mode 120000 index 0000000..8340f67 --- /dev/null +++ b/unity/unmaximize_dash_disabled.svg @@ -0,0 +1 @@ +unmaximize_unfocused.svg \ No newline at end of file diff --git a/unity/unmaximize_dash_prelight.svg b/unity/unmaximize_dash_prelight.svg new file mode 120000 index 0000000..945a9f8 --- /dev/null +++ b/unity/unmaximize_dash_prelight.svg @@ -0,0 +1 @@ +unmaximize_dash.svg \ No newline at end of file diff --git a/unity/unmaximize_dash_pressed.svg b/unity/unmaximize_dash_pressed.svg new file mode 120000 index 0000000..945a9f8 --- /dev/null +++ b/unity/unmaximize_dash_pressed.svg @@ -0,0 +1 @@ +unmaximize_dash.svg \ No newline at end of file From 7f0f008de08c33ef5e0a65d7c67d5a45d9b83e7e Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 01:09:22 +0530 Subject: [PATCH 52/73] Various tweaks --- gtk-3.0/scss/widgets/_actionbar.scss | 2 +- gtk-3.0/scss/widgets/_base.scss | 112 +++--- gtk-3.0/scss/widgets/_button.scss | 529 ++++++++++++++------------- gtk-3.0/scss/widgets/_calendar.scss | 36 +- gtk-3.0/scss/widgets/_choosers.scss | 184 +++++----- gtk-3.0/scss/widgets/_entry.scss | 108 +++--- gtk-3.0/scss/widgets/_infobar.scss | 44 +-- gtk-3.0/scss/widgets/_menu.scss | 10 +- gtk-3.0/scss/widgets/_misc.scss | 216 +++++------ gtk-3.0/scss/widgets/_notebook.scss | 188 +++++----- gtk-3.0/scss/widgets/_progress.scss | 256 ++++++------- gtk-3.0/scss/widgets/_toggle.scss | 140 +++---- gtk-3.0/scss/widgets/_toolbar.scss | 2 +- gtk-3.0/scss/widgets/_window.scss | 60 +-- 14 files changed, 952 insertions(+), 935 deletions(-) diff --git a/gtk-3.0/scss/widgets/_actionbar.scss b/gtk-3.0/scss/widgets/_actionbar.scss index 6745b23..cfae302 100644 --- a/gtk-3.0/scss/widgets/_actionbar.scss +++ b/gtk-3.0/scss/widgets/_actionbar.scss @@ -80,7 +80,7 @@ @include toolbar($selected_bg_color, $selected_fg_color); .button { - @include button(shade($selected_bg_color, 1.68), shade($selected_bg_color, 0.8)); + @include button($selected_bg_color, $selected_fg_color); &.suggested-action { @extend .suggested-action.button; } } diff --git a/gtk-3.0/scss/widgets/_base.scss b/gtk-3.0/scss/widgets/_base.scss index bad015d..9897e50 100755 --- a/gtk-3.0/scss/widgets/_base.scss +++ b/gtk-3.0/scss/widgets/_base.scss @@ -3,19 +3,19 @@ ***************/ * { - -GtkArrow-arrow-scaling: 0.5; - -GtkExpander-expander-size: 8; - -GtkStatusbar-shadow-type: none; - -GtkToolItemGroup-expander-size: 8; - -GtkWindow-resize-grip-height: 0; - -GtkWindow-resize-grip-width: 0; - -WnckTasklist-fade-overlay-rect: 0; + -GtkArrow-arrow-scaling: 0.5; + -GtkExpander-expander-size: 8; + -GtkStatusbar-shadow-type: none; + -GtkToolItemGroup-expander-size: 8; + -GtkWindow-resize-grip-height: 0; + -GtkWindow-resize-grip-width: 0; + -WnckTasklist-fade-overlay-rect: 0; - outline-color: alpha($selected_bg_color, 0.5); - outline-style: dashed; - outline-width: 1px; - outline-offset: -1px; - outline-radius: $roundness; + outline-color: alpha($selected_bg_color, 0.5); + outline-style: dashed; + outline-width: 1px; + outline-offset: -1px; + outline-radius: $roundness; } @@ -24,77 +24,77 @@ *************/ %selected { - &, &:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } + &, &:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } } * { - &:selected { @extend %selected; } + &:selected { @extend %selected; } - &:insensitive, - &:insensitive:insensitive { color: mix($fg_color, $bg_color, 0.50); } + &:insensitive, + &:insensitive:insensitive { color: mix($fg_color, $bg_color, 0.50); } - &:insensitive { -gtk-image-effect: dim; } + &:insensitive { -gtk-image-effect: dim; } - &:hover { -gtk-image-effect: highlight; } + &:hover { -gtk-image-effect: highlight; } - /* hyperlinks */ - -GtkHTML-link-color: $link_color; - -GtkIMHtml-hyperlink-color: $link_color; - -GtkWidget-link-color: $link_color; - -GtkWidget-visited-link-color: $link_color; + /* hyperlinks */ + -GtkHTML-link-color: $link_color; + -GtkIMHtml-hyperlink-color: $link_color; + -GtkWidget-link-color: $link_color; + -GtkWidget-visited-link-color: $link_color; - &:link, &:visited { color: $link_color; } + &:link, &:visited { color: $link_color; } } .background { - background-color: $bg_color; - color: $fg_color; + background-color: $bg_color; + color: $fg_color; - &:backdrop { - text-shadow: none; - icon-shadow: none; - } + &:backdrop { + text-shadow: none; + icon-shadow: none; + } - &.csd { background-color: $bg_color; } + &.csd { background-color: $bg_color; } } .gtkstyle-fallback { - background-color: alpha($bg_color, .5); - color: $fg_color; + background-color: alpha($bg_color, .5); + color: $fg_color; - &:prelight { - background-color: shade($bg_color, 1.1); - color: $fg_color; - } + &:prelight { + background-color: shade($bg_color, 1.1); + color: $fg_color; + } - &:active { - background-color: shade($bg_color, 0.9); - color: $fg_color; - } + &:active { + background-color: shade($bg_color, 0.9); + color: $fg_color; + } - &:insensitive { - background-color: shade(shade($bg_color, 0.95), 1.05); - color: mix($fg_color, $bg_color, 0.50); - } + &:insensitive { + background-color: shade(shade($bg_color, 0.95), 1.05); + color: mix($fg_color, $bg_color, 0.50); + } - &:selected { @extend %selected; } + &:selected { @extend %selected; } } GtkImage, GtkLabel, GtkBox, GtkGrid { - &, &:insensitive { background-color: transparent; } + &, &:insensitive { background-color: transparent; } } GtkLabel { - &.separator { - color: $fg_color; + &.separator { + color: $fg_color; - @extend .dim-label; - } + @extend .dim-label; + } - &:selected { @extend %selected; } + &:selected { @extend %selected; } - &:insensitive { color: mix($fg_color, $bg_color, 0.50); } + &:insensitive { color: mix($fg_color, $bg_color, 0.50); } } diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index 60c81cd..e62bf60 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -2,304 +2,317 @@ ! Buttons **********/ -$shadow_strength: .3; - @include exports("button_extends") { - %button { - padding: $spacing ($spacing + 2px); - border-width: 1px; - border-style: solid; - border-radius: $roundness; - transition: 150ms ease; - outline-color: transparent; + %button { + padding: $spacing ($spacing + 2px); + border-width: 1px; + border-style: solid; + border-radius: $roundness; + transition: 150ms ease; + outline-color: transparent; - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; + -GtkWidget-focus-padding: 1; + -GtkWidget-focus-line-width: 0; &:focus, &:hover, &:active { transition: none; } - } + } - %linked_middle { - border-radius: 0; - border-left-style: none; - border-right-style: solid; + %linked_middle { + border-radius: 0; + border-left-style: none; + border-right-style: solid; - &:dir(rtl) { - border-radius: 0; // needed when including %linked_middle:dir(rtl) - border-right-style: none; - border-left-style: solid - } - } + &:dir(rtl) { + border-radius: 0; // needed when including %linked_middle:dir(rtl) + border-right-style: none; + border-left-style: solid + } + } - %linked_button { - border-width: 1px; - border-style: solid; - border-radius: 0; - border-right-style: none; - border-left-style: none; + %linked_button { + border-width: 1px; + border-style: solid; + border-radius: 0; + border-right-style: none; + border-left-style: none; - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: solid; - border-right-style: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; + &:first-child { + border-width: 1px; + border-radius: $roundness; + border-left-style: solid; + border-right-style: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; - &:dir(rtl) { - border-left-style: none; - border-right-style: solid; - } - } + &:dir(rtl) { + border-left-style: none; + border-right-style: solid; + } + } - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: none; - border-right-style: solid; - border-top-left-radius: 0; - border-bottom-left-radius: 0; + &:last-child { + border-width: 1px; + border-radius: $roundness; + border-left-style: none; + border-right-style: solid; + border-top-left-radius: 0; + border-bottom-left-radius: 0; - &:dir(rtl) { - border-left-style: solid; - border-right-style: none; - } - } + &:dir(rtl) { + border-left-style: solid; + border-right-style: none; + } + } - &:only-child, &:first-child:only-child { - border-width: 1px; - border-style: solid; - border-radius: $roundness; - } - } + &:only-child, &:first-child:only-child { + border-width: 1px; + border-style: solid; + border-radius: $roundness; + } + } } @mixin linked_button($bg) { - @extend %linked_button; + $border_strength: if(lightness($bg) > 50, 0, .1); + $shadow_strength: if(lightness($bg) > 50, 0, .1); - box-shadow: inset -1px 0 border_normal(rgba(0,0,0,.12)), - 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); + @extend %linked_button; - &:focus, &:hover { - box-shadow: inset -1px 0 border_focus(rgba(0,0,0,.12)), - 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); - } + box-shadow: inset -1px 0 border_normal(rgba(0,0,0,.12 + $border_strength)), + 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - &:active, &:active:hover, - &:active:focus, &:active:hover:focus, - &:checked, &:checked:hover, - &:checked:focus, &:checked:hover:focus { - box-shadow: inset -1px 0 border_active(rgba(0,0,0,.12)), - inset 0 1px alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - } + &:focus, &:hover { + box-shadow: inset -1px 0 border_focus(rgba(0,0,0,.12 + $border_strength)), + 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); + } - &:insensitive { box-shadow: inset -1px 0 shade($bg, .8); } + &:active, &:active:hover, + &:active:focus, &:active:hover:focus, + &:checked, &:checked:hover, + &:checked:focus, &:checked:hover:focus { + box-shadow: inset -1px 0 border_active(rgba(0,0,0,.12 + $border_strength)), + inset 0 1px alpha($dark_shadow, .07), + inset 0 -1px alpha($dark_shadow, .05); + } - &:last-child, &:only-child { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); } + &:insensitive { box-shadow: inset -1px 0 shade($bg, .8); } - &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } + &:last-child, &:only-child { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); } - &:insensitive:last-child, &:insensitive:only-child, - &:active:insensitive:last-child, &:active:insensitive:only-child, - &:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } + &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } - &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, - &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus, { - box-shadow: inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } + &:insensitive:last-child, &:insensitive:only-child, + &:active:insensitive:last-child, &:active:insensitive:only-child, + &:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } - &:active:only-child, &:active:only-child:focus, &:active:only-child:hover, &:active:only-child:hover:focus, - &:checked:only-child, &:checked:only-child:focus, &:checked:only-child:hover, &:checked:only-child:hover:focus { - box-shadow: inset 1px 0 alpha($dark_shadow, .06), - inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } + &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, + &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus, { + box-shadow: inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06); + } + + &:active:only-child, &:active:only-child:focus, &:active:only-child:hover, &:active:only-child:hover:focus, + &:checked:only-child, &:checked:only-child:focus, &:checked:only-child:hover, &:checked:only-child:hover:focus { + box-shadow: inset 1px 0 alpha($dark_shadow, .06), + inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06); + } } @mixin button($bg, $fg) { - @extend %button; - @include linear-gradient(shade($bg, 1.3)); - @include border(rgba(0,0,0,.12)); + $border_strength: if(lightness($bg) > 50, 0, .1); + $shadow_strength: if(lightness($bg) > 50, 0, .1); - color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - border-color: alpha($bg, 0); + $button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg); - &.flat { - border-color: alpha($bg, 0); - background-color: alpha($bg, 0); - background-image: none; - box-shadow: none; - } + @extend %button; + @include linear-gradient($button_bg); + @include border(rgba(0,0,0,.12 + $border_strength)); - &, &.flat { - &:focus, &:hover { - @include linear-gradient(shade($bg, 1.4)); + color: $fg; + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - border-color: alpha($bg, 0); - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); - } + &.flat { + border-color: alpha($button_bg, 0); + background-color: alpha($button_bg, 0); + background-image: none; + box-shadow: none; + } - &:active, &:checked { - @include linear-gradient(shade($bg, .9), to top); + &, &.flat { + &:focus, &:hover { + @include linear-gradient(shade($button_bg, 1.2)); + @include border(rgba(0,0,0,.2 + $border_strength)); - color: $fg; - box-shadow: inset 1px 0 alpha($dark_shadow, .06), - inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06), - inset 0 -1px alpha($dark_shadow, .05); - } + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); + } - &:active:insensitive, &:checked:insensitive { - @include linear-gradient(shade($bg, .8)); + &:active, &:checked { + @include linear-gradient(shade($button_bg, .7), to top); - color: $fg; - box-shadow: none; - } + color: white; + box-shadow: inset 1px 0 alpha($dark_shadow, .06), + inset 0 1px alpha($dark_shadow, .07), + inset -1px 0 alpha($dark_shadow, .06), + inset 0 -1px alpha($dark_shadow, .05); + + &:focus, &:hover { + @include linear-gradient(shade($button_bg, .65), to top); + + color: white; + } + } + + &:focus, &:hover { color: $fg; } + + &:active:insensitive, &:checked:insensitive { + @include linear-gradient(shade($button_bg, .9)); + + color: $fg; + box-shadow: none; + } &:insensitive:insensitive { - @if (lightness($bg) > 50) { - @include linear-gradient(shade($bg, .95)); + @if (lightness($button_bg) > 50) { + @include linear-gradient(shade($button_bg, .95)); } @else { - @include linear-gradient(alpha($bg, .3)); + @include linear-gradient(alpha($button_bg, .3)); } color: mix($bg, $fg, .5); box-shadow: none; } - } + } - &.separator, .separator { - border: 1px solid currentColor; - color: shade($bg, ($contrast + .1)); + &.separator, .separator { + border: 1px solid currentColor; + color: shade($bg, ($contrast + .1)); - &:insensitive { color: shade($bg, .85); } - } + &:insensitive { color: shade($button_bg, .85); } + } } @include exports("button") { - * { - -GtkButton-child-displacement-x: 0; - -GtkButton-child-displacement-y: 0; - -GtkButton-default-border: 0; - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 1; - -GtkButton-interior-focus: true; - -GtkButtonBox-child-min-height: 24; - -GtkButtonBox-child-internal-pad-y: 1; - -GtkToolButton-icon-spacing: 6; - } + * { + -GtkButton-child-displacement-x: 0; + -GtkButton-child-displacement-y: 0; + -GtkButton-default-border: 0; + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 1; + -GtkButton-interior-focus: true; + -GtkButtonBox-child-min-height: 24; + -GtkButtonBox-child-internal-pad-y: 1; + -GtkToolButton-icon-spacing: 6; + } - %close_button { - border: 1px solid transparent; - background-color: transparent; - background-image: none; - box-shadow: none; + %close_button { + border: 1px solid transparent; + background-color: transparent; + background-image: none; + box-shadow: none; - &:focus, &:hover { - border: 1px solid alpha(black, .3); - background-color: alpha(white, .2); - background-image: none; - box-shadow: none; - } + &:focus, &:hover { + border: 1px solid alpha(black, .3); + background-color: alpha(white, .2); + background-image: none; + box-shadow: none; + } - &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha(black, .3); - background-color: alpha(black, .1); - background-image: none; - box-shadow: none; - } - } + &:active, &:checked, &:active:hover, &:checked:hover { + border: 1px solid alpha(black, .3); + background-color: alpha(black, .1); + background-image: none; + box-shadow: none; + } + } - .button { - @include button($bg_color, $fg_color); + .button { + @include button(shade($bg_color, 1.2), $fg_color); - &.default { @include button($selected_bg_color, $selected_fg_color); } + &.default { @include button($selected_bg_color, $selected_fg_color); } - &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); } + &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); } - .spinbutton & { - color: mix($text_color, $base_color, .4); - padding: $spacing ($spacing * 2); - border: none; - border-radius: 0; - border-style: none; - background-color: transparent; - background-image: none; - box-shadow: inset 1px 0 shade($base_color, .9); + .spinbutton & { + color: mix($text_color, $base_color, .4); + padding: $spacing ($spacing * 2); + border: none; + border-radius: 0; + border-style: none; + background-color: transparent; + background-image: none; + box-shadow: inset 1px 0 shade($base_color, .9); - &:insensitive { - color: mix($text_color, $base_color, .7); - box-shadow: inset 1px 0 shade($base_color, .85); - } + &:insensitive { + color: mix($text_color, $base_color, .7); + box-shadow: inset 1px 0 shade($base_color, .85); + } - &:active, &:checked, &:hover { color: $text_color; } + &:active, &:checked, &:hover { color: $text_color; } - &:first-child { - border-radius: $roundness 0 0 $roundness; - box-shadow: none; - } + &:first-child { + border-radius: $roundness 0 0 $roundness; + box-shadow: none; + } - &:last-child { border-radius: 0 $roundness $roundness 0; } + &:last-child { border-radius: 0 $roundness $roundness 0; } - &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, .9); } - } + &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, .9); } + } - .spinbutton.vertical & { - border: 1px solid shade($bg_color, .8); - border-radius: $roundness; - background-color: shade($bg_color, 1.08); - background-image: none; - color: $fg_color; - box-shadow: none; + .spinbutton.vertical & { + border: 1px solid shade($bg_color, .8); + border-radius: $roundness; + background-color: shade($bg_color, 1.08); + background-image: none; + color: $fg_color; + box-shadow: none; - &:hover { - border-color: shade($bg_color, .7); - background-color: shade($bg_color, 1.1); - background-image: none; - } + &:hover { + border-color: shade($bg_color, .7); + background-color: shade($bg_color, 1.1); + background-image: none; + } - &:active, &:checked { - border-color: shade($bg_color, .8); - background-color: shade($bg_color, .95); - background-image: none; - } + &:active, &:checked { + border-color: shade($bg_color, .8); + background-color: shade($bg_color, .95); + background-image: none; + } - &:active:hover, &:checked:hover { - border-color: shade($bg_color, .7); - } + &:active:hover, &:checked:hover { + border-color: shade($bg_color, .7); + } - &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, .7); } + &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, .7); } - &:insensitive { - border-color: shade($bg_color, .85); - background-color: shade($bg_color, .9); - background-image: none; - } + &:insensitive { + border-color: shade($bg_color, .85); + background-color: shade($bg_color, .9); + background-image: none; + } - &:first-child { - border-width: 1px; - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } + &:first-child { + border-width: 1px; + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } - &:last-child { - border-width: 1px; - border-top-width: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - } + &:last-child { + border-width: 1px; + border-top-width: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; + } + } - .spinbutton.vertical.entry { - border-width: 1px; - border-style: solid; - border-radius: 0; - } - } + .spinbutton.vertical.entry { + border-width: 1px; + border-style: solid; + border-radius: 0; + } + } } @@ -308,41 +321,41 @@ $shadow_strength: .3; *******************/ @include exports("combobox") { - GtkComboBox { - > .button { - padding: ($spacing - 2px) ($spacing + 1px); + GtkComboBox { + > .button { + padding: ($spacing - 2px) ($spacing + 1px); - -GtkComboBox-arrow-scaling: .5; - -GtkComboBox-shadow-type: none; - } + -GtkComboBox-arrow-scaling: .5; + -GtkComboBox-shadow-type: none; + } - &.combobox-entry { - .entry, .button { @extend %linked_button; } - } + &.combobox-entry { + .entry, .button { @extend %linked_button; } + } - .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; + .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; - border-style: none; - } - } + border-style: none; + } + } - .linked > GtkComboBox { - > .button { - // the combo is a composite widget so the way we do button linked doesn't - // work, special case needed. See - // https://bugzilla.gnome.org/show_bug.cgi?id=733979 - &:dir(ltr) { @extend %linked_middle; } // specificity bump - &:dir(rtl) { @extend %linked_middle:dir(rtl); } - } + .linked > GtkComboBox { + > .button { + // the combo is a composite widget so the way we do button linked doesn't + // work, special case needed. See + // https://bugzilla.gnome.org/show_bug.cgi?id=733979 + &:dir(ltr) { @extend %linked_middle; } // specificity bump + &:dir(rtl) { @extend %linked_middle:dir(rtl); } + } - &:first-child > .button { @extend %linked_button:first-child; } + &:first-child > .button { @extend %linked_button:first-child; } - &:last-child > .button { @extend %linked_button:last-child; } + &:last-child > .button { @extend %linked_button:last-child; } - &:only-child > .button { @extend %linked_button:only-child; } - } + &:only-child > .button { @extend %linked_button:only-child; } + } } diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss index 909ea9c..d9705f4 100644 --- a/gtk-3.0/scss/widgets/_calendar.scss +++ b/gtk-3.0/scss/widgets/_calendar.scss @@ -3,27 +3,27 @@ ***********/ @include exports("calendar") { - GtkCalendar { - padding: $spacing; - outline-offset: -1px; + GtkCalendar { + padding: $spacing; + outline-offset: -1px; - &:inconsistent { color: mix($fg_color, $bg_color, 0.5); } + &:inconsistent { color: mix($fg_color, $bg_color, 0.5); } - &.view, &.highlight, &.header, &.button { - &, &:focus, &:hover, &:insensitive { - border: none; - background-color: transparent; - background-image: none; - } - } + &.view, &.highlight, &.header, &.button { + &, &:focus, &:hover, &:insensitive { + border: none; + background-color: transparent; + background-image: none; + } + } - &.highlight { color: $selected_bg_color; } - } + &.highlight { color: $selected_bg_color; } + } - /* gnome-calendar */ - .calendar-view { - background-color: $base_color; - color: $text_color; - } + /* gnome-calendar */ + .calendar-view { + background-color: $base_color; + color: $text_color; + } } diff --git a/gtk-3.0/scss/widgets/_choosers.scss b/gtk-3.0/scss/widgets/_choosers.scss index 6b00d52..53f1de2 100644 --- a/gtk-3.0/scss/widgets/_choosers.scss +++ b/gtk-3.0/scss/widgets/_choosers.scss @@ -3,86 +3,86 @@ ****************/ @include exports("colorchooser") { - GtkColorSwatch { - &, &:selected { - border: 1px solid alpha(black, 0.1); - border-radius: $roundness - 1px; - background-color: transparent; - background-clip: border-box; + GtkColorSwatch { + &, &:selected { + border: 1px solid alpha(black, 0.1); + border-radius: $roundness - 1px; + background-color: transparent; + background-clip: border-box; - &:hover { border-color: alpha(black, 0.3); } - } + &:hover { border-color: alpha(black, 0.3); } + } - &.color-light:selected:hover, &.color-dark:selected:hover { background-image: none; } + &.color-light:selected:hover, &.color-dark:selected:hover { background-image: none; } - &.left, &:first-child { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } + &.left, &:first-child { + border-top-left-radius: $roundness; + border-bottom-left-radius: $roundness; + } - &.right, &:last-child { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } + &.right, &:last-child { + border-top-right-radius: $roundness; + border-bottom-right-radius: $roundness; + } - &:only-child { border-radius: $roundness; } + &:only-child { border-radius: $roundness; } - &.top { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; - } + &.top { + border-top-left-radius: $roundness; + border-top-right-radius: $roundness; + } - &.bottom { - border-bottom-left-radius: $roundness; - border-bottom-right-radius: $roundness; - } + &.bottom { + border-bottom-left-radius: $roundness; + border-bottom-right-radius: $roundness; + } - GtkColorEditor & { - border-radius: $roundness; + GtkColorEditor & { + border-radius: $roundness; - &.color-dark:hover, &.color-light:hover { - background-image: none; - border-color: alpha(black, 0.3); - } - } - } + &.color-dark:hover, &.color-light:hover { + background-image: none; + border-color: alpha(black, 0.3); + } + } + } - GtkColorChooserWidget #add-color-button { - background-clip: padding-box; - border-color: alpha(black, 0.1); - background-color: shade($bg_color, 0.95); - color: $fg_color; + GtkColorChooserWidget #add-color-button { + background-clip: padding-box; + border-color: alpha(black, 0.1); + background-color: shade($bg_color, 0.95); + color: $fg_color; - &:hover { - border-color: alpha(black, 0.3); - background-color: shade($bg_color, 0.90); - color: $fg_color; - } - } + &:hover { + border-color: alpha(black, 0.3); + background-color: shade($bg_color, 0.90); + color: $fg_color; + } + } - .color-active-badge { - &, &:selected { - border-width: 2px; - border-style: solid; - background-color: transparent; - } + .color-active-badge { + &, &:selected { + border-width: 2px; + border-style: solid; + background-color: transparent; + } - &.color-light { - &, &:hover { - border-color: alpha(black, 0.3); - color: alpha(black, 0.3); - } - } + &.color-light { + &, &:hover { + border-color: alpha(black, 0.3); + color: alpha(black, 0.3); + } + } - &.color-dark { - &, &:hover { - border-color: alpha(white, 0.3); - color: alpha(white, 0.3); - } - } - } + &.color-dark { + &, &:hover { + border-color: alpha(white, 0.3); + color: alpha(white, 0.3); + } + } + } - GtkColorButton.button { padding: $spacing; } + GtkColorButton.button { padding: $spacing; } } @@ -91,35 +91,35 @@ ************************/ @include exports("miscchoosers") { - GtkFontButton, GtkFileChooserButton { - .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; - } + GtkFontButton, GtkFileChooserButton { + .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; + } - GtkLabel:last-child { color: alpha(currentColor, 0.7); } + GtkLabel:last-child { color: alpha(currentColor, 0.7); } - GtkImage:last-child { color: alpha(currentColor, 0.7); } - } + GtkImage:last-child { color: alpha(currentColor, 0.7); } + } - GtkFileChooser { - .pane-separator { - &, &:hover { - border-width: 0 1px 0 0; - border-style: solid; - border-color: currentColor; - background-color: $bg_color; - color: shade($bg_color, ($contrast + .1)); - } - } + GtkFileChooser { + .pane-separator { + &, &:hover { + border-width: 0 1px 0 0; + border-style: solid; + border-color: currentColor; + background-color: $bg_color; + color: shade($bg_color, ($contrast + .1)); + } + } - /* for fallback when header bar not used */ - .dialog-action-box { - border-width: 1px 0 0; - border-style: solid; - border-color: shade($bg_color, 0.7); - } - } + /* for fallback when header bar not used */ + .dialog-action-box { + border-width: 1px 0 0; + border-style: solid; + border-color: shade($bg_color, 0.7); + } + } } diff --git a/gtk-3.0/scss/widgets/_entry.scss b/gtk-3.0/scss/widgets/_entry.scss index 6605f01..e8d7562 100755 --- a/gtk-3.0/scss/widgets/_entry.scss +++ b/gtk-3.0/scss/widgets/_entry.scss @@ -3,82 +3,82 @@ **********/ %linked_entry { - border-width: 1px; - border-radius: 0; - border-right-width: 0; - border-left-width: 0; + border-width: 1px; + border-radius: 0; + border-right-width: 0; + border-left-width: 0; - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-right-width: 0; - border-bottom-right-radius: 0; - border-top-right-radius: 0; - } + &:first-child { + border-width: 1px; + border-radius: $roundness; + border-right-width: 0; + border-bottom-right-radius: 0; + border-top-right-radius: 0; + } - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } + &:last-child { + border-width: 1px; + border-radius: $roundness; + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } - &:only-child { - border-width: 1px; - border-radius: $roundness; - } + &:only-child { + border-width: 1px; + border-radius: $roundness; + } } %entry { - padding: ($spacing - 1px) $spacing; - border-width: 1px; - border-style: solid; - border-radius: $roundness; - transition: border 150ms ease; - box-shadow: inset 1px 1px alpha($dark_shadow, .06), - inset -1px 0 alpha($dark_shadow, .06); + padding: ($spacing - 1px) $spacing; + border-width: 1px; + border-style: solid; + border-radius: $roundness; + transition: border 150ms ease; + box-shadow: inset 1px 1px alpha($dark_shadow, .06), + inset -1px 0 alpha($dark_shadow, .06); &:focus, &:hover, &:active { transition: none; } - &:selected, &:selected:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } + &:selected, &:selected:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } - &:insensitive { box-shadow: none; } + &:insensitive { box-shadow: none; } - &.progressbar { - @include linear-gradient($selected_bg_color); + &.progressbar { + @include linear-gradient($selected_bg_color); - border-width: 0; - border-radius: $roundness; - color: $selected_fg_color; - } + border-width: 0; + border-radius: $roundness; + color: $selected_fg_color; + } - &.image.left { padding-right: $spacing; } + &.image.left { padding-right: $spacing; } } @mixin entry($bg, $fg) { - @extend %entry; - @include linear-gradient($bg, to top); - @include border($bg); + @extend %entry; + @include linear-gradient($bg, to top); + @include border($bg); - color: $fg; + color: $fg; - &:focus, &:active { border-color: $selected_bg_color; } + &:focus, &:active { border-color: $selected_bg_color; } - &:insensitive { - @include linear-gradient(shade($bg, .9), to top); + &:insensitive { + @include linear-gradient(shade($bg, .9), to top); - color: mix($bg, $fg, .5); - } + color: mix($bg, $fg, .5); + } } @include exports("entry") { - .entry { - @include entry($base_color, $text_color); + .entry { + @include entry($base_color, $text_color); - &.linked, .linked & { @extend %linked_entry; } - } + &.linked, .linked & { @extend %linked_entry; } + } } diff --git a/gtk-3.0/scss/widgets/_infobar.scss b/gtk-3.0/scss/widgets/_infobar.scss index faf4e5c..1579c01 100644 --- a/gtk-3.0/scss/widgets/_infobar.scss +++ b/gtk-3.0/scss/widgets/_infobar.scss @@ -6,33 +6,33 @@ **********/ @include exports("infobar") { - GtkInfoBar { - border: none; + GtkInfoBar { + border: none; - $types: ( - info: ( $info_fg_color, $info_bg_color ), - warning: ( $warning_fg_color, $warning_bg_color ), - question: ( $question_fg_color, $question_bg_color ), - error: ( $error_fg_color, $error_bg_color ), - ); + $types: ( + info: ( $info_fg_color, $info_bg_color ), + warning: ( $warning_fg_color, $warning_bg_color ), + question: ( $question_fg_color, $question_bg_color ), + error: ( $error_fg_color, $error_bg_color ), + ); - @each $type, $colors in $types { - $fg_color: nth($colors, 1); - $bg_color: nth($colors, 2); + @each $type, $colors in $types { + $fg_color: nth($colors, 1); + $bg_color: nth($colors, 2); - &.#{$type} { - @include linear-gradient($bg_color); + &.#{$type} { + @include linear-gradient($bg_color); - border: 1px solid shade($bg_color, 0.8); - color: $fg_color; + border: 1px solid shade($bg_color, 0.8); + color: $fg_color; - .button { - @include button($bg_color, $fg_color); + .button { + @include button($bg_color, $fg_color); - &.close { @extend %close_button; } - } - } - } - } + &.close { @extend %close_button; } + } + } + } + } } diff --git a/gtk-3.0/scss/widgets/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss index 35a2581..8b08c5c 100755 --- a/gtk-3.0/scss/widgets/_menu.scss +++ b/gtk-3.0/scss/widgets/_menu.scss @@ -117,18 +117,18 @@ color: shade($menu_bg_color, ($contrast + .1)); } - &.button { + &.button, &.button.flat { &, &:focus, &:active, &:insensitive, &:active:insensitive { background-color: transparent; background-image: none; - border: none; + border: 0; box-shadow: none; color: currentColor; } &:hover, &:focus:hover, &:active:hover, &:selected { - background-color: $selected_bg_color; background-image: none; + background-color: $selected_bg_color; color: $selected_fg_color; } } @@ -175,7 +175,7 @@ background-color: $menu_bg_color; background-image: none; color: $menu_fg_color; - box-shadow: 0 2px 3px alpha(black, .5); + box-shadow: 0 3px 6px alpha(black, .16); &.background { background-image: none; @@ -199,7 +199,7 @@ .view, .list { background-color: transparent; background-image: none; - color: $menu_fg_color; + color: $menu_fg_color; } .list-row { diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index 8eb1de3..177f8de 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -3,10 +3,10 @@ ****************/ @include exports("dimlabel") { - .dim-label { - opacity: 0.5; - text-shadow: none; - } + .dim-label { + opacity: 0.5; + text-shadow: none; + } } @@ -15,15 +15,15 @@ ************/ @include exports("tooltip") { - .tooltip { - @include linear-gradient($tooltip_bg_color); + .tooltip { + @include linear-gradient($tooltip_bg_color); - border: none; - border-radius: $roundness; - color: $tooltip_fg_color; + border: none; + border-radius: $roundness; + color: $tooltip_fg_color; - * { background-color: transparent; } - } + * { background-color: transparent; } + } } @@ -32,14 +32,14 @@ ************/ @include exports("dialogs") { - GtkMessageDialog, .message-dialog, .prompt { - -GtkDialog-content-area-border: 0; - -GtkDialog-action-area-border: $spacing; - -GtkDialog-button-spacing: 0; + GtkMessageDialog, .message-dialog, .prompt { + -GtkDialog-content-area-border: 0; + -GtkDialog-action-area-border: $spacing; + -GtkDialog-button-spacing: 0; - margin: 0; - padding: 0; - } + margin: 0; + padding: 0; + } } @@ -48,16 +48,20 @@ **********************/ @include exports("notifications") { - .app-notification { - border-style: solid; - border-color: border_normal($base_color); - border-width: 0 1px 1px 1px; - border-radius: 0 0 $roundness $roundness; - padding: $spacing * 3; - background-color: $base_color; - background-image: none; - color: $text_color; - } + .app-notification { + &, &.frame { + border-style: solid; + border-color: border_normal($osd_bg); + border-width: 0 1px 1px 1px; + border-radius: 0 0 $roundness $roundness; + padding: $spacing * 2; + background-color: $osd_bg; + background-image: none; + color: $osd_fg; + + .button { @include button($osd_bg, $osd_fg); } + } + } } @@ -66,25 +70,25 @@ **************/ @include exports("expander") { - GtkExpander { - padding: $spacing; - outline-offset: 1px; - } + GtkExpander { + padding: $spacing; + outline-offset: 1px; + } - .expander { - color: alpha(currentColor, 0.7); - border: alpha(currentColor, 0.7); + .expander { + color: alpha(currentColor, 0.7); + border: alpha(currentColor, 0.7); - &:hover { - color: alpha(currentColor, 0.8); - border-color: alpha(currentColor, 0.8); - } + &:hover { + color: alpha(currentColor, 0.8); + border-color: alpha(currentColor, 0.8); + } - &:active { - color: alpha(currentColor, 0.9); - border-color: alpha(currentColor, 0.9); - } - } + &:active { + color: alpha(currentColor, 0.9); + border-color: alpha(currentColor, 0.9); + } + } } @@ -93,13 +97,13 @@ ********************/ @include exports("symbolicimage") { - .image { - color: alpha(currentColor, 0.5); + .image { + color: alpha(currentColor, 0.5); - &:hover { color: alpha(currentColor, 0.9); } + &:hover { color: alpha(currentColor, 0.9); } - &:selected, &:selected:hover { color: $selected_fg_color; } - } + &:selected, &:selected:hover { color: $selected_fg_color; } + } } @@ -108,46 +112,46 @@ *****************/ @include exports("floatingbar") { - .floating-bar { - @include linear-gradient($bg_color); + .floating-bar { + @include linear-gradient($bg_color); - border: 1px solid border_normal($bg_color); - border-radius: $roundness; - color: $fg_color; + border: 1px solid border_normal($bg_color); + border-radius: $roundness; + color: $fg_color; - &.top { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; - } + &.top { + border-top-width: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; + } - &.right { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } + &.right { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } - &.bottom { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } + &.bottom { + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } - &.left { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } + &.left { + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } - .button { - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; + .button { + -GtkButton-image-spacing: 0; + -GtkButton-inner-border: 0; - border: none; - background-color: transparent; - background-image: none; - } - } + border: none; + background-color: transparent; + background-image: none; + } + } } @@ -156,14 +160,14 @@ **************************/ @include exports("touchbubble") { - GtkBubbleWindow { - border-radius: $roundness; - background-clip: border-box; + GtkBubbleWindow { + border-radius: $roundness; + background-clip: border-box; - &.osd.background { background-color: $osd_bg; } + &.osd.background { background-color: $osd_bg; } - .toolbar { background-color: transparent; } - } + .toolbar { background-color: transparent; } + } } /*************** @@ -171,9 +175,9 @@ ****************/ @include exports("fontviewer") { - SushiFontWidget { - padding: $spacing ($spacing * 2); - } + SushiFontWidget { + padding: $spacing ($spacing * 2); + } } @@ -182,12 +186,12 @@ **************/ @include exports("charmap") { - GucharmapChartable { - background-color: $base_color; - color: $text_color; + GucharmapChartable { + background-color: $base_color; + color: $text_color; - &:focus, &:hover, &:active, &:selected { @extend %selected; } - } + &:focus, &:hover, &:active, &:selected { @extend %selected; } + } } @@ -196,10 +200,10 @@ **************/ @include exports("evolution") { - EPreviewPane .entry { - background-color: $base_color; - color: $text_color; - } + EPreviewPane .entry { + background-color: $base_color; + color: $text_color; + } } @@ -208,11 +212,11 @@ ********************/ @include exports("gnome-bluetooth") { - GtkEntry.entry.pin-entry { - font: regular 50; - padding-left: 25px; - padding-right: 25px; - } + GtkEntry.entry.pin-entry { + font: regular 50; + padding-left: 25px; + padding-right: 25px; + } - GtkLabel.pin-label { font: regular 50; } + GtkLabel.pin-label { font: regular 50; } } diff --git a/gtk-3.0/scss/widgets/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss index e3c155e..b0ecfbb 100644 --- a/gtk-3.0/scss/widgets/_notebook.scss +++ b/gtk-3.0/scss/widgets/_notebook.scss @@ -6,121 +6,121 @@ ***********/ @include exports("notebook") { - .notebook { - padding: 0; - border-width: 1px 0 0 0; - border-style: solid; - border-color: border_normal($base_color); - border-radius: 0; - background-color: $base_color; - background-image: none; - background-clip: border-box; - color: $text_color; + .notebook { + padding: 0; + border-width: 1px 0 0 0; + border-style: solid; + border-color: border_normal($base_color); + border-radius: 0; + background-color: $base_color; + background-image: none; + background-clip: border-box; + color: $text_color; - -GtkNotebook-initial-gap: 0; - -GtkNotebook-arrow-spacing: 5; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 1; - -GtkNotebook-has-tab-gap: false; + -GtkNotebook-initial-gap: 0; + -GtkNotebook-arrow-spacing: 5; + -GtkNotebook-tab-curvature: 0; + -GtkNotebook-tab-overlap: 1; + -GtkNotebook-has-tab-gap: false; - &.frame { border-width: 1px; } + &.frame { border-width: 1px; } - &.header { - border-width: 0; - background-color: shade($base_color, .9); + &.header { + border-width: 0; + background-color: shade($base_color, .9); - &.frame { - border-color: border_normal($base_color); + &.frame { + border-color: border_normal($base_color); - &.top { border-width: 1px 1px 0 1px; } + &.top { border-width: 1px 1px 0 1px; } - &.right { border-width: 1px 1px 1px 0; } + &.right { border-width: 1px 1px 1px 0; } - &.bottom { border-width: 0 1px 1px 1px; } + &.bottom { border-width: 0 1px 1px 1px; } - &.left { border-width: 1px 0 1px 1px; } - } - } + &.left { border-width: 1px 0 1px 1px; } + } + } - GtkViewport { - border-width: 0; - background-color: $base_color; - color: $text_color; - } + GtkViewport { + border-width: 0; + background-color: $base_color; + color: $text_color; + } - tab { - padding: ($spacing + 1px) ($spacing * 2); - border: 1px solid transparent; - background-color: transparent; - background-image: none; + tab { + padding: ($spacing + 1px) ($spacing * 2); + border: 1px solid transparent; + background-color: transparent; + background-image: none; - &:hover { - background-color: shade($base_color, .95); - border-color: shade($base_color, .8); - } + &:hover { + background-color: shade($base_color, .95); + border-color: shade($base_color, .8); + } - &:active { - background-color: $base_color; - background-image: none; - border-color: shade($base_color, .85); - } + &:active { + background-color: $base_color; + background-image: none; + border-color: shade($base_color, .85); + } - &.top { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } + &.top { + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } - &.right { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } + &.right { + border-left-width: 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } - &.bottom { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; - } + &.bottom { + border-top-width: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; + } - &.left { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } + &.left { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } - GtkLabel { color: mix($text_color, $base_color, 0.3); } + GtkLabel { color: mix($text_color, $base_color, 0.3); } - /* close button styling */ - .button { @extend %close_button; } - } + /* close button styling */ + .button { @extend %close_button; } + } - .prelight-page { - &, GtkLabel { color: mix($text_color, $base_color, 0.15); } - } + .prelight-page { + &, GtkLabel { color: mix($text_color, $base_color, 0.15); } + } - .active-page { - &, GtkLabel { color: $text_color; } - } + .active-page { + &, GtkLabel { color: $text_color; } + } - .reorderable-page { - &:hover { - background-color: shade($base_color, 0.85); - border-left: 0; - border-right: 0; - /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); - } + .reorderable-page { + &:hover { + background-color: shade($base_color, 0.85); + border-left: 0; + border-right: 0; + /* using box shadows instead of borders due to slanted edges */ + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); + } - &:active { - background-color: shade($base_color, 0.90); - border-left: 0; - border-right: 0; - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); - } - } - } + &:active { + background-color: shade($base_color, 0.90); + border-left: 0; + border-right: 0; + box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), + inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); + } + } + } } diff --git a/gtk-3.0/scss/widgets/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss index f6943df..25064a9 100644 --- a/gtk-3.0/scss/widgets/_progress.scss +++ b/gtk-3.0/scss/widgets/_progress.scss @@ -3,170 +3,170 @@ ******************/ @include exports("progressbar") { - GtkProgressBar { - padding: 0; - border-radius: $roundness; - font-size: smaller; - color: alpha($fg_color, 0.6); + GtkProgressBar { + padding: 0; + border-radius: $roundness; + font-size: smaller; + color: alpha($fg_color, 0.6); - -GtkProgressBar-min-horizontal-bar-height: 6; - -GtkProgressBar-min-vertical-bar-width: 6; + -GtkProgressBar-min-horizontal-bar-height: 6; + -GtkProgressBar-min-vertical-bar-width: 6; - &.osd { - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 0; - -GtkProgressBar-min-horizontal-bar-height: 4; - } + &.osd { + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 0; + -GtkProgressBar-min-horizontal-bar-height: 3; + } - &.trough { - border: 1px solid alpha(border_normal($bg_color), 0.5); - background-color: shade($bg_color, 1.08); - background-image: none; - } - } + &.trough { + border: 1px solid alpha(border_normal($bg_color), 0.5); + background-color: shade($bg_color, 1.08); + background-image: none; + } + } - .progressbar { - @include linear-gradient($selected_bg_color); + .progressbar { + @include linear-gradient($selected_bg_color); - border-radius: 0; - box-shadow: none; + border-radius: 0; + box-shadow: none; - &.left { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } + &.left { + border-top-left-radius: $roundness; + border-bottom-left-radius: $roundness; + } - &.right { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } + &.right { + border-top-right-radius: $roundness; + border-bottom-right-radius: $roundness; + } - &.left.right { box-shadow: none; } + &.left.right { box-shadow: none; } - &.vertical { - @include linear-gradient($selected_bg_color, to right); + &.vertical { + @include linear-gradient($selected_bg_color, to right); - &.bottom { - border-bottom-left-radius: $roundness; - border-bottom-right-radius: $roundness; - } + &.bottom { + border-bottom-left-radius: $roundness; + border-bottom-right-radius: $roundness; + } - &.top { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; - } - } - } + &.top { + border-top-left-radius: $roundness; + border-top-right-radius: $roundness; + } + } + } - GtkLevelBar { - -GtkLevelBar-min-block-width: 34; - -GtkLevelBar-min-block-height: 3; + GtkLevelBar { + -GtkLevelBar-min-block-width: 34; + -GtkLevelBar-min-block-height: 3; - &.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; - } - } + &.vertical { + -GtkLevelBar-min-block-width: 3; + -GtkLevelBar-min-block-height: 34; + } + } - .level-bar { - &.trough { - @include linear-gradient(shade($bg_color, 1.08), to top); + .level-bar { + &.trough { + @include linear-gradient(shade($bg_color, 1.08), to top); - border: 1px solid alpha(border_normal($bg_color), 0.5); - border-radius: $roundness; - } + border: 1px solid alpha(border_normal($bg_color), 0.5); + border-radius: $roundness; + } - &.fill-block { - @include linear-gradient($selected_bg_color); + &.fill-block { + @include linear-gradient($selected_bg_color); - // FIXME: it would be nice to set make fill blocks bigger, but we'd need - // :nth-child working on discrete indicators - border-color: transparent; - border-radius: 0; + // FIXME: it would be nice to set make fill blocks bigger, but we'd need + // :nth-child working on discrete indicators + border-color: transparent; + border-radius: 0; - &.indicator-discrete { - &.horizontal { margin-right: 1px; } - &.vertical { margin-bottom: 1px; } - } + &.indicator-discrete { + &.horizontal { margin-right: 1px; } + &.vertical { margin-bottom: 1px; } + } - &.level-high { - background-color: $success_color; - border-color: transparent; - } + &.level-high { + background-color: $success_color; + border-color: transparent; + } - &.level-low { - background-color: $warning_color; - border-color: transparent; - } + &.level-low { + background-color: $warning_color; + border-color: transparent; + } - &.empty-fill-block { - background-color: transparent; - border-color: transparent; - box-shadow: none; - } - } - } + &.empty-fill-block { + background-color: transparent; + border-color: transparent; + box-shadow: none; + } + } + } - .scale { - -GtkRange-slider-width: 16; - -GtkRange-trough-border: 1; - -GtkScale-slider-length: 16; + .scale { + -GtkRange-slider-width: 16; + -GtkRange-trough-border: 1; + -GtkScale-slider-length: 16; - padding: 0; - border-width: 1px; - border-radius: $roundness; - outline-offset: -1px; + padding: 0; + border-width: 1px; + border-radius: $roundness; + outline-offset: -1px; - &.slider { - @include linear-gradient($base_color); - @include border($base_color); + &.slider { + @include linear-gradient(shade($bg_color, 1.08)); + @include border($bg_color); - border-radius: 8px; - border-width: 1px; - border-style: solid; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); + border-radius: 8px; + border-width: 1px; + border-style: solid; + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); - &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } - } + &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } + } - &.fine-tune { - &, &.horizontal { - &:active, &:active:hover { - background-size: 50%; - background-repeat: no-repeat; - background-position: center; - } - } - } + &.fine-tune { + &, &.horizontal { + &:active, &:active:hover { + background-size: 50%; + background-repeat: no-repeat; + background-position: center; + } + } + } - &.mark { border-color: alpha(border_normal($bg_color), 0.5); } + &.mark { border-color: alpha(border_normal($bg_color), 0.5); } - &.trough { - @include linear-gradient(shade($bg_color, 1.08)); + &.trough { + @include linear-gradient(shade($bg_color, 1.08)); - margin: 8px 0; - border: 0; - border-radius: $roundness; + margin: 7px 0; + border: 1px solid alpha(border_normal($bg_color), 0.5); + border-radius: $roundness; - &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } + &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } - &.vertical { margin: 0 8px; } - } + &.vertical { margin: 0 7px; } + } - &.highlight { - &, &.left, &.bottom { - @include linear-gradient($selected_bg_color); + &.highlight { + &, &.left, &.bottom { + @include linear-gradient($selected_bg_color); - border-color: $selected_bg_color; + border-color: $selected_bg_color; - &:insensitive { - @include linear-gradient(shade($bg_color, 0.8)); + &:insensitive { + @include linear-gradient(shade($bg_color, 0.8)); - border-color: shade($bg_color, 0.7); - } - } - } - } + border-color: shade($bg_color, 0.7); + } + } + } + } } diff --git a/gtk-3.0/scss/widgets/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss index c9e40f0..a13a427 100755 --- a/gtk-3.0/scss/widgets/_toggle.scss +++ b/gtk-3.0/scss/widgets/_toggle.scss @@ -5,62 +5,62 @@ $suffix: if($variant == "dark", "-dark", ""); @mixin toggle($type) { - background-image: none; + background-image: none; - -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.png"); + -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.png"); - &:insensitive { -gtk-icon-source: url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"); } + &:insensitive { -gtk-icon-source: url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"); } - &:checked, &:active { - -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.png"); + &:checked, &:active { + -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.png"); - &:insensitive { -gtk-icon-source: url("../assets/#{$type}-checked-insensitive#{$suffix}.png"); } - } + &:insensitive { -gtk-icon-source: url("../assets/#{$type}-checked-insensitive#{$suffix}.png"); } + } - &:inconsistent { - -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.png"); + &:inconsistent { + -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.png"); - &:insensitive { -gtk-icon-source: url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"); } - } + &:insensitive { -gtk-icon-source: url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"); } + } - &.menuitem { - -gtk-icon-source: none; + &.menuitem { + -gtk-icon-source: none; - &:insensitive { -gtk-icon-source: none; } + &:insensitive { -gtk-icon-source: none; } - &:checked, &:active { - -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.png"); + &:checked, &:active { + -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.png"); - &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.png"); } + &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.png"); } - &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png"); } - } + &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png"); } + } - &:inconsistent { - -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.png"); + &:inconsistent { + -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.png"); - &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.png"); } + &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.png"); } - &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-insensitive.png"); } - } - } + &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-insensitive.png"); } + } + } } @include exports("checkradio") { - * { - -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 16; - } + * { + -GtkCheckButton-indicator-size: 16; + -GtkCheckMenuItem-indicator-size: 16; + } - .radio { @include toggle("radio"); } + .radio { @include toggle("radio"); } - .check { @include toggle("checkbox"); } + .check { @include toggle("checkbox"); } - GtkIconView.content-view.cell.check { - -gtk-icon-source: url("assets/grid-selection-unchecked#{$suffix}.png"); + GtkIconView.content-view.cell.check { + -gtk-icon-source: url("assets/grid-selection-unchecked#{$suffix}.png"); - &:active { -gtk-icon-source: url("assets/grid-selection-checked#{$suffix}.png"); } - } + &:active { -gtk-icon-source: url("assets/grid-selection-checked#{$suffix}.png"); } + } } @@ -69,48 +69,48 @@ $suffix: if($variant == "dark", "-dark", ""); *********/ @include exports("switch") { - GtkSwitch { - padding: 0; - border-radius: $roundness; - font: bold condensed; - outline-offset: -4px; + GtkSwitch { + padding: 0; + border-radius: $roundness; + font: bold condensed; + outline-offset: -4px; - &.slider { - @include linear-gradient(shade($bg_color, 1.2)); + &.slider { + @include linear-gradient(shade($bg_color, 1.2)); - border: 1px solid rgba(0,0,0,0.2); - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12); + border: 1px solid rgba(0,0,0,0.2); + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12); - &:insensitive { - border-color: rgba(0,0,0,0.1); - background-color: shade($bg_color, 0.9); - box-shadow: none; - } - } + &:insensitive { + border-color: rgba(0,0,0,0.1); + background-color: shade($bg_color, 0.9); + box-shadow: none; + } + } - &.trough { - @include linear-gradient(shade($bg_color, .95), to top); + &.trough { + @include linear-gradient(shade($bg_color, .95), to top); - border: 1px solid border_normal($bg_color); - color: $fg_color; - box-shadow: inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), - inset -1px 0 alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); + border: 1px solid border_normal($bg_color); + color: $fg_color; + box-shadow: inset 1px 0 alpha($dark_shadow, .07), + inset 0 1px alpha($dark_shadow, .08), + inset -1px 0 alpha($dark_shadow, .07), + inset 0 -1px alpha($dark_shadow, .05); - &:active { - @include linear-gradient($selected_bg_color, to top); + &:active { + @include linear-gradient($selected_bg_color, to top); - border-color: shade($selected_bg_color, 0.9); - color: $selected_fg_color; - } + border-color: shade($selected_bg_color, 0.9); + color: $selected_fg_color; + } - &:insensitive { - @include linear-gradient(shade($bg_color, .9), to top); + &:insensitive { + @include linear-gradient(shade($bg_color, .9), to top); - border-color: border_insensitive($bg_color); - color: mix($fg_color, $bg_color, 0.5); - } - } - } + border-color: border_insensitive($bg_color); + color: mix($fg_color, $bg_color, 0.5); + } + } + } } diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss index f8866ea..e391f3d 100755 --- a/gtk-3.0/scss/widgets/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -102,7 +102,7 @@ &:hover, &:hover:focus { background-image: none; background-color: transparent; - color: $selected_bg-color; + color: $selected_bg_color; box-shadow: none; } diff --git a/gtk-3.0/scss/widgets/_window.scss b/gtk-3.0/scss/widgets/_window.scss index 0b8f88b..0921bd8 100755 --- a/gtk-3.0/scss/widgets/_window.scss +++ b/gtk-3.0/scss/widgets/_window.scss @@ -3,44 +3,44 @@ ***************/ @include exports("window") { - %window { - box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22), - 0 0 0 1px $wm_border_focused; + %window { + box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22), + 0 0 0 1px $wm_border_focused; - &:backdrop { - box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), - 0 0 0 1px $wm_border_unfocused; - } - } + &:backdrop { + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), + 0 0 0 1px $wm_border_unfocused; + } + } - .window-frame { - @extend %window; + .window-frame { + @extend %window; - border: 0; - border-radius: $roundness + 1; + border: none; + border-radius: $roundness $roundness 0 0; - /* this is used for the resize cursor area */ - margin: $spacing * 3; + /* this is used for the resize cursor area */ + margin: $spacing * 3; - &.tiled { border-radius: 0; } + &.tiled { border-radius: 0; } - &.csd { - &.popup { - @extend %window; + &.csd { + &.popup { + @extend %window; - border-radius: 0; - } + border-radius: 0; + } - &.tooltip { - border-radius: $roundness; - box-shadow: none; - } + &.tooltip { + border-radius: $roundness; + box-shadow: none; + } - &.message-dialog { - @extend %window; + &.message-dialog { + @extend %window; - border-radius: $roundness; - } - } - } + border-radius: $roundness; + } + } + } } From 5ef83db45e44ae51dfbb16148bd2c53692b4940f Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 01:37:34 +0530 Subject: [PATCH 53/73] Use gresource --- .gitignore | 1 + gtk-3.0/gtk-dark.css | 2 +- gtk-3.0/gtk.css | 2 +- gtk-3.0/gtk.gresource.xml | 46 +++++++++++++++++++++++++++++++++ gtk-3.0/scss/widgets/_misc.scss | 15 +++++++---- 5 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 gtk-3.0/gtk.gresource.xml diff --git a/.gitignore b/.gitignore index c8a7d64..e1c2565 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ # Ignore SASS files .sass-cache +gtk.gresource dist diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 3c469d4..b00626d 100755 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -1 +1 @@ -@import url("dist/gtk-dark.css"); +@import url("resource:///org/numixproject/gtk/dist/gtk-dark.css"); diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 415ea7b..c6eab95 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1 +1 @@ -@import url("dist/gtk.css"); +@import url("resource:///org/numixproject/gtk/dist/gtk.css"); diff --git a/gtk-3.0/gtk.gresource.xml b/gtk-3.0/gtk.gresource.xml new file mode 100644 index 0000000..47bc2ea --- /dev/null +++ b/gtk-3.0/gtk.gresource.xml @@ -0,0 +1,46 @@ + + + + assets/checkbox-checked-dark.png + assets/checkbox-checked-insensitive-dark.png + assets/checkbox-checked-insensitive.png + assets/checkbox-checked.png + assets/checkbox-mixed-dark.png + assets/checkbox-mixed-insensitive-dark.png + assets/checkbox-mixed-insensitive.png + assets/checkbox-mixed.png + assets/checkbox-unchecked-dark.png + assets/checkbox-unchecked-insensitive-dark.png + assets/checkbox-unchecked-insensitive.png + assets/checkbox-unchecked.png + assets/grid-selection-checked-dark.png + assets/grid-selection-checked.png + assets/grid-selection-unchecked-dark.png + assets/grid-selection-unchecked.png + assets/menuitem-checkbox-checked-hover.png + assets/menuitem-checkbox-checked-insensitive.png + assets/menuitem-checkbox-checked.png + assets/menuitem-checkbox-mixed-hover.png + assets/menuitem-checkbox-mixed-insensitive.png + assets/menuitem-checkbox-mixed.png + assets/menuitem-radio-checked-hover.png + assets/menuitem-radio-checked-insensitive.png + assets/menuitem-radio-checked.png + assets/radio-checked-dark.png + assets/radio-checked-insensitive-dark.png + assets/radio-checked-insensitive.png + assets/radio-checked.png + assets/radio-mixed-dark.png + assets/radio-mixed-insensitive-dark.png + assets/radio-mixed-insensitive.png + assets/radio-mixed.png + assets/radio-unchecked-dark.png + assets/radio-unchecked-insensitive-dark.png + assets/radio-unchecked-insensitive.png + assets/radio-unchecked.png + dist/gtk.css + dist/gtk.css.map + dist/gtk-dark.css + dist/gtk-dark.css.map + + diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index 177f8de..3436192 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -16,13 +16,18 @@ @include exports("tooltip") { .tooltip { - @include linear-gradient($tooltip_bg_color); + &.background { + @include linear-gradient($tooltip_bg_color); - border: none; - border-radius: $roundness; - color: $tooltip_fg_color; + border: none; + border-radius: $roundness; + color: $tooltip_fg_color; + } - * { background-color: transparent; } + * { + background-color: transparent; + color: inherit; + } } } From 8ef0df096fe6668134f266338533829bda5e3190 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 01:37:58 +0530 Subject: [PATCH 54/73] All new Makefile --- Makefile | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a3777f1..7b56e49 100755 --- a/Makefile +++ b/Makefile @@ -1,14 +1,45 @@ -SASS=sass -SCSS_DIR=gtk-3.0/scss -DIST_DIR=gtk-3.0/dist +SASS=scss +SASSFLAGS=--sourcemap=none +GLIB_COMPILE_RESOURCES=glib-compile-resources +RES_DIR=gtk-3.0 +SCSS_DIR=$(RES_DIR)/scss +DIST_DIR=$(RES_DIR)/dist +INSTALL_DIR=$(DESTDIR)/usr/share/themes/Ozon + +all: gresource css: - $(SASS) --sourcemap=none --update $(SCSS_DIR):$(DIST_DIR) + $(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR) -all: css +gresource: css + $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml + +watch: + while true; do \ + make gresource; \ + inotifywait @gtk.gresource -qr -e modify -e create -e delete $(RES_DIR); \ + done clean: rm -rf $(DIST_DIR) + rm -f $(RES_DIR)/gtk.gresource +install: all + install -d -m755 $(INSTALL_DIR) + + for f in *; do cp -pr $$f $(INSTALL_DIR)/; done + +uninstall: + rm -rf $(INSTALL_DIR) + +.PHONY: all .PHONY: css +.PHONY: watch +.PHONY: gresource +.PHONY: clean +.PHONY: install +.PHONY: uninstall + +.DEFAULT_GOAL := all + # vim: set ts=4 sw=4 tw=0 noet : From 9a1b4be82d3d065479002f7e43b50d2748e566ad Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 01:56:02 +0530 Subject: [PATCH 55/73] Run clean by default --- Makefile | 4 ++-- gtk-3.0/gtk.gresource.xml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7b56e49..cc651b5 100755 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ SCSS_DIR=$(RES_DIR)/scss DIST_DIR=$(RES_DIR)/dist INSTALL_DIR=$(DESTDIR)/usr/share/themes/Ozon -all: gresource +all: clean gresource css: $(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR) @@ -14,7 +14,7 @@ css: gresource: css $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml -watch: +watch: clean while true; do \ make gresource; \ inotifywait @gtk.gresource -qr -e modify -e create -e delete $(RES_DIR); \ diff --git a/gtk-3.0/gtk.gresource.xml b/gtk-3.0/gtk.gresource.xml index 47bc2ea..7bba375 100644 --- a/gtk-3.0/gtk.gresource.xml +++ b/gtk-3.0/gtk.gresource.xml @@ -39,8 +39,6 @@ assets/radio-unchecked-insensitive.png assets/radio-unchecked.png dist/gtk.css - dist/gtk.css.map dist/gtk-dark.css - dist/gtk-dark.css.map From 4e71a5a5811ff3531c5b51b127a8da7a808620e4 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 02:19:29 +0530 Subject: [PATCH 56/73] Fix install directory --- Makefile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cc651b5..4f666d9 100755 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ GLIB_COMPILE_RESOURCES=glib-compile-resources RES_DIR=gtk-3.0 SCSS_DIR=$(RES_DIR)/scss DIST_DIR=$(RES_DIR)/dist -INSTALL_DIR=$(DESTDIR)/usr/share/themes/Ozon +INSTALL_DIR=$(DESTDIR)/usr/share/themes/Numix all: clean gresource diff --git a/README.md b/README.md index d6d1756..4155081 100755 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ xfconf-query -c xfwm4 -p /general/theme -s "Numix" ### Requirements -GTK+ 3.6 or above +GTK+ 3.16 or above Murrine theme engine From c5d460c4d2898d0dd71845187288a6a890113c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= Date: Thu, 18 Jun 2015 08:31:57 -0300 Subject: [PATCH 57/73] Fix LXDE panel window buttons' style --- gtk-2.0/gtkrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 790890a..3ddb9a6 100755 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -477,6 +477,11 @@ widget_class "*Applet*Tomboy*" style "murrine-panel" widget_class "*Applet*Netstatus*" style "murrine-panel" widget "*gdm-user-switch-menubar*" style "murrine-panel" +# LXPanel (code based on Lubuntu-default theme's gtkrc file) +widget "*.tclock.*" style "murrine-panel" +widget "*.taskbar.*" style "murrine-panel" +widget_class "*GtkBgbox*" style "murrine-panel" + style "bold-panel-item" { font_name = "Bold" From ec5a26c9875398c6d40f80cd8085e6aa7bedc972 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 20 May 2015 09:16:27 +0200 Subject: [PATCH 58/73] Deletes unnecessary folder icons --- unity/icons/close_dash.svg | 1 - unity/icons/close_dash_disabled.svg | 1 - unity/icons/close_dash_prelight.svg | 1 - unity/icons/close_dash_pressed.svg | 1 - unity/icons/maximize_dash.svg | 1 - unity/icons/maximize_dash_disabled.svg | 1 - unity/icons/maximize_dash_prelight.svg | 1 - unity/icons/maximize_dash_pressed.svg | 1 - unity/icons/minimize_dash.svg | 1 - unity/icons/minimize_dash_disabled.svg | 1 - unity/icons/minimize_dash_prelight.svg | 1 - unity/icons/minimize_dash_pressed.svg | 1 - unity/icons/sheet_style_close_focused.svg | 1 - unity/icons/sheet_style_close_focused_prelight.svg | 1 - unity/icons/sheet_style_close_focused_pressed.svg | 1 - unity/icons/unmaximize_dash.svg | 1 - unity/icons/unmaximize_dash_disabled.svg | 1 - unity/icons/unmaximize_dash_prelight.svg | 1 - unity/icons/unmaximize_dash_pressed.svg | 1 - 19 files changed, 19 deletions(-) delete mode 120000 unity/icons/close_dash.svg delete mode 120000 unity/icons/close_dash_disabled.svg delete mode 120000 unity/icons/close_dash_prelight.svg delete mode 120000 unity/icons/close_dash_pressed.svg delete mode 120000 unity/icons/maximize_dash.svg delete mode 120000 unity/icons/maximize_dash_disabled.svg delete mode 120000 unity/icons/maximize_dash_prelight.svg delete mode 120000 unity/icons/maximize_dash_pressed.svg delete mode 120000 unity/icons/minimize_dash.svg delete mode 120000 unity/icons/minimize_dash_disabled.svg delete mode 120000 unity/icons/minimize_dash_prelight.svg delete mode 120000 unity/icons/minimize_dash_pressed.svg delete mode 120000 unity/icons/sheet_style_close_focused.svg delete mode 120000 unity/icons/sheet_style_close_focused_prelight.svg delete mode 120000 unity/icons/sheet_style_close_focused_pressed.svg delete mode 120000 unity/icons/unmaximize_dash.svg delete mode 120000 unity/icons/unmaximize_dash_disabled.svg delete mode 120000 unity/icons/unmaximize_dash_prelight.svg delete mode 120000 unity/icons/unmaximize_dash_pressed.svg diff --git a/unity/icons/close_dash.svg b/unity/icons/close_dash.svg deleted file mode 120000 index c20c766..0000000 --- a/unity/icons/close_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../close.svg \ No newline at end of file diff --git a/unity/icons/close_dash_disabled.svg b/unity/icons/close_dash_disabled.svg deleted file mode 120000 index 2775794..0000000 --- a/unity/icons/close_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_unfocused.svg \ No newline at end of file diff --git a/unity/icons/close_dash_prelight.svg b/unity/icons/close_dash_prelight.svg deleted file mode 120000 index 247f20b..0000000 --- a/unity/icons/close_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_prelight.svg \ No newline at end of file diff --git a/unity/icons/close_dash_pressed.svg b/unity/icons/close_dash_pressed.svg deleted file mode 120000 index 5f40ad1..0000000 --- a/unity/icons/close_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_pressed.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash.svg b/unity/icons/maximize_dash.svg deleted file mode 120000 index 4c8ea97..0000000 --- a/unity/icons/maximize_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash_disabled.svg b/unity/icons/maximize_dash_disabled.svg deleted file mode 120000 index ae51f77..0000000 --- a/unity/icons/maximize_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize_unfocused.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash_prelight.svg b/unity/icons/maximize_dash_prelight.svg deleted file mode 120000 index 4c8ea97..0000000 --- a/unity/icons/maximize_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize.svg \ No newline at end of file diff --git a/unity/icons/maximize_dash_pressed.svg b/unity/icons/maximize_dash_pressed.svg deleted file mode 120000 index 4c8ea97..0000000 --- a/unity/icons/maximize_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../maximize.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash.svg b/unity/icons/minimize_dash.svg deleted file mode 120000 index dc045ff..0000000 --- a/unity/icons/minimize_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash_disabled.svg b/unity/icons/minimize_dash_disabled.svg deleted file mode 120000 index bfdfa65..0000000 --- a/unity/icons/minimize_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize_unfocused.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash_prelight.svg b/unity/icons/minimize_dash_prelight.svg deleted file mode 120000 index 7777dbd..0000000 --- a/unity/icons/minimize_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize_focused_prelight.svg \ No newline at end of file diff --git a/unity/icons/minimize_dash_pressed.svg b/unity/icons/minimize_dash_pressed.svg deleted file mode 120000 index 523611a..0000000 --- a/unity/icons/minimize_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../minimize_focused_pressed.svg \ No newline at end of file diff --git a/unity/icons/sheet_style_close_focused.svg b/unity/icons/sheet_style_close_focused.svg deleted file mode 120000 index 2775794..0000000 --- a/unity/icons/sheet_style_close_focused.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_unfocused.svg \ No newline at end of file diff --git a/unity/icons/sheet_style_close_focused_prelight.svg b/unity/icons/sheet_style_close_focused_prelight.svg deleted file mode 120000 index 247f20b..0000000 --- a/unity/icons/sheet_style_close_focused_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_prelight.svg \ No newline at end of file diff --git a/unity/icons/sheet_style_close_focused_pressed.svg b/unity/icons/sheet_style_close_focused_pressed.svg deleted file mode 120000 index 5f40ad1..0000000 --- a/unity/icons/sheet_style_close_focused_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../close_focused_pressed.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash.svg b/unity/icons/unmaximize_dash.svg deleted file mode 120000 index d96076c..0000000 --- a/unity/icons/unmaximize_dash.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash_disabled.svg b/unity/icons/unmaximize_dash_disabled.svg deleted file mode 120000 index 9832785..0000000 --- a/unity/icons/unmaximize_dash_disabled.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize_unfocused.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash_prelight.svg b/unity/icons/unmaximize_dash_prelight.svg deleted file mode 120000 index d96076c..0000000 --- a/unity/icons/unmaximize_dash_prelight.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize.svg \ No newline at end of file diff --git a/unity/icons/unmaximize_dash_pressed.svg b/unity/icons/unmaximize_dash_pressed.svg deleted file mode 120000 index d96076c..0000000 --- a/unity/icons/unmaximize_dash_pressed.svg +++ /dev/null @@ -1 +0,0 @@ -./../unmaximize.svg \ No newline at end of file From 59b110a0e0b57302db2d7227830695aeb316e890 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 20 May 2015 09:13:41 +0200 Subject: [PATCH 59/73] Moves unity icons to correct location --- unity/close_dash.svg | 1 + unity/close_dash_disabled.svg | 1 + unity/close_dash_prelight.svg | 1 + unity/close_dash_pressed.svg | 1 + unity/maximize_dash.svg | 1 + unity/maximize_dash_disabled.svg | 1 + unity/maximize_dash_prelight.svg | 1 + unity/maximize_dash_pressed.svg | 1 + unity/minimize_dash.svg | 1 + unity/minimize_dash_disabled.svg | 1 + unity/minimize_dash_prelight.svg | 1 + unity/minimize_dash_pressed.svg | 1 + unity/sheet_style_close_focused.svg | 1 + unity/sheet_style_close_focused_prelight.svg | 1 + unity/sheet_style_close_focused_pressed.svg | 1 + unity/unmaximize_dash.svg | 1 + unity/unmaximize_dash_disabled.svg | 1 + unity/unmaximize_dash_prelight.svg | 1 + unity/unmaximize_dash_pressed.svg | 1 + 19 files changed, 19 insertions(+) create mode 100644 unity/close_dash.svg create mode 120000 unity/close_dash_disabled.svg create mode 120000 unity/close_dash_prelight.svg create mode 120000 unity/close_dash_pressed.svg create mode 100644 unity/maximize_dash.svg create mode 120000 unity/maximize_dash_disabled.svg create mode 120000 unity/maximize_dash_prelight.svg create mode 120000 unity/maximize_dash_pressed.svg create mode 100644 unity/minimize_dash.svg create mode 120000 unity/minimize_dash_disabled.svg create mode 120000 unity/minimize_dash_prelight.svg create mode 120000 unity/minimize_dash_pressed.svg create mode 120000 unity/sheet_style_close_focused.svg create mode 120000 unity/sheet_style_close_focused_prelight.svg create mode 120000 unity/sheet_style_close_focused_pressed.svg create mode 100644 unity/unmaximize_dash.svg create mode 120000 unity/unmaximize_dash_disabled.svg create mode 120000 unity/unmaximize_dash_prelight.svg create mode 120000 unity/unmaximize_dash_pressed.svg diff --git a/unity/close_dash.svg b/unity/close_dash.svg new file mode 100644 index 0000000..752e8a0 --- /dev/null +++ b/unity/close_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/close_dash_disabled.svg b/unity/close_dash_disabled.svg new file mode 120000 index 0000000..0749829 --- /dev/null +++ b/unity/close_dash_disabled.svg @@ -0,0 +1 @@ +close_unfocused.svg \ No newline at end of file diff --git a/unity/close_dash_prelight.svg b/unity/close_dash_prelight.svg new file mode 120000 index 0000000..64b2bff --- /dev/null +++ b/unity/close_dash_prelight.svg @@ -0,0 +1 @@ +close_focused_prelight.svg \ No newline at end of file diff --git a/unity/close_dash_pressed.svg b/unity/close_dash_pressed.svg new file mode 120000 index 0000000..ba6d4fe --- /dev/null +++ b/unity/close_dash_pressed.svg @@ -0,0 +1 @@ +close_unfocused_pressed.svg \ No newline at end of file diff --git a/unity/maximize_dash.svg b/unity/maximize_dash.svg new file mode 100644 index 0000000..bfd992c --- /dev/null +++ b/unity/maximize_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/maximize_dash_disabled.svg b/unity/maximize_dash_disabled.svg new file mode 120000 index 0000000..a933b39 --- /dev/null +++ b/unity/maximize_dash_disabled.svg @@ -0,0 +1 @@ +maximize_unfocused.svg \ No newline at end of file diff --git a/unity/maximize_dash_prelight.svg b/unity/maximize_dash_prelight.svg new file mode 120000 index 0000000..3efa75f --- /dev/null +++ b/unity/maximize_dash_prelight.svg @@ -0,0 +1 @@ +maximize_dash.svg \ No newline at end of file diff --git a/unity/maximize_dash_pressed.svg b/unity/maximize_dash_pressed.svg new file mode 120000 index 0000000..3efa75f --- /dev/null +++ b/unity/maximize_dash_pressed.svg @@ -0,0 +1 @@ +maximize_dash.svg \ No newline at end of file diff --git a/unity/minimize_dash.svg b/unity/minimize_dash.svg new file mode 100644 index 0000000..c838c2b --- /dev/null +++ b/unity/minimize_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/minimize_dash_disabled.svg b/unity/minimize_dash_disabled.svg new file mode 120000 index 0000000..ac8c42d --- /dev/null +++ b/unity/minimize_dash_disabled.svg @@ -0,0 +1 @@ +minimize_unfocused.svg \ No newline at end of file diff --git a/unity/minimize_dash_prelight.svg b/unity/minimize_dash_prelight.svg new file mode 120000 index 0000000..752db6d --- /dev/null +++ b/unity/minimize_dash_prelight.svg @@ -0,0 +1 @@ +minimize_focused_prelight.svg \ No newline at end of file diff --git a/unity/minimize_dash_pressed.svg b/unity/minimize_dash_pressed.svg new file mode 120000 index 0000000..d2b384b --- /dev/null +++ b/unity/minimize_dash_pressed.svg @@ -0,0 +1 @@ +minimize_focused_pressed.svg \ No newline at end of file diff --git a/unity/sheet_style_close_focused.svg b/unity/sheet_style_close_focused.svg new file mode 120000 index 0000000..0749829 --- /dev/null +++ b/unity/sheet_style_close_focused.svg @@ -0,0 +1 @@ +close_unfocused.svg \ No newline at end of file diff --git a/unity/sheet_style_close_focused_prelight.svg b/unity/sheet_style_close_focused_prelight.svg new file mode 120000 index 0000000..64b2bff --- /dev/null +++ b/unity/sheet_style_close_focused_prelight.svg @@ -0,0 +1 @@ +close_focused_prelight.svg \ No newline at end of file diff --git a/unity/sheet_style_close_focused_pressed.svg b/unity/sheet_style_close_focused_pressed.svg new file mode 120000 index 0000000..ba6d4fe --- /dev/null +++ b/unity/sheet_style_close_focused_pressed.svg @@ -0,0 +1 @@ +close_unfocused_pressed.svg \ No newline at end of file diff --git a/unity/unmaximize_dash.svg b/unity/unmaximize_dash.svg new file mode 100644 index 0000000..74a1d70 --- /dev/null +++ b/unity/unmaximize_dash.svg @@ -0,0 +1 @@ + diff --git a/unity/unmaximize_dash_disabled.svg b/unity/unmaximize_dash_disabled.svg new file mode 120000 index 0000000..8340f67 --- /dev/null +++ b/unity/unmaximize_dash_disabled.svg @@ -0,0 +1 @@ +unmaximize_unfocused.svg \ No newline at end of file diff --git a/unity/unmaximize_dash_prelight.svg b/unity/unmaximize_dash_prelight.svg new file mode 120000 index 0000000..945a9f8 --- /dev/null +++ b/unity/unmaximize_dash_prelight.svg @@ -0,0 +1 @@ +unmaximize_dash.svg \ No newline at end of file diff --git a/unity/unmaximize_dash_pressed.svg b/unity/unmaximize_dash_pressed.svg new file mode 120000 index 0000000..945a9f8 --- /dev/null +++ b/unity/unmaximize_dash_pressed.svg @@ -0,0 +1 @@ +unmaximize_dash.svg \ No newline at end of file From b452bf4a6b171d74da9e66ec0c76f6adf56f898a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hajo=20M=C3=B6ller?= Date: Fri, 15 May 2015 20:42:50 +0200 Subject: [PATCH 60/73] Fix Workspace Switcher styling Fixes #217 --- gtk-2.0/gtkrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 3ddb9a6..cad7702 100755 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -499,6 +499,7 @@ widget "*gimmie*" style "bold-panel-item" # XFCE Styles style "workspace-switcher" = "murrine-panel" { + bg[ACTIVE] = @selected_bg_color bg[SELECTED] = @selected_bg_color } @@ -568,7 +569,7 @@ style "xfsm-logout-button" { } } -widget "*WnckPager*" style "workspace-switcher" +widget "*Pager*" style "workspace-switcher" widget "*Xfce*Panel*" style "murrine-panel" class "*Xfce*Panel*" style "murrine-panel" From 27fa75eed62c989fe56164b4a5cf24bfa4396b56 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 02:52:27 +0530 Subject: [PATCH 61/73] Update installation instructions --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4155081..33cd6a9 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,23 @@ Numix is a part of the [Numix Project](http://numixproject.org). ### Manual installation -Extract the zip file to the themes directory i.e. `/usr/share/themes/` +First, you need to compile the theme using the [Sass](http://sass-lang.com/) compiler. + +To install Sass, install ruby and the gem command using your distro's package manager. Then install `sass` with the `gem` command, + +`gem install sass` + +You'll also need the following commands in your path to generate the gresource binary. Install them using your distro's package manager. + +* `glib-compile-schemas` +* `gdk-pixbuf-pixdata` + +After installing all the dependencies, switch to the cloned directory and, run the following in Terminal, + +``` +make +sudo make install +``` To set the theme in Gnome, run the following commands in Terminal, From 39beccc205d1e24ad57f9e12e9decd7b8b8ccae4 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 03:06:51 +0530 Subject: [PATCH 62/73] Consistent colors for GTK2 --- gtk-2.0/gtkrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index cad7702..a25991f 100755 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,6 +1,6 @@ # Numix GTK Theme -gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#333333\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#333333\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#333333\ntitlebar_fg_color:#eeeeee\nmenubar_bg_color:#333333\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#333333\nmenu_bg_color:#333333\nmenu_fg_color:#eeeeee\npanel_bg_color:#333333\npanel_fg_color:#eeeeee\nlink_color:#f06860" +gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#555555\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#444444\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#444444\ntitlebar_fg_color:#cccccc\nmenubar_bg_color:#444444\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#555555\nmenu_bg_color:#444444\nmenu_fg_color:#cccccc\npanel_bg_color:#444444\npanel_fg_color:#eeeeee\nlink_color:#f06860" # Default Style From 0799234903e315884877e1cc9cf46c6c69db1837 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 03:09:54 +0530 Subject: [PATCH 63/73] Lighter text color for dark theme --- gtk-2.0/gtkrc | 2 +- gtk-3.0/scss/_global.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index a25991f..815d6e8 100755 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,6 +1,6 @@ # Numix GTK Theme -gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#555555\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#444444\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#444444\ntitlebar_fg_color:#cccccc\nmenubar_bg_color:#444444\nmenubar_fg_color:#eeeeee\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#555555\nmenu_bg_color:#444444\nmenu_fg_color:#cccccc\npanel_bg_color:#444444\npanel_fg_color:#eeeeee\nlink_color:#f06860" +gtk-color-scheme = "bg_color:#eeeeee\nfg_color:#555555\nbase_color:#ffffff\ntext_color:#333333\nselected_bg_color:#f0544c\nselected_fg_color:#ffffff\ntooltip_bg_color:#444444\ntooltip_fg_color:#eeeeee\ntitlebar_bg_color:#444444\ntitlebar_fg_color:#dddddd\nmenubar_bg_color:#444444\nmenubar_fg_color:#dddddd\ntoolbar_bg_color:#eeeeee\ntoolbar_fg_color:#555555\nmenu_bg_color:#444444\nmenu_fg_color:#dddddd\npanel_bg_color:#444444\npanel_fg_color:#dddddd\nlink_color:#f06860" # Default Style diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index 1110ace..6f78913 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -2,7 +2,7 @@ // default color scheme $bg_color: if($variant == "dark", #444, #eee); -$fg_color: if($variant == "dark", #ccc, #555); +$fg_color: if($variant == "dark", #ddd, #555); $base_color: if($variant == "dark", #333, #fff); $text_color: if($variant == "dark", #eee, #333); $selected_bg_color: #f0544c; From e1a476689ab8e770428ce5f181ddd40a78a20135 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 03:23:14 +0530 Subject: [PATCH 64/73] Add SSD style --- gtk-3.0/scss/widgets/_toolbar.scss | 2 +- gtk-3.0/scss/widgets/_window.scss | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss index e391f3d..91fe30c 100755 --- a/gtk-3.0/scss/widgets/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -6,7 +6,7 @@ **********/ @mixin toolbar($bg, $fg) { - @include linear-gradient($bg); + @incluee linear-gradient($bg); @include border($bg); padding: $spacing * 2; diff --git a/gtk-3.0/scss/widgets/_window.scss b/gtk-3.0/scss/widgets/_window.scss index 0921bd8..4ffb165 100755 --- a/gtk-3.0/scss/widgets/_window.scss +++ b/gtk-3.0/scss/widgets/_window.scss @@ -24,6 +24,13 @@ &.tiled { border-radius: 0; } + &.solid-csd { + border-radius: 0; + margin: 1px; + background-color: $bg_color; + box-shadow: none; + } + &.csd { &.popup { @extend %window; @@ -42,5 +49,9 @@ border-radius: $roundness; } } + + &.ssd { + &.maximized { border-radius: 0; } + } } } From 13ad69d5bd75c92cb18608bb3f3ded5c2b6b1e3d Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 03:44:57 +0530 Subject: [PATCH 65/73] Fix typo --- gtk-3.0/scss/widgets/_toolbar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss index 91fe30c..e391f3d 100755 --- a/gtk-3.0/scss/widgets/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -6,7 +6,7 @@ **********/ @mixin toolbar($bg, $fg) { - @incluee linear-gradient($bg); + @include linear-gradient($bg); @include border($bg); padding: $spacing * 2; From db7105d372aa102481d6c048dcdd8724e07ef856 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 03:56:01 +0530 Subject: [PATCH 66/73] Added editor config --- .editorconfig | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..169cf9a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,29 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + + +[*] + +# change these settings to your own preference +indent_style = space +indent_size = 4 + +# we recommend you to keep these unchanged +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +indent_style = space +indent_size = 2 + +[Makefile] +indent_style = tab +indent_size = 4 From 3f97e72aea2e2aae747b7d73883d899fb4aab8a8 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 04:03:39 +0530 Subject: [PATCH 67/73] Added SCSS lint config --- .scss-lint.yml | 177 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 .scss-lint.yml diff --git a/.scss-lint.yml b/.scss-lint.yml new file mode 100644 index 0000000..6868be1 --- /dev/null +++ b/.scss-lint.yml @@ -0,0 +1,177 @@ +linters: + + BangFormat: + enabled: true + space_before_bang: true + space_after_bang: false + + BorderZero: + enabled: true + + ColorKeyword: + enabled: true + + ColorVariable: + enabled: false + + Comment: + enabled: false + + DebugStatement: + enabled: true + + DeclarationOrder: + enabled: true + + DuplicateProperty: + enabled: true + + ElsePlacement: + enabled: true + style: same_line + + EmptyLineBetweenBlocks: + enabled: true + ignore_single_line_blocks: false + + EmptyRule: + enabled: true + + FinalNewline: + enabled: true + present: true + + HexLength: + enabled: true + style: short + + HexNotation: + enabled: true + style: lowercase + + HexValidation: + enabled: true + + IdSelector: + enabled: true + + ImportantRule: + enabled: true + + ImportPath: + enabled: true + leading_underscore: false + filename_extension: false + + Indentation: + enabled: true + character: space + width: 4 + + LeadingZero: + enabled: true + style: exclude_zero + + MergeableSelector: + enabled: true + + NameFormat: + enabled: true + convention: snake_case + + NestingDepth: + enabled: true + max_depth: 4 + + PlaceholderInExtend: + enabled: true + + PropertyCount: + enabled: false + + PropertySortOrder: + enabled: false + + PropertySpelling: + enabled: true + extra_properties: [] + + QualifyingElement: + enabled: false + allow_element_with_attribute: false + allow_element_with_class: false + allow_element_with_id: false + + SelectorDepth: + enabled: true + max_depth: 3 + + SelectorFormat: + enabled: true + convention: hyphenated_lowercase + + Shorthand: + enabled: true + + SingleLinePerProperty: + enabled: true + allow_single_line_rule_sets: true + + SingleLinePerSelector: + enabled: false + + SpaceAfterComma: + enabled: true + + SpaceAfterPropertyColon: + enabled: true + style: one_space + + SpaceAfterPropertyName: + enabled: true + + SpaceBeforeBrace: + enabled: true + style: space + allow_single_line_padding: true + + SpaceBetweenParens: + enabled: false + spaces: 0 + + StringQuotes: + enabled: true + style: double_quotes + + TrailingSemicolon: + enabled: true + + TrailingZero: + enabled: true + + UnnecessaryMantissa: + enabled: true + + UnnecessaryParentReference: + enabled: true + + UrlFormat: + enabled: false + + UrlQuotes: + enabled: true + + VariableForProperty: + enabled: false + + VendorPrefixes: + enabled: false + identifier_list: base + include: [] + exclude: [] + + ZeroUnit: + enabled: true + + Compass::*: + enabled: false From e94d0f274ad56076343d5304a872d36bdf095b5e Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 04:40:12 +0530 Subject: [PATCH 68/73] Update linter config --- .scss-lint.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.scss-lint.yml b/.scss-lint.yml index 6868be1..e9477d5 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -53,7 +53,7 @@ linters: enabled: true IdSelector: - enabled: true + enabled: false ImportantRule: enabled: true @@ -73,18 +73,18 @@ linters: style: exclude_zero MergeableSelector: - enabled: true + enabled: false NameFormat: - enabled: true - convention: snake_case + enabled: false + convention: hyphenated_lowercase NestingDepth: enabled: true - max_depth: 4 + max_depth: 5 PlaceholderInExtend: - enabled: true + enabled: false PropertyCount: enabled: false @@ -94,7 +94,7 @@ linters: PropertySpelling: enabled: true - extra_properties: [] + extra_properties: ["icon-shadow","outline-radius"] QualifyingElement: enabled: false @@ -104,10 +104,10 @@ linters: SelectorDepth: enabled: true - max_depth: 3 + max_depth: 5 SelectorFormat: - enabled: true + enabled: false convention: hyphenated_lowercase Shorthand: @@ -164,7 +164,7 @@ linters: VariableForProperty: enabled: false - VendorPrefixes: + VendorPrefix: enabled: false identifier_list: base include: [] From b753394e535d69debb2af75b3fd609bb7729f3aa Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 04:40:35 +0530 Subject: [PATCH 69/73] Fix linting issues --- gtk-3.0/scss/_functions.scss | 84 ++++++++++++++-------------- gtk-3.0/scss/_global.scss | 16 ++++-- gtk-3.0/scss/apps/_gedit.scss | 36 ++++++------ gtk-3.0/scss/apps/_lightdm.scss | 76 ++++++++++++------------- gtk-3.0/scss/apps/_nautilus.scss | 12 ++-- gtk-3.0/scss/apps/_nemo.scss | 6 +- gtk-3.0/scss/apps/_panel.scss | 20 +++---- gtk-3.0/scss/apps/_synaptic.scss | 2 +- gtk-3.0/scss/apps/_unity.scss | 20 +++---- gtk-3.0/scss/apps/_xfce.scss | 2 +- gtk-3.0/scss/widgets/_actionbar.scss | 8 +-- gtk-3.0/scss/widgets/_base.scss | 34 +++++------ gtk-3.0/scss/widgets/_button.scss | 28 +++++----- gtk-3.0/scss/widgets/_calendar.scss | 4 +- gtk-3.0/scss/widgets/_choosers.scss | 28 +++++----- gtk-3.0/scss/widgets/_grid.scss | 4 +- gtk-3.0/scss/widgets/_infobar.scss | 4 +- gtk-3.0/scss/widgets/_menu.scss | 24 ++++---- gtk-3.0/scss/widgets/_misc.scss | 24 ++++---- gtk-3.0/scss/widgets/_notebook.scss | 22 ++++---- gtk-3.0/scss/widgets/_osd.scss | 26 ++++----- gtk-3.0/scss/widgets/_overshoot.scss | 18 +++--- gtk-3.0/scss/widgets/_progress.scss | 19 ++++--- gtk-3.0/scss/widgets/_scrollbar.scss | 14 ++--- gtk-3.0/scss/widgets/_sidebar.scss | 23 ++++---- gtk-3.0/scss/widgets/_spinner.scss | 2 +- gtk-3.0/scss/widgets/_toggle.scss | 10 ++-- gtk-3.0/scss/widgets/_toolbar.scss | 8 +-- gtk-3.0/scss/widgets/_view.scss | 40 ++++++------- gtk-3.0/scss/widgets/_window.scss | 6 +- 30 files changed, 311 insertions(+), 309 deletions(-) diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss index a1e33cf..0de71b6 100755 --- a/gtk-3.0/scss/_functions.scss +++ b/gtk-3.0/scss/_functions.scss @@ -1,79 +1,79 @@ $modules: () !default; @mixin exports($name) { - @if (not index($modules, $name)) { - $modules: append($modules, $name) !global; + @if (not index($modules, $name)) { + $modules: append($modules, $name) !global; - @content; - } + @content; + } } @function alpha($color, $amount) { - @if type-of($color) == "color" { - @return fade-out($color, (1 - $amount)); - } @else { - @return unquote("alpha(#{$color},#{$amount})"); - } + @if type-of($color) == "color" { + @return fade-out($color, (1 - $amount)); + } @else { + @return unquote("alpha(#{$color},#{$amount})"); + } } @function shade($color, $amount) { - @if type-of($color) == "color" { - @if ($amount > 1) { - @return lighten($color, ($amount - 1) * lightness($color)) - } @else { - @return darken($color, (1 - $amount) * lightness($color)) - } - } @else { - @return unquote("shade(#{$color},#{$amount})"); - } + @if type-of($color) == "color" { + @if ($amount > 1) { + @return lighten($color, ($amount - 1) * lightness($color)) + } @else { + @return darken($color, (1 - $amount) * lightness($color)) + } + } @else { + @return unquote("shade(#{$color},#{$amount})"); + } } @function mix($color1, $color2, $amount) { - @return unquote("mix(#{$color1},#{$color2},#{$amount})"); + @return unquote("mix(#{$color1},#{$color2},#{$amount})"); } @function border_normal($color) { - @return shade($color, $contrast); + @return shade($color, $contrast); } @function border_focus($color) { - @return shade($color, ($contrast - .05)); + @return shade($color, ($contrast - .05)); } @function border_active($color) { - @return shade($color, ($contrast - .1)); + @return shade($color, ($contrast - .1)); } @function border_insensitive($color) { - @return shade($color, ($contrast + .05)); + @return shade($color, ($contrast + .05)); } @mixin linear-gradient($color, $direction: to bottom) { - @if $gradient == 0 { - background-color: $color; - background-image: none; - } @else { - $amount: $gradient / 2; + @if $gradient == 0 { + background-color: $color; + background-image: none; + } @else { + $amount: $gradient / 2; - background-color: $color; - background-image: linear-gradient($direction, - shade($color, (1 + $amount)), - shade($color, (1 - $amount)) - ); - } + background-color: $color; + background-image: linear-gradient($direction, + shade($color, (1 + $amount)), + shade($color, (1 - $amount)) + ); + } } @mixin border($color) { - border-color: border_normal($color); + border-color: border_normal($color); - &:focus, &:hover { border-color: border_focus($color); } + &:focus, &:hover { border-color: border_focus($color); } - &:active, &:active:hover, - &:active:focus, &:active:hover:focus, - &:checked, &:checked:hover, - &:checked:focus, &:checked:hover:focus { border-color: border_active($color); } + &:active, &:active:hover, + &:active:focus, &:active:hover:focus, + &:checked, &:checked:hover, + &:checked:focus, &:checked:hover:focus { border-color: border_active($color); } - &:insensitive { border-color: border_insensitive($color); } + &:insensitive { border-color: border_insensitive($color); } - &:active:insensitive, &:checked:insensitive { border-color: border_normal($color); } + &:active:insensitive, &:checked:insensitive { border-color: border_normal($color); } } diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index 6f78913..e2b70ee 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -18,6 +18,10 @@ $dark_fg_color: #eee; $dark_shadow: #000; $light_shadow: #fff; +// white and black +$black: #000; +$white: #fff; + // misc colors used by gtk+ $info_fg_color: #fff; $info_bg_color: #03a9f4; @@ -56,14 +60,14 @@ $lightdm_fg_color: $dark_fg_color; $wm_bg: $titlebar_bg_color; $wm_border_focused: transparent; $wm_border_unfocused: transparent; -$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); -$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4); -$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); +$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1); +$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4); +$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1); $wm_icons_focused_prelight: $selected_bg_color; -$wm_icons_focused_pressed: shade($selected_bg_color, 0.8); -$wm_icons_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4); +$wm_icons_focused_pressed: shade($selected_bg_color, .8); +$wm_icons_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4); $wm_icons_unfocused_prelight: $selected_bg_color; -$wm_icons_unfocused_pressed: shade($selected_bg_color, 0.8); +$wm_icons_unfocused_pressed: shade($selected_bg_color, .8); // widget styles $roundness: 2px; diff --git a/gtk-3.0/scss/apps/_gedit.scss b/gtk-3.0/scss/apps/_gedit.scss index 86ec7a5..f1614a6 100644 --- a/gtk-3.0/scss/apps/_gedit.scss +++ b/gtk-3.0/scss/apps/_gedit.scss @@ -15,7 +15,7 @@ .gedit-document-panel { background-color: $bg_color; - color: mix($fg_color, $bg_color, 0.1); + color: mix($fg_color, $bg_color, .1); .list-row { padding: $spacing; @@ -33,21 +33,21 @@ } } - .prelight-row .button { - border-color: alpha(black, 0.1); - color: alpha(white, 0.8); + .prelight-row .button { + border-color: alpha($black, .1); + color: alpha($white, .8); &:active { - border-color: alpha(black, 0.2); - background-color: alpha(black, 0.08); - color: white; + border-color: alpha($black, .2); + background-color: alpha($black, .08); + color: $white; } } list-row, .prelight-row { .button:hover { - border-color: alpha(black, 0.1); - color: white; + border-color: alpha($black, .1); + color: $white; } } } @@ -68,14 +68,14 @@ } .gedit-document-panel-dragged-row { - border: 1px solid alpha(black, 0.1); - background-color: alpha(black, 0.5); - color: white; + border: 1px solid alpha($black, .1); + background-color: alpha($black, .5); + color: $white; } .gedit-document-panel-placeholder-row { - border: none; - background-color: alpha(black, 0.08); + border: 0; + background-color: alpha($black, .08); transition: all 200ms ease-in; } @@ -94,7 +94,7 @@ &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); } &:active { - background-color: shade($bg_color, 0.95); + background-color: shade($bg_color, .95); color: $fg_color; } } @@ -103,7 +103,7 @@ GeditViewFrame .gedit-search-slider { padding: $spacing; border-radius: 0 0 $roundness $roundness; - border-width: 0 1px 1px 1px; + border-width: 0 1px 1px; border-style: solid; border-color: border_normal($base_color); background-color: $base_color; @@ -119,7 +119,7 @@ GeditFileBrowserWidget .toolbar { padding: $spacing / 2; - border-top: none; + border-top: 0; background-color: $bg_color; background-image: none; } @@ -127,6 +127,6 @@ .gedit-search-entry-occurrences-tag { margin: $spacing / 2; padding: $spacing / 2; - color: mix($text_color, $base_color, 0.5); + color: mix($text_color, $base_color, .5); } } diff --git a/gtk-3.0/scss/apps/_lightdm.scss b/gtk-3.0/scss/apps/_lightdm.scss index 453434e..52eda61 100644 --- a/gtk-3.0/scss/apps/_lightdm.scss +++ b/gtk-3.0/scss/apps/_lightdm.scss @@ -6,30 +6,30 @@ #panel_window { background-color: transparent; background-image: none; - color: white; + color: $white; font: bold; - text-shadow: 0 1px alpha(black, 0.5); - icon-shadow: 0 1px alpha(black, 0.5); + text-shadow: 0 1px alpha($black, .5); + icon-shadow: 0 1px alpha($black, .5); .menubar { &, > .menuitem { background-color: transparent; background-image: none; - color: white; + color: $white; font: bold; - text-shadow: 0 1px alpha(black, 0.5); - icon-shadow: 0 1px alpha(black, 0.5); + text-shadow: 0 1px alpha($black, .5); + icon-shadow: 0 1px alpha($black, .5); - *:hover { color: white; } + *:hover { color: $white; } &:hover { border-style: none; - background-color: alpha(white, 0.2); + background-color: alpha($white, .2); background-image: none; - color: white; + color: $white; } - &:insensitive { color: alpha(white, 0.7); } + &:insensitive { color: alpha($white, .7); } .menu { border-radius: 1px; @@ -52,30 +52,30 @@ color: $lightdm_fg_color; /* draw border using box-shadow */ - box-shadow: inset 1px 0 mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21), - inset -1px 0 mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21), - inset 0 1px mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21), - inset 0 -1px mix(shade($lightdm_bg_color, 0.7), $lightdm_fg_color, 0.21); + box-shadow: inset 1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), + inset -1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), + inset 0 1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), + inset 0 -1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21); .button { padding: 3px 15px; border-width: 1px; border-radius: $roundness; border-style: solid; - border-color: shade($lightdm_bg_color, 0.8); + border-color: shade($lightdm_bg_color, .8); background-color: shade($lightdm_bg_color, 1.08); background-image: none; color: $lightdm_fg_color; transition: all 150ms ease-out; &.default, &:focus, &:active:focus { - border-color: shade($selected_bg_color, 0.8); + border-color: shade($selected_bg_color, .8); background-color: shade($selected_bg_color, 1.08); background-image: none; color: $selected_fg_color; &:hover { - border-color: shade($selected_bg_color, 0.7); + border-color: shade($selected_bg_color, .7); background-color: $selected_bg_color; } } @@ -100,21 +100,21 @@ padding: 3px 5px; border-width: 1px; border-style: solid; - border-color: shade($lightdm_bg_color, 0.8); + border-color: shade($lightdm_bg_color, .8); border-radius: $roundness; - background-color: shade($lightdm_bg_color, 0.9); + background-color: shade($lightdm_bg_color, .9); background-image: none; color: $lightdm_fg_color; box-shadow: none; transition: all 150ms ease-out; &:focus, &:hover { - border-color: shade($lightdm_bg_color, 0.7); + border-color: shade($lightdm_bg_color, .7); - box-shadow: inset 1px 0 alpha($dark_shadow, 0.10), - inset 0 1px alpha($dark_shadow, 0.12), - inset -1px 0 alpha($dark_shadow, 0.10), - inset 0 -1px alpha($dark_shadow, 0.05); + box-shadow: inset 1px 0 alpha($dark_shadow, .1), + inset 0 1px alpha($dark_shadow, .12), + inset -1px 0 alpha($dark_shadow, .1), + inset 0 -1px alpha($dark_shadow, .05); } } } @@ -125,7 +125,7 @@ .menu { font: normal; } - .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, 0.5); } + .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); } } #user_image { @@ -133,20 +133,20 @@ border-radius: $roundness; /* draw border using box-shadow */ - box-shadow: inset 1px 0 shade($lightdm_bg_color, 0.7), - inset -1px 0 shade($lightdm_bg_color, 0.7), - inset 0 1px shade($lightdm_bg_color, 0.7), - inset 0 -1px shade($lightdm_bg_color, 0.7); + box-shadow: inset 1px 0 shade($lightdm_bg_color, .7), + inset -1px 0 shade($lightdm_bg_color, .7), + inset 0 1px shade($lightdm_bg_color, .7), + inset 0 -1px shade($lightdm_bg_color, .7); } #user_image_border { border-radius: $roundness; - background-color: shade($lightdm_bg_color, 0.9); + background-color: shade($lightdm_bg_color, .9); background-image: none; - box-shadow: inset 1px 0 alpha($dark_shadow, 0.07), - inset 0 1px alpha($dark_shadow, 0.08), - inset -1px 0 alpha($dark_shadow, 0.07), - inset 0 -1px alpha($dark_shadow, 0.05); + box-shadow: inset 1px 0 alpha($dark_shadow, .07), + inset 0 1px alpha($dark_shadow, .08), + inset -1px 0 alpha($dark_shadow, .07), + inset 0 -1px alpha($dark_shadow, .05); } #buttonbox_frame { @@ -164,26 +164,26 @@ /* shutdown button */ #shutdown_button { - border-color: shade($error_bg_color, 0.8); + border-color: shade($error_bg_color, .8); background-color: shade($error_bg_color, 1.08); background-image: none; color: $error_fg_color; &:hover, &:active, &:active:hover { - border-color: shade($error_bg_color, 0.7); + border-color: shade($error_bg_color, .7); background-color: $error_bg_color; } } /* restart button */ #restart_button { - border-color: shade($warning_bg_color, 0.8); + border-color: shade($warning_bg_color, .8); background-color: shade($warning_bg_color, 1.08); background-image: none; color: $warning_fg_color; &:hover, &:active, &:active:hover { - border-color: shade($warning_bg_color, 0.7); + border-color: shade($warning_bg_color, .7); background-color: $warning_bg_color; } } diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss index 9a9f754..32cbae7 100644 --- a/gtk-3.0/scss/apps/_nautilus.scss +++ b/gtk-3.0/scss/apps/_nautilus.scss @@ -4,8 +4,8 @@ @include exports("nautilus") { .nautilus-desktop.nautilus-canvas-item { - color: white; - text-shadow: 1px 1px black; + color: $white; + text-shadow: 1px 1px $black; &:active { color: $fg_color; } @@ -21,7 +21,7 @@ border-color: border_normal($toolbar_bg_color); } - .sidebar .frame { border: none; } + .sidebar .frame { border: 0; } GtkPaned { border-width: 0 1px 0 0; @@ -41,17 +41,17 @@ border-bottom-width: 0; } - .frame { border: none; } + .frame { border: 0; } } NautilusQueryEditor { .toolbar { padding-top: $spacing - 1px; padding-bottom: $spacing - 2px; - border-width: 1px 0 0 0; + border-width: 1px 0 0; border-style: solid; border-color: $toolbar_bg_color; - background-color: shade($toolbar_bg_color, 0.9); + background-color: shade($toolbar_bg_color, .9); &:nth-child(2) { border-color: border_normal($toolbar_bg_color); } diff --git a/gtk-3.0/scss/apps/_nemo.scss b/gtk-3.0/scss/apps/_nemo.scss index 63518aa..b7e0041 100644 --- a/gtk-3.0/scss/apps/_nemo.scss +++ b/gtk-3.0/scss/apps/_nemo.scss @@ -4,8 +4,8 @@ @include exports("nemo") { .nemo-desktop.nemo-canvas-item { - color: white; - text-shadow: 1px 1px black; + color: $white; + text-shadow: 1px 1px $black; &:active { color: $fg_color; } @@ -21,7 +21,7 @@ } NemoPlacesTreeView { - -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_bg_color, 0.8); + -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_bg_color, .8); -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color; -NemoPlacesTreeView-disk-full-bar-width: 1px; -NemoPlacesTreeView-disk-full-bar-radius: 1px; diff --git a/gtk-3.0/scss/apps/_panel.scss b/gtk-3.0/scss/apps/_panel.scss index c84c98b..d9513f8 100644 --- a/gtk-3.0/scss/apps/_panel.scss +++ b/gtk-3.0/scss/apps/_panel.scss @@ -18,22 +18,22 @@ color: $panel_fg_color; &:hover, &:prelight { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11)); + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .11)); - border-color: mix($panel_bg_color, $panel_fg_color, 0.11); + border-color: mix($panel_bg_color, $panel_fg_color, .11); color: shade($panel_fg_color, 1.08); } &:active, &:checked { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top); + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .21), to top); - border-color: mix($panel_bg_color, $panel_fg_color, 0.21); + border-color: mix($panel_bg_color, $panel_fg_color, .21); color: shade($panel_fg_color, 1.08); &:prelight { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top); + @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .31), to top); - border-color: mix($panel_bg_color, $panel_fg_color, 0.31); + border-color: mix($panel_bg_color, $panel_fg_color, .31); } } } @@ -45,7 +45,7 @@ } PanelApplet { - border: none; + border: 0; .button { @extend %panelbutton; @@ -57,14 +57,14 @@ PanelSeparator { @extend %panel; - border: none; + border: 0; } PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar { &.menuitem { @extend %panel; - border: none; + border: 0; -PanelMenuBar-icon-visible: true; } @@ -73,7 +73,7 @@ PanelAppletFrame { @extend %panel; - border: none; + border: 0; } WnckPager, WnckTasklist { @extend %panel; } diff --git a/gtk-3.0/scss/apps/_synaptic.scss b/gtk-3.0/scss/apps/_synaptic.scss index ca67412..c19b78e 100644 --- a/gtk-3.0/scss/apps/_synaptic.scss +++ b/gtk-3.0/scss/apps/_synaptic.scss @@ -8,7 +8,7 @@ @include linear-gradient($toolbar-bg-color); padding: $spacing; - border: none; + border: 0; color: $toolbar_fg_color; } } diff --git a/gtk-3.0/scss/apps/_unity.scss b/gtk-3.0/scss/apps/_unity.scss index 5cea4ad..e463223 100644 --- a/gtk-3.0/scss/apps/_unity.scss +++ b/gtk-3.0/scss/apps/_unity.scss @@ -11,9 +11,9 @@ -UnityDecoration-shadow-offset-x: 1px; -UnityDecoration-shadow-offset-y: 1px; - -UnityDecoration-active-shadow-color: rgba(0,0,0,0.7); + -UnityDecoration-active-shadow-color: rgba(0, 0, 0, .7); -UnityDecoration-active-shadow-radius: 8px; - -UnityDecoration-inactive-shadow-color: rgba(0,0,0,0.5); + -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, .5); -UnityDecoration-inactive-shadow-radius: 5px; -UnityDecoration-glow-size: 10px; @@ -21,21 +21,21 @@ -UnityDecoration-title-indent: 10px; -UnityDecoration-title-fade: 35px; - -UnityDecoration-title-alignment: 0.0; + -UnityDecoration-title-alignment: 0; &.top { border: 1px solid $wm_border_focused; - border-bottom: none; + border-bottom: 0; border-radius: 2px 2px 0 0; - padding: 1px ($spacing * 2) 0 ($spacing * 2); + padding: 1px ($spacing * 2) 0; background-color: $titlebar_bg_color; - color: mix($titlebar_fg_color, $titlebar_bg_color, 0.1); + color: mix($titlebar_fg_color, $titlebar_bg_color, .1); text-shadow: none; &:backdrop { border: 1px solid $wm_border_unfocused; - color: mix($titlebar_fg_color, $titlebar_bg_color, 0.4); + color: mix($titlebar_fg_color, $titlebar_bg_color, .4); } } @@ -49,7 +49,7 @@ UnityPanelWidget, .unity-panel { @extend %panel; - border: none; + border: 0; } .unity-panel { @@ -58,8 +58,8 @@ color: $panel_fg_color; &:hover, *:hover { - border-color: mix($panel_bg_color, $panel_fg_color, 0.21); - background-color: mix($panel_bg_color, $panel_fg_color, 0.21); + border-color: mix($panel_bg_color, $panel_fg_color, .21); + background-color: mix($panel_bg_color, $panel_fg_color, .21); background-image: none; color: shade($panel_fg_color, 1.08); } diff --git a/gtk-3.0/scss/apps/_xfce.scss b/gtk-3.0/scss/apps/_xfce.scss index 20dd546..dc38a86 100644 --- a/gtk-3.0/scss/apps/_xfce.scss +++ b/gtk-3.0/scss/apps/_xfce.scss @@ -8,7 +8,7 @@ XfceHeading { margin: 0; padding: 0; - border: none; + border: 0; background-image: none; background-color: $base_color; color: $text_color; diff --git a/gtk-3.0/scss/widgets/_actionbar.scss b/gtk-3.0/scss/widgets/_actionbar.scss index cfae302..749f549 100644 --- a/gtk-3.0/scss/widgets/_actionbar.scss +++ b/gtk-3.0/scss/widgets/_actionbar.scss @@ -10,7 +10,7 @@ @include linear-gradient($bg_color); padding: $spacing; - border-width: 1px 0 0 0; + border-width: 1px 0 0; border-style: solid; border-color: border_normal($bg_color); color: $fg_color; @@ -40,9 +40,9 @@ @include exports("searchbar") { .search-bar { - @include linear-gradient(shade($bg_color, 0.98)); + @include linear-gradient(shade($bg_color, .98)); - border-width: 0 0 1px 0; + border-width: 0 0 1px; border-style: solid; border-color: border_normal($bg_color); color: $fg_color; @@ -86,7 +86,7 @@ } .selection-menu.button { - border: none; + border: 0; background-color: transparent; background-image: none; color: shade($selected_bg_color, $contrast); diff --git a/gtk-3.0/scss/widgets/_base.scss b/gtk-3.0/scss/widgets/_base.scss index 9897e50..eddb5be 100755 --- a/gtk-3.0/scss/widgets/_base.scss +++ b/gtk-3.0/scss/widgets/_base.scss @@ -3,7 +3,7 @@ ***************/ * { - -GtkArrow-arrow-scaling: 0.5; + -GtkArrow-arrow-scaling: .5; -GtkExpander-expander-size: 8; -GtkStatusbar-shadow-type: none; -GtkToolItemGroup-expander-size: 8; @@ -11,7 +11,7 @@ -GtkWindow-resize-grip-width: 0; -WnckTasklist-fade-overlay-rect: 0; - outline-color: alpha($selected_bg_color, 0.5); + outline-color: alpha($selected_bg_color, .5); outline-style: dashed; outline-width: 1px; outline-offset: -1px; @@ -31,21 +31,21 @@ } * { - &:selected { @extend %selected; } - - &:insensitive, - &:insensitive:insensitive { color: mix($fg_color, $bg_color, 0.50); } - - &:insensitive { -gtk-image-effect: dim; } - - &:hover { -gtk-image-effect: highlight; } - /* hyperlinks */ -GtkHTML-link-color: $link_color; -GtkIMHtml-hyperlink-color: $link_color; -GtkWidget-link-color: $link_color; -GtkWidget-visited-link-color: $link_color; + &:selected { @extend %selected; } + + &:insensitive, + &:insensitive:insensitive { color: mix($fg_color, $bg_color, .5); } + + &:insensitive { -gtk-image-effect: dim; } + + &:hover { -gtk-image-effect: highlight; } + &:link, &:visited { color: $link_color; } } @@ -71,13 +71,13 @@ } &:active { - background-color: shade($bg_color, 0.9); + background-color: shade($bg_color, .9); color: $fg_color; } &:insensitive { - background-color: shade(shade($bg_color, 0.95), 1.05); - color: mix($fg_color, $bg_color, 0.50); + background-color: shade(shade($bg_color, .95), 1.05); + color: mix($fg_color, $bg_color, .5); } &:selected { @extend %selected; } @@ -89,12 +89,12 @@ GtkImage, GtkLabel, GtkBox, GtkGrid { GtkLabel { &.separator { - color: $fg_color; - @extend .dim-label; + + color: $fg_color; } &:selected { @extend %selected; } - &:insensitive { color: mix($fg_color, $bg_color, 0.50); } + &:insensitive { color: mix($fg_color, $bg_color, .5); } } diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index e62bf60..c1b92aa 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -25,7 +25,7 @@ &:dir(rtl) { border-radius: 0; // needed when including %linked_middle:dir(rtl) border-right-style: none; - border-left-style: solid + border-left-style: solid; } } @@ -78,11 +78,11 @@ @extend %linked_button; - box-shadow: inset -1px 0 border_normal(rgba(0,0,0,.12 + $border_strength)), + box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)), 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); &:focus, &:hover { - box-shadow: inset -1px 0 border_focus(rgba(0,0,0,.12 + $border_strength)), + box-shadow: inset -1px 0 border_focus(rgba(0, 0, 0, .12 + $border_strength)), 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } @@ -90,7 +90,7 @@ &:active:focus, &:active:hover:focus, &:checked, &:checked:hover, &:checked:focus, &:checked:hover:focus { - box-shadow: inset -1px 0 border_active(rgba(0,0,0,.12 + $border_strength)), + box-shadow: inset -1px 0 border_active(rgba(0, 0, 0, .12 + $border_strength)), inset 0 1px alpha($dark_shadow, .07), inset 0 -1px alpha($dark_shadow, .05); } @@ -127,7 +127,7 @@ @extend %button; @include linear-gradient($button_bg); - @include border(rgba(0,0,0,.12 + $border_strength)); + @include border(rgba(0, 0, 0, .12 + $border_strength)); color: $fg; box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); @@ -142,7 +142,7 @@ &, &.flat { &:focus, &:hover { @include linear-gradient(shade($button_bg, 1.2)); - @include border(rgba(0,0,0,.2 + $border_strength)); + @include border(rgba(0, 0, 0, .2 + $border_strength)); box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } @@ -150,7 +150,7 @@ &:active, &:checked { @include linear-gradient(shade($button_bg, .7), to top); - color: white; + color: $white; box-shadow: inset 1px 0 alpha($dark_shadow, .06), inset 0 1px alpha($dark_shadow, .07), inset -1px 0 alpha($dark_shadow, .06), @@ -159,7 +159,7 @@ &:focus, &:hover { @include linear-gradient(shade($button_bg, .65), to top); - color: white; + color: $white; } } @@ -212,15 +212,15 @@ box-shadow: none; &:focus, &:hover { - border: 1px solid alpha(black, .3); - background-color: alpha(white, .2); + border: 1px solid alpha($black, .3); + background-color: alpha($white, .2); background-image: none; box-shadow: none; } - &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha(black, .3); - background-color: alpha(black, .1); + &:active, &:checked, &:active:hover, &:checked:hover { + border: 1px solid alpha($black, .3); + background-color: alpha($black, .1); background-image: none; box-shadow: none; } @@ -236,7 +236,7 @@ .spinbutton & { color: mix($text_color, $base_color, .4); padding: $spacing ($spacing * 2); - border: none; + border: 0; border-radius: 0; border-style: none; background-color: transparent; diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss index d9705f4..409eb5b 100644 --- a/gtk-3.0/scss/widgets/_calendar.scss +++ b/gtk-3.0/scss/widgets/_calendar.scss @@ -7,11 +7,11 @@ padding: $spacing; outline-offset: -1px; - &:inconsistent { color: mix($fg_color, $bg_color, 0.5); } + &:inconsistent { color: mix($fg_color, $bg_color, .5); } &.view, &.highlight, &.header, &.button { &, &:focus, &:hover, &:insensitive { - border: none; + border: 0; background-color: transparent; background-image: none; } diff --git a/gtk-3.0/scss/widgets/_choosers.scss b/gtk-3.0/scss/widgets/_choosers.scss index 53f1de2..b650c47 100644 --- a/gtk-3.0/scss/widgets/_choosers.scss +++ b/gtk-3.0/scss/widgets/_choosers.scss @@ -5,12 +5,12 @@ @include exports("colorchooser") { GtkColorSwatch { &, &:selected { - border: 1px solid alpha(black, 0.1); + border: 1px solid alpha($black, .1); border-radius: $roundness - 1px; background-color: transparent; background-clip: border-box; - &:hover { border-color: alpha(black, 0.3); } + &:hover { border-color: alpha($black, .3); } } &.color-light:selected:hover, &.color-dark:selected:hover { background-image: none; } @@ -42,20 +42,20 @@ &.color-dark:hover, &.color-light:hover { background-image: none; - border-color: alpha(black, 0.3); + border-color: alpha($black, .3); } } } GtkColorChooserWidget #add-color-button { background-clip: padding-box; - border-color: alpha(black, 0.1); - background-color: shade($bg_color, 0.95); + border-color: alpha($black, .1); + background-color: shade($bg_color, .95); color: $fg_color; &:hover { - border-color: alpha(black, 0.3); - background-color: shade($bg_color, 0.90); + border-color: alpha($black, .3); + background-color: shade($bg_color, .9); color: $fg_color; } } @@ -69,15 +69,15 @@ &.color-light { &, &:hover { - border-color: alpha(black, 0.3); - color: alpha(black, 0.3); + border-color: alpha($black, .3); + color: alpha($black, .3); } } &.color-dark { &, &:hover { - border-color: alpha(white, 0.3); - color: alpha(white, 0.3); + border-color: alpha($white, .3); + color: alpha($white, .3); } } } @@ -99,9 +99,9 @@ -GtkWidget-vertical-separator: 0; } - GtkLabel:last-child { color: alpha(currentColor, 0.7); } + GtkLabel:last-child { color: alpha(currentColor, .7); } - GtkImage:last-child { color: alpha(currentColor, 0.7); } + GtkImage:last-child { color: alpha(currentColor, .7); } } GtkFileChooser { @@ -119,7 +119,7 @@ .dialog-action-box { border-width: 1px 0 0; border-style: solid; - border-color: shade($bg_color, 0.7); + border-color: shade($bg_color, .7); } } } diff --git a/gtk-3.0/scss/widgets/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss index 13016da..e4b9e8f 100644 --- a/gtk-3.0/scss/widgets/_grid.scss +++ b/gtk-3.0/scss/widgets/_grid.scss @@ -4,12 +4,12 @@ @include exports("grid") { .list { - background-color: shade($bg_color, 0.97); + background-color: shade($bg_color, .97); color: $fg_color; &-row { &, &.button { - border: none; + border: 0; border-radius: 0; padding: $spacing; background-image: none; diff --git a/gtk-3.0/scss/widgets/_infobar.scss b/gtk-3.0/scss/widgets/_infobar.scss index 1579c01..9b5a679 100644 --- a/gtk-3.0/scss/widgets/_infobar.scss +++ b/gtk-3.0/scss/widgets/_infobar.scss @@ -7,7 +7,7 @@ @include exports("infobar") { GtkInfoBar { - border: none; + border: 0; $types: ( info: ( $info_fg_color, $info_bg_color ), @@ -24,7 +24,7 @@ &.#{$type} { @include linear-gradient($bg_color); - border: 1px solid shade($bg_color, 0.8); + border: 1px solid shade($bg_color, .8); color: $fg_color; .button { diff --git a/gtk-3.0/scss/widgets/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss index 8b08c5c..1973351 100755 --- a/gtk-3.0/scss/widgets/_menu.scss +++ b/gtk-3.0/scss/widgets/_menu.scss @@ -9,7 +9,7 @@ .menubar { -GtkWidget-window-dragging: true; - border: none; + border: 0; background-color: $menubar_bg_color; background-image: none; color: $menubar_fg_color; @@ -23,13 +23,13 @@ color: $menubar_fg_color; &:hover { - border-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); - background-color: mix($menubar_bg_color, $menubar_fg_color, 0.21); + border-color: mix($menubar_bg_color, $menubar_fg_color, .21); + background-color: mix($menubar_bg_color, $menubar_fg_color, .21); background-image: none; color: shade($menubar_fg_color, 1.08); } - & *:hover { color: shade($menubar_fg_color, 1.08); } + *:hover { color: shade($menubar_fg_color, 1.08); } } } } @@ -55,7 +55,7 @@ #toolbar-popup, .menu { padding: 0; border-radius: 0; - border: none; + border: 0; background-color: $menu_bg_color; color: $menu_fg_color; @@ -81,23 +81,23 @@ &, .menu & { margin: $spacing; padding: $spacing; - border: none; + border: 0; border-radius: 0; background-color: transparent; background-image: none; - -GtkMenuItem-arrow-scaling: 0.5; + -GtkMenuItem-arrow-scaling: .5; &:active, &:hover { - border: none; + border: 0; background-color: $selected_bg_color; background-image: none; color: $selected_fg_color; } - & *:active, & *:hover { color: $selected_fg_color; } + *:active, *:hover { color: $selected_fg_color; } - &:insensitive, & *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); } + &:insensitive, *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); } } &.check, &.radio { @@ -175,7 +175,7 @@ background-color: $menu_bg_color; background-image: none; color: $menu_fg_color; - box-shadow: 0 3px 6px alpha(black, .16); + box-shadow: 0 3px 6px alpha($black, .16); &.background { background-image: none; @@ -186,7 +186,7 @@ &:backdrop { box-shadow: none; } &.osd { - box-shadow: 0 2px 7px 3px alpha(black, .5); + box-shadow: 0 2px 7px 3px alpha($black, .5); > .toolbar .button { border-radius: 0; diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss index 3436192..b5a6cc9 100644 --- a/gtk-3.0/scss/widgets/_misc.scss +++ b/gtk-3.0/scss/widgets/_misc.scss @@ -4,7 +4,7 @@ @include exports("dimlabel") { .dim-label { - opacity: 0.5; + opacity: .5; text-shadow: none; } } @@ -19,7 +19,7 @@ &.background { @include linear-gradient($tooltip_bg_color); - border: none; + border: 0; border-radius: $roundness; color: $tooltip_fg_color; } @@ -57,7 +57,7 @@ &, &.frame { border-style: solid; border-color: border_normal($osd_bg); - border-width: 0 1px 1px 1px; + border-width: 0 1px 1px; border-radius: 0 0 $roundness $roundness; padding: $spacing * 2; background-color: $osd_bg; @@ -81,17 +81,17 @@ } .expander { - color: alpha(currentColor, 0.7); - border: alpha(currentColor, 0.7); + color: alpha(currentColor, .7); + border: alpha(currentColor, .7); &:hover { - color: alpha(currentColor, 0.8); - border-color: alpha(currentColor, 0.8); + color: alpha(currentColor, .8); + border-color: alpha(currentColor, .8); } &:active { - color: alpha(currentColor, 0.9); - border-color: alpha(currentColor, 0.9); + color: alpha(currentColor, .9); + border-color: alpha(currentColor, .9); } } } @@ -103,9 +103,9 @@ @include exports("symbolicimage") { .image { - color: alpha(currentColor, 0.5); + color: alpha(currentColor, .5); - &:hover { color: alpha(currentColor, 0.9); } + &:hover { color: alpha(currentColor, .9); } &:selected, &:selected:hover { color: $selected_fg_color; } } @@ -152,7 +152,7 @@ -GtkButton-image-spacing: 0; -GtkButton-inner-border: 0; - border: none; + border: 0; background-color: transparent; background-image: none; } diff --git a/gtk-3.0/scss/widgets/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss index b0ecfbb..9447d30 100644 --- a/gtk-3.0/scss/widgets/_notebook.scss +++ b/gtk-3.0/scss/widgets/_notebook.scss @@ -8,7 +8,7 @@ @include exports("notebook") { .notebook { padding: 0; - border-width: 1px 0 0 0; + border-width: 1px 0 0; border-style: solid; border-color: border_normal($base_color); border-radius: 0; @@ -32,11 +32,11 @@ &.frame { border-color: border_normal($base_color); - &.top { border-width: 1px 1px 0 1px; } + &.top { border-width: 1px 1px 0; } &.right { border-width: 1px 1px 1px 0; } - &.bottom { border-width: 0 1px 1px 1px; } + &.bottom { border-width: 0 1px 1px; } &.left { border-width: 1px 0 1px 1px; } } @@ -90,14 +90,14 @@ border-bottom-right-radius: 0; } - GtkLabel { color: mix($text_color, $base_color, 0.3); } + GtkLabel { color: mix($text_color, $base_color, .3); } /* close button styling */ .button { @extend %close_button; } } .prelight-page { - &, GtkLabel { color: mix($text_color, $base_color, 0.15); } + &, GtkLabel { color: mix($text_color, $base_color, .15); } } .active-page { @@ -106,20 +106,20 @@ .reorderable-page { &:hover { - background-color: shade($base_color, 0.85); + background-color: shade($base_color, .85); border-left: 0; border-right: 0; /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7); + box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), + inset 1px 0 shade($base_color, .7), inset -1px 0 shade($base_color, .7); } &:active { - background-color: shade($base_color, 0.90); + background-color: shade($base_color, .9); border-left: 0; border-right: 0; - box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03), - inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75); + box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), + inset 1px 0 shade($base_color, .75), inset -1px 0 shade($base_color, .75); } } } diff --git a/gtk-3.0/scss/widgets/_osd.scss b/gtk-3.0/scss/widgets/_osd.scss index 87be1e5..dbf1d16 100644 --- a/gtk-3.0/scss/widgets/_osd.scss +++ b/gtk-3.0/scss/widgets/_osd.scss @@ -10,7 +10,7 @@ .osd { &.background { - background-color: alpha($osd_bg, 0.8); + background-color: alpha($osd_bg, .8); color: $osd_fg; } @@ -36,7 +36,7 @@ } /* used by gnome-settings-daemon's media-keys OSD */ - &.trough { background-color: shade($osd_bg, 0.8); } + &.trough { background-color: shade($osd_bg, .8); } &.progressbar { background-color: $osd_fg; } @@ -45,11 +45,11 @@ @include linear-gradient(shade($osd_bg, 1.08)); @include border($osd_bg); - &:insensitive { @include linear-gradient(shade($osd_bg, 0.9)); } + &:insensitive { @include linear-gradient(shade($osd_bg, .9)); } } &.trough { - border-color: shade($osd_bg, 0.8); + border-color: shade($osd_bg, .8); background-color: shade($osd_bg, 1.08); background-image: none; @@ -60,8 +60,8 @@ } &:insensitive, &.highlight:insensitive { - border-color: shade($osd_bg, 0.85); - background-color: shade($osd_bg, 0.9); + border-color: shade($osd_bg, .85); + background-color: shade($osd_bg, .9); background-image: none; } } @@ -73,17 +73,17 @@ .trough { background-color: $osd_bg; } .slider { - border: 1px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + border: 1px solid mix(shade($osd_bg, .87), $osd_fg, .21); border-radius: 0; - background-color: mix($osd_bg, $osd_fg, 0.21); + background-color: mix($osd_bg, $osd_fg, .21); &:hover { - border-color: mix(shade($osd_bg, 0.87), $osd_fg, 0.31); - background-color: mix($osd_bg, $osd_fg, 0.31); + border-color: mix(shade($osd_bg, .87), $osd_fg, .31); + background-color: mix($osd_bg, $osd_fg, .31); } &:active { - border-color: shade($selected_bg_color, 0.9); + border-color: shade($selected_bg_color, .9); background-color: $selected_bg_color; } } @@ -92,7 +92,7 @@ GtkIconView.cell { &:selected, &:selected:focus { background-color: transparent; - border: 3px solid mix(shade($osd_bg, 0.87), $osd_fg, 0.21); + border: 3px solid mix(shade($osd_bg, .87), $osd_fg, .21); border-radius: $roundness; outline-color: transparent; } @@ -100,7 +100,7 @@ /* used by Documents */ .page-thumbnail { - border: 1px solid shade($osd_bg, 0.9); + border: 1px solid shade($osd_bg, .9); /* when there's no pixbuf yet */ background-color: $osd_bg; } diff --git a/gtk-3.0/scss/widgets/_overshoot.scss b/gtk-3.0/scss/widgets/_overshoot.scss index fa5fe1b..bc3d1fd 100644 --- a/gtk-3.0/scss/widgets/_overshoot.scss +++ b/gtk-3.0/scss/widgets/_overshoot.scss @@ -9,15 +9,11 @@ @if $position == bottom { $_position: center bottom; $_linear_gradient_direction: to top; - } - - @else if $position == right { + } @else if $position == right { $_position: right center; $_small_gradient_size: $_small_gradient_length 100%; $_big_gradient_size: $_big_gradient_length 100%; - } - - @else if $position == left { + } @else if $position == left { $_position: left center; $_small_gradient_size: $_small_gradient_length 100%; $_big_gradient_size: $_big_gradient_length 100%; @@ -28,13 +24,13 @@ $_small_gradient: -gtk-gradient(radial, $_position, 0, - $_position, 0.5, + $_position, .5, to(alpha($_small_gradient_color, .35)), to(alpha($_small_gradient_color, .25))); $_big_gradient: -gtk-gradient(radial, $_position, 0, - $_position, 0.6, + $_position, .6, from(alpha($_big_gradient_color, .2)), to(alpha($_big_gradient_color, 0))); @@ -50,13 +46,13 @@ background-position: $_position; background-color: transparent; // reset some properties to be sure to not inherit them somehow - border: none; + border: 0; box-shadow: none; } @mixin undershoot($position) { - $_undershoot_color_dark: alpha(black, .2); - $_undershoot_color_light: alpha(white, .2); + $_undershoot_color_dark: alpha($black, .2); + $_undershoot_color_light: alpha($white, .2); $_gradient_dir: left; $_dash_bg_size: 10px 1px; diff --git a/gtk-3.0/scss/widgets/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss index 25064a9..28df150 100644 --- a/gtk-3.0/scss/widgets/_progress.scss +++ b/gtk-3.0/scss/widgets/_progress.scss @@ -7,7 +7,7 @@ padding: 0; border-radius: $roundness; font-size: smaller; - color: alpha($fg_color, 0.6); + color: alpha($fg_color, .6); -GtkProgressBar-min-horizontal-bar-height: 6; -GtkProgressBar-min-vertical-bar-width: 6; @@ -19,7 +19,7 @@ } &.trough { - border: 1px solid alpha(border_normal($bg_color), 0.5); + border: 1px solid alpha(border_normal($bg_color), .5); background-color: shade($bg_color, 1.08); background-image: none; } @@ -72,7 +72,7 @@ &.trough { @include linear-gradient(shade($bg_color, 1.08), to top); - border: 1px solid alpha(border_normal($bg_color), 0.5); + border: 1px solid alpha(border_normal($bg_color), .5); border-radius: $roundness; } @@ -86,6 +86,7 @@ &.indicator-discrete { &.horizontal { margin-right: 1px; } + &.vertical { margin-bottom: 1px; } } @@ -127,7 +128,7 @@ border-style: solid; box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); - &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } + &:insensitive { @include linear-gradient(shade($bg_color, .9)); } } &.fine-tune { @@ -140,17 +141,17 @@ } } - &.mark { border-color: alpha(border_normal($bg_color), 0.5); } + &.mark { border-color: alpha(border_normal($bg_color), .5); } &.trough { @include linear-gradient(shade($bg_color, 1.08)); margin: 7px 0; - border: 1px solid alpha(border_normal($bg_color), 0.5); + border: 1px solid alpha(border_normal($bg_color), .5); border-radius: $roundness; - &:insensitive { @include linear-gradient(shade($bg_color, 0.9)); } + &:insensitive { @include linear-gradient(shade($bg_color, .9)); } &.vertical { margin: 0 7px; } } @@ -162,9 +163,9 @@ border-color: $selected_bg_color; &:insensitive { - @include linear-gradient(shade($bg_color, 0.8)); + @include linear-gradient(shade($bg_color, .8)); - border-color: shade($bg_color, 0.7); + border-color: shade($bg_color, .7); } } } diff --git a/gtk-3.0/scss/widgets/_scrollbar.scss b/gtk-3.0/scss/widgets/_scrollbar.scss index bfc210e..56156d4 100644 --- a/gtk-3.0/scss/widgets/_scrollbar.scss +++ b/gtk-3.0/scss/widgets/_scrollbar.scss @@ -25,16 +25,16 @@ border-radius: 0; background-color: transparent; background-image: none; - color: alpha($fg_color, 0.5); + color: alpha($fg_color, .5); } } &.slider, &.slider.vertical { border: 0; border-radius: $roundness; - background-color: shade($bg_color, 0.5); + background-color: shade($bg_color, .5); - &:hover { background-color: shade($bg_color, 0.3); } + &:hover { background-color: shade($bg_color, .3); } &:active { background-color: $selected_bg_color; } @@ -44,7 +44,7 @@ // overlay scrolling indicator &.overlay-indicator { &:not(.dragging):not(.hovering) { - opacity: 0.5; + opacity: .5; -GtkRange-slider-width: 4px; @@ -60,7 +60,7 @@ } } - &.dragging, &.hovering { opacity: 0.7; } + &.dragging, &.hovering { opacity: .7; } } } @@ -75,12 +75,12 @@ // ubuntu overlay scrollbars OsThumb, OsScrollbar { - color: shade($bg_color, 0.7); + color: shade($bg_color, .7); &:selected { background-color: $selected_bg_color; } &:active { background-color: $selected_bg_color; } - &:insensitive { background-color: shade($bg_color, 0.9); } + &:insensitive { background-color: shade($bg_color, .9); } } } diff --git a/gtk-3.0/scss/widgets/_sidebar.scss b/gtk-3.0/scss/widgets/_sidebar.scss index 7d5d9f1..16583d7 100755 --- a/gtk-3.0/scss/widgets/_sidebar.scss +++ b/gtk-3.0/scss/widgets/_sidebar.scss @@ -4,16 +4,16 @@ @include exports("sidebar") { .sidebar { - &, &.view, & .view, & GtkScrolledWindow { + &, &.view, .view, GtkScrolledWindow { background-color: $bg_color; - color: mix($fg_color, $bg_color, 0.1); + color: mix($fg_color, $bg_color, .1); &.separator { &, &:hover, &:focus { border-width: 1px; border-style: solid; - border-color: shade($bg_color, 0.9); - color: shade($bg_color, 0.9); + border-color: shade($bg_color, .9); + color: shade($bg_color, .9); } } } @@ -21,14 +21,14 @@ row, .view row { &:selected { &, &:hover, &:focus { - border: none; + border: 0; background-image: none; background-color: $selected_bg_color; color: $selected_fg_color; } &:prelight { - border: none; + border: 0; background-image: none; background-color: shade($selected_bg_color, 1.05); color: $selected_fg_color; @@ -36,7 +36,7 @@ } &:prelight { - border: none; + border: 0; background-image: none; background-color: shade($bg_color, 1.05); } @@ -51,15 +51,16 @@ border-right-color: border_normal($bg_color); border-radius: 0; background-color: $bg_color; - color: mix($fg_color, $bg_color, 0.1); + color: mix($fg_color, $bg_color, .1); &:dir(ltr) { border-width: 0 1px 0 0; } + &:dir(rtl) { border-width: 0 0 0 1px; } .label { padding: $spacing ($spacing * 2); - &.highlight { background-color: mix($bg_color, $fg_color, 0.80); } + &.highlight { background-color: mix($bg_color, $fg_color, .8); } } &.csd .sidebar { border-top-style: none; } @@ -88,7 +89,7 @@ margin-left: $spacing; } - GtkPaned .pane-separator { background-color: shade($bg_color, 0.9); } + GtkPaned .pane-separator { background-color: shade($bg_color, .9); } GtkPaned.wide { -GtkPaned-handle-size: 4; @@ -99,7 +100,7 @@ GtkPaned.wide .pane-separator { background-color: transparent; border-style: none solid; - border-color: shade($bg_color, 0.9); + border-color: shade($bg_color, .9); border-width: 1px; } diff --git a/gtk-3.0/scss/widgets/_spinner.scss b/gtk-3.0/scss/widgets/_spinner.scss index 395c21c..9c753f7 100644 --- a/gtk-3.0/scss/widgets/_spinner.scss +++ b/gtk-3.0/scss/widgets/_spinner.scss @@ -18,7 +18,7 @@ opacity: 1; animation: spin 1s linear infinite; - &:insensitive { opacity: 0.5; } + &:insensitive { opacity: .5; } } } } diff --git a/gtk-3.0/scss/widgets/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss index a13a427..52bdee3 100755 --- a/gtk-3.0/scss/widgets/_toggle.scss +++ b/gtk-3.0/scss/widgets/_toggle.scss @@ -78,12 +78,12 @@ $suffix: if($variant == "dark", "-dark", ""); &.slider { @include linear-gradient(shade($bg_color, 1.2)); - border: 1px solid rgba(0,0,0,0.2); + border: 1px solid rgba(0, 0, 0, .2); box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12); &:insensitive { - border-color: rgba(0,0,0,0.1); - background-color: shade($bg_color, 0.9); + border-color: rgba(0, 0, 0, .1); + background-color: shade($bg_color, .9); box-shadow: none; } } @@ -101,7 +101,7 @@ $suffix: if($variant == "dark", "-dark", ""); &:active { @include linear-gradient($selected_bg_color, to top); - border-color: shade($selected_bg_color, 0.9); + border-color: shade($selected_bg_color, .9); color: $selected_fg_color; } @@ -109,7 +109,7 @@ $suffix: if($variant == "dark", "-dark", ""); @include linear-gradient(shade($bg_color, .9), to top); border-color: border_insensitive($bg_color); - color: mix($fg_color, $bg_color, 0.5); + color: mix($fg_color, $bg_color, .5); } } } diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss index e391f3d..019e79b 100755 --- a/gtk-3.0/scss/widgets/_toolbar.scss +++ b/gtk-3.0/scss/widgets/_toolbar.scss @@ -35,7 +35,7 @@ GtkComboBox, .button { padding: $spacing - 1px; - &.text-button { padding: $spacing; } + &.text-button { padding: $spacing; } &.image-button { padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; } } @@ -65,7 +65,7 @@ .header-bar { @include toolbar($titlebar_bg_color, $titlebar_fg_color); - border-width: 0 0 1px 0; + border-width: 0 0 1px; border-style: solid; } @@ -83,7 +83,7 @@ } &.default-decoration { - border: none; + border: 0; box-shadow: none; } @@ -93,7 +93,7 @@ .titlebutton { padding: $spacing; - border: none; + border: 0; background-image: none; background-color: transparent; color: mix($titlebar_fg_color, $titlebar_bg_color, .1); diff --git a/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss index e077972..d868914 100644 --- a/gtk-3.0/scss/widgets/_view.scss +++ b/gtk-3.0/scss/widgets/_view.scss @@ -10,8 +10,8 @@ background-color: $base_color; &:insensitive, &:insensitive:insensitive { - background-color: shade($base_color, 0.9); - color: mix($text_color, $base_color, 0.5); + background-color: shade($base_color, .9); + color: mix($text_color, $base_color, .5); } &:selected, &:selected:focus { @extend %selected; } @@ -33,7 +33,7 @@ -GtkWidget-focus-padding: 1; -GtkWidget-focus-line-width: 0; - border: none; + border: 0; background-color: $selected_bg_color; background-image: none; color: $selected_fg_color; @@ -45,11 +45,11 @@ &.view { background-color: $base_color; - &:prelight { background-color: alpha($selected_bg_color, 0.6); } + &:prelight { background-color: alpha($selected_bg_color, .6); } &:selected, &:active { background-color: $selected_bg_color; } - &:insensitive { background-color: shade($base_color, 0.9); } + &:insensitive { background-color: shade($base_color, .9); } &.check { &, &:active, &:prelight, &:insensitive, &:selected { background-color: transparent; } @@ -67,7 +67,7 @@ &.view.cell { &:selected, &:selected:focus { - border: none; + border: 0; border-radius: 2px; background-image: none; background-color: $selected_bg_color; @@ -77,32 +77,32 @@ } .dim-label { - &, &.view { color: alpha(currentColor, 0.5); } + &, &.view { color: alpha(currentColor, .5); } } .dnd { border: 1px solid $selected_bg_color; } .grip { background-color: transparent; } - .arrow { color: alpha(currentColor, 0.7); } + .arrow { color: alpha(currentColor, .7); } .rubberband { &, &.view, &.content-view.view { border: 1px solid $selected_bg_color; border-radius: 0; - background-color: alpha($selected_bg_color, 0.3); + background-color: alpha($selected_bg_color, .3); } } GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } /* this will get overridden by .view, needed by gedit line numbers */ - GtkTextView { background-color: mix($bg_color, $base_color, 0.50); } + GtkTextView { background-color: mix($bg_color, $base_color, .5); } GtkHTML { @extend .view; - &:insensitive { background-color: shade($base_color, 0.9); } + &:insensitive { background-color: shade($base_color, .9); } } GtkDrawingArea { background-color: transparent; } @@ -155,20 +155,20 @@ } &, &:active, &:focus, &:active:focus { - border-color: shade($base_color, 0.9); - border-bottom-color: shade($base_color, 0.8); - background-color: shade($base_color, 0.97); + border-color: shade($base_color, .9); + border-bottom-color: shade($base_color, .8); + background-color: shade($base_color, .97); background-image: none; } &:hover, &:active:hover, &:hover:focus, &:active:hover:focus { - border-color: shade($base_color, 0.9); - border-bottom-color: shade($base_color, 0.8); - background-color: shade($base_color, 0.99); + border-color: shade($base_color, .9); + border-bottom-color: shade($base_color, .8); + background-color: shade($base_color, .99); background-image: none; } - &:last-child .button { border-width: 0 0 1px 0; } + &:last-child .button { border-width: 0 0 1px; } } } } @@ -182,10 +182,10 @@ .frame { border: 1px solid border_normal($bg_color); - &.flat { border: none; } + &.flat { border: 0; } } /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ - GtkScrolledWindow GtkViewport.frame { border: none; } + GtkScrolledWindow GtkViewport.frame { border: 0; } } diff --git a/gtk-3.0/scss/widgets/_window.scss b/gtk-3.0/scss/widgets/_window.scss index 4ffb165..f609010 100755 --- a/gtk-3.0/scss/widgets/_window.scss +++ b/gtk-3.0/scss/widgets/_window.scss @@ -4,11 +4,11 @@ @include exports("window") { %window { - box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22), + box-shadow: 0 19px 38px rgba(0, 0, 0, .3), 0 15px 12px rgba(0, 0, 0, .22), 0 0 0 1px $wm_border_focused; &:backdrop { - box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23), + box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23), 0 0 0 1px $wm_border_unfocused; } } @@ -16,7 +16,7 @@ .window-frame { @extend %window; - border: none; + border: 0; border-radius: $roundness $roundness 0 0; /* this is used for the resize cursor area */ From 5b925be14ed411faddb88f8e78be4ae460b59735 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Fri, 7 Aug 2015 04:59:32 +0530 Subject: [PATCH 70/73] Update scss lint config --- .scss-lint.yml | 22 +++++++++++++++++++--- gtk-3.0/scss/_global.scss | 2 ++ gtk-3.0/scss/widgets/_infobar.scss | 8 ++++---- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.scss-lint.yml b/.scss-lint.yml index e9477d5..a981c3b 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -12,7 +12,7 @@ linters: enabled: true ColorVariable: - enabled: false + enabled: true Comment: enabled: false @@ -23,6 +23,9 @@ linters: DeclarationOrder: enabled: true + DisableLinterReason: + enabled: true + DuplicateProperty: enabled: true @@ -37,6 +40,9 @@ linters: EmptyRule: enabled: true + ExtendDirective: + enabled: false + FinalNewline: enabled: true present: true @@ -94,7 +100,11 @@ linters: PropertySpelling: enabled: true - extra_properties: ["icon-shadow","outline-radius"] + extra_properties: [ "icon-shadow", "outline-radius" ] + + PropertyUnits: + enabled: true + global: [ "px", "%", "s", "ms" ] QualifyingElement: enabled: false @@ -130,13 +140,19 @@ linters: SpaceAfterPropertyName: enabled: true + SpaceAfterVariableName: + enabled: true + + SpaceAroundOperator: + enabled: true + SpaceBeforeBrace: enabled: true style: space allow_single_line_padding: true SpaceBetweenParens: - enabled: false + enabled: true spaces: 0 StringQuotes: diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss index e2b70ee..3dfab07 100755 --- a/gtk-3.0/scss/_global.scss +++ b/gtk-3.0/scss/_global.scss @@ -1,3 +1,5 @@ +// scss-lint:disable ColorVariable + @import "functions"; // default color scheme diff --git a/gtk-3.0/scss/widgets/_infobar.scss b/gtk-3.0/scss/widgets/_infobar.scss index 9b5a679..4351c9b 100644 --- a/gtk-3.0/scss/widgets/_infobar.scss +++ b/gtk-3.0/scss/widgets/_infobar.scss @@ -10,10 +10,10 @@ border: 0; $types: ( - info: ( $info_fg_color, $info_bg_color ), - warning: ( $warning_fg_color, $warning_bg_color ), - question: ( $question_fg_color, $question_bg_color ), - error: ( $error_fg_color, $error_bg_color ), + info: ($info_fg_color, $info_bg_color), + warning: ($warning_fg_color, $warning_bg_color), + question: ($question_fg_color, $question_bg_color), + error: ($error_fg_color, $error_bg_color), ); From 5b76a3bedd84eded5c21ea601ba77ae3899e673c Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 10 Aug 2015 12:49:19 +0200 Subject: [PATCH 71/73] Initial commit for unity-greeter --- gtk-3.0/scss/_widgets.scss | 2 +- gtk-3.0/scss/apps/_unity-greeter.scss | 96 +++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 gtk-3.0/scss/apps/_unity-greeter.scss diff --git a/gtk-3.0/scss/_widgets.scss b/gtk-3.0/scss/_widgets.scss index 62de316..e8ac3b8 100755 --- a/gtk-3.0/scss/_widgets.scss +++ b/gtk-3.0/scss/_widgets.scss @@ -25,7 +25,7 @@ @import "widgets/view"; @import "widgets/window"; - +@import "apps/unity-greeter"; @import "apps/gedit"; @import "apps/nautilus"; @import "apps/nemo"; diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss new file mode 100644 index 0000000..3a3798b --- /dev/null +++ b/gtk-3.0/scss/apps/_unity-greeter.scss @@ -0,0 +1,96 @@ +/*********************** + ! Unity Greeter * + ***********************/ + +@include exports("unity-greeter") { + .lightdm.menu { + background-image: none; + background-color: #00ff00; + border-color: #00ff00; + border-radius: 4px; + padding: 1px; + color: #00ff00; + } + + .lightdm-combo .menu { + background-color: #00ff00; + border-radius: 0px; + padding: 0px; + color: #00ff00; + } + + .lightdm.menu .menuitem *, + .lightdm.menu .menuitem.check:active, + .lightdm.menu .menuitem.radio:active { + color: #00ff00; + } + + .lightdm.menubar { + background-image: none; + background-color: #00ff00; + } + + .lightdm-combo.combobox-entry .button, + .lightdm-combo .cell, + .lightdm-combo .button, + .lightdm-combo .entry, + .lightdm.button, + .lightdm.entry { + background-image: none; + background-color: alpha (black, 0.3); + border-color: alpha (white, 0.6); + border-radius: 5px; + padding: 7px; + color: white; + text-shadow: none; + } + + .lightdm.button, + .lightdm.button:hover, + .lightdm.button:active, + .lightdm.button:active:focused, + .lightdm.entry, + .lightdm.entry:hover, + .lightdm.entry:active, + .lightdm.entry:active:focused { + background-image: none; + border-image: none; + } + + .lightdm.button:focused, + .lightdm.entry:focused { + border-color: alpha (white, 0.9); + border-width: 1px; + border-style: solid; + color: white; + } + + .lightdm.entry:selected { + background-color: alpha (white, 0.2); + } + + @keyframes dashentry_spinner { + to { -gtk-icon-transform: rotate(1turn); } + } + + .lightdm.entry:active { + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); + animation: dashentry_spinner 1s infinite linear; + } + + .lightdm.option-button { + padding: 2px; + background: none; + border: 0; + } + + .lightdm.toggle-button { + background: none; + border-width: 0; + } + + .lightdm.toggle-button.selected { + background-color: alpha (black, 0.3); + border-width: 1px; + } +} From 19d3846d97adaeedef3de9e86ab6097cce324548 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 10 Aug 2015 19:24:38 +0200 Subject: [PATCH 72/73] Adds updated _unity-greeter.scss --- gtk-3.0/scss/apps/_unity-greeter.scss | 108 ++++++++++++++++---------- 1 file changed, 65 insertions(+), 43 deletions(-) diff --git a/gtk-3.0/scss/apps/_unity-greeter.scss b/gtk-3.0/scss/apps/_unity-greeter.scss index 3a3798b..eb60d2a 100644 --- a/gtk-3.0/scss/apps/_unity-greeter.scss +++ b/gtk-3.0/scss/apps/_unity-greeter.scss @@ -3,70 +3,87 @@ ***********************/ @include exports("unity-greeter") { - .lightdm.menu { - background-image: none; - background-color: #00ff00; - border-color: #00ff00; - border-radius: 4px; - padding: 1px; - color: #00ff00; - } - .lightdm-combo .menu { - background-color: #00ff00; - border-radius: 0px; - padding: 0px; - color: #00ff00; - } - .lightdm.menu .menuitem *, - .lightdm.menu .menuitem.check:active, - .lightdm.menu .menuitem.radio:active { - color: #00ff00; - } +.lightdm.menu { + background-image: none; + background-color: alpha($black, 0.6); + border-color: alpha($white, 0.2); + border-radius: 4px; + padding: 1px; + + color: $white; +} + +.lightdm-combo .menu { + background-color: shade($dark_bg_color, 1.08); + border-radius: 0px; + padding: 0px; + + color: $white; +} + +.lightdm.menu .menuitem *, +.lightdm.menu .menuitem.check:active, +.lightdm.menu .menuitem.radio:active { + color: $white; +} + +.lightdm.menubar { + background-image: none; + background-color: alpha(#00ff00, 0.5); +} - .lightdm.menubar { - background-image: none; - background-color: #00ff00; - } .lightdm-combo.combobox-entry .button, .lightdm-combo .cell, .lightdm-combo .button, .lightdm-combo .entry, - .lightdm.button, - .lightdm.entry { + + .lightdm.button{ background-image: none; - background-color: alpha (black, 0.3); - border-color: alpha (white, 0.6); + background-color: alpha($black, 0.3); + border-color: alpha($white, 0.9); border-radius: 5px; - padding: 7px; - color: white; + padding: 5px; + color: $white; + } + .lightdm.button:hover { + background-image: none; + background-color: alpha($white, 0.3); + border-color: alpha($white, 0.6); + border-radius: 5px; + padding: 5px; + color: $white; text-shadow: none; - } - - .lightdm.button, - .lightdm.button:hover, + } .lightdm.button:active, .lightdm.button:active:focused, - .lightdm.entry, + .lightdm.button:focused, + + .lightdm.entry { + background-image: none; + background-color: alpha($black, 0.3); + border-color: alpha($white, 0.6); + border-radius: 5px; + padding: 7px; + color: $white; + text-shadow: none; + } .lightdm.entry:hover, .lightdm.entry:active, .lightdm.entry:active:focused { background-image: none; border-image: none; } - - .lightdm.button:focused, .lightdm.entry:focused { - border-color: alpha (white, 0.9); + border-color: alpha($white, 0.6); border-width: 1px; border-style: solid; - color: white; + color: $white; } - .lightdm.entry:selected { - background-color: alpha (white, 0.2); + background-color: alpha($white, 0.2); } @keyframes dashentry_spinner { @@ -79,7 +96,7 @@ } .lightdm.option-button { - padding: 2px; + padding: 5px; background: none; border: 0; } @@ -88,9 +105,14 @@ background: none; border-width: 0; } - + .lightdm.toggle-button.selected:hover { + background-color: alpha($white, 0.3); + border-color: alpha($white, 0.3); + border-width: 1px; + } .lightdm.toggle-button.selected { - background-color: alpha (black, 0.3); + background-color: alpha($black, 0.3); + border-color: alpha($white, 0.3); border-width: 1px; } } From 3467848945c344f43ec6ae0e9e4c3d748d83a2c6 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Tue, 11 Aug 2015 22:40:53 +0530 Subject: [PATCH 73/73] Create .hound.yml --- .hound.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .hound.yml diff --git a/.hound.yml b/.hound.yml new file mode 100644 index 0000000..35b1a94 --- /dev/null +++ b/.hound.yml @@ -0,0 +1,2 @@ +scss: + config_file: .scss-lint.yml