From 96eee53cb34ce0f6c9d26f73a4c79ffb34cbfd1e Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Thu, 4 Jun 2015 16:04:44 -0400 Subject: [PATCH] Stuff --- Paper/gnome-shell/gnome-shell.css | 1 + Paper/gtk-3.0/apps/baobab.css | 2 +- Paper/gtk-3.0/apps/calculator.css | 2 +- Paper/gtk-3.0/apps/gnome-clocks.css | 71 +++++----------- Paper/gtk-3.0/apps/pantheon.css | 83 +++++++++++++++++++ Paper/gtk-3.0/granite-widgets.css | 45 ---------- Paper/gtk-3.0/gtk-common.css | 4 +- Paper/gtk-3.0/gtk-dark.css | 4 +- Paper/gtk-3.0/gtk.css | 7 +- .../gtk-3.0/widgets/composited-indicator.css | 2 + Paper/gtk-3.0/widgets/dialogs.css | 6 +- Paper/gtk-3.0/widgets/header-bar.css | 2 +- Paper/gtk-3.0/widgets/sidebar.css | 9 +- Paper/plank/dock.theme | 6 +- 14 files changed, 134 insertions(+), 110 deletions(-) diff --git a/Paper/gnome-shell/gnome-shell.css b/Paper/gnome-shell/gnome-shell.css index 0ec9db7..2acf1c7 100644 --- a/Paper/gnome-shell/gnome-shell.css +++ b/Paper/gnome-shell/gnome-shell.css @@ -1165,6 +1165,7 @@ StScrollBar { background-color: rgba(45, 51,53,0.9); background-gradient-direction: none; background-image: none; + text-shadow: 0 1px rgba(0,0,0,0.2); box-shadow: inset 0 1px 2px 0 rgba(0,0,0,0.7); } .app-well-app:hover .overview-icon, .app-well-app:focus .overview-icon, .app-well-app:selected .overview-icon, diff --git a/Paper/gtk-3.0/apps/baobab.css b/Paper/gtk-3.0/apps/baobab.css index f180817..d53caae 100644 --- a/Paper/gtk-3.0/apps/baobab.css +++ b/Paper/gtk-3.0/apps/baobab.css @@ -16,7 +16,7 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ -@define-color baobab #9B26AF; +@define-color baobab #CC5E55; /********** * Header * diff --git a/Paper/gtk-3.0/apps/calculator.css b/Paper/gtk-3.0/apps/calculator.css index a8fb6fc..ac0c3d0 100644 --- a/Paper/gtk-3.0/apps/calculator.css +++ b/Paper/gtk-3.0/apps/calculator.css @@ -16,7 +16,7 @@ * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. */ -@define-color calculator #BA174E;/* Calc color */ +@define-color calculator #07ce8e; /************** * Header bar * diff --git a/Paper/gtk-3.0/apps/gnome-clocks.css b/Paper/gtk-3.0/apps/gnome-clocks.css index e6fcb03..6003019 100644 --- a/Paper/gtk-3.0/apps/gnome-clocks.css +++ b/Paper/gtk-3.0/apps/gnome-clocks.css @@ -32,39 +32,17 @@ ClocksWindow .header-bar:backdrop { background-color: shade(@clocks,0.9); } - -/* Switch */ -ClocksWindow .header-bar GtkSwitch.trough:active { - background-color: @clocks; -} - -ClocksWindow GtkSwitch.trough:active { - border: 1px solid shade(@clocks, 0.8); - background-color: @clocks; -} - -ClocksWindow GtkSwitch.slider:active { - border: 1px solid shade(@clocks, 0.8); -} - -ClocksWindow .header-bar GtkSwitch.slider:active:backdrop, -ClocksWindow .header-bar GtkSwitch.slider:backdrop { - background-color: shade(@clocks, 0.9); -} - - /********** * Frame * **********/ - ClocksWindow > .frame { background-color: mix(@foreground, @background, 0.95); box-shadow: inset 0 5px 2px -6px black; } ClocksWindow > .frame:backdrop { - background-color: mix(@unfocused_foreground, @unfocused_background, 0.95); + background-color: mix(@backdrop_foreground, @backdrop_background, 0.95); box-shadow: none; } @@ -73,7 +51,8 @@ ClocksWindow .clocks-tiles-view { } ClocksWindow .clocks-digital-renderer { - background-color: transparent; + /*background-color: transparent;*/ + color: @text; } ClocksWindow .clocks-digital-renderer.stripe { @@ -93,31 +72,27 @@ ClocksWindow .clocks-digital-renderer.light.stripe:prelight { ClocksWindow .clocks-digital-renderer.dark.stripe { background-color: rgba(0, 0, 0, 0.4); - color: white; + color: @text; } ClocksWindow .clocks-digital-renderer.dark.stripe:prelight { background-color: rgba(0, 0, 0, 0.2); } + /* alarms */ ClocksWindow .clocks-digital-renderer.active { - background-color: transparent; - background-image: -gtk-gradient(radial, - center center, 0, - center bottom, 1.0, - from(shade(@selected_background,1.2)), to(@selected_background)); - color: white; + background-color: @selection; + background-image: none; + color: @selected_foreground; } ClocksWindow .clocks-digital-renderer.active:prelight { - background-color: transparent; - background-image: -gtk-gradient(radial, - center center, 0, - center bottom, 1.0, - from(shade(@selected_background, 1.4)), to(@selected_background)); - text-shadow: 0 2px 2px rgba(0,0,0,0.5) + background-color: @selection; + background-image: none; + text-shadow: 0 2px 2px rgba(0,0,0,0.5); + color: @selected_foreground; } ClocksWindow .clocks-digital-renderer.snoozing { @@ -125,8 +100,8 @@ ClocksWindow .clocks-digital-renderer.snoozing { background-image: -gtk-gradient(radial, center center, 0, center bottom, 1.0, - from(@warning_color), to(shade(@warning_color,0.9))); - color: white; + from(@warning), to(shade(@warning,0.9))); + color: @text; } ClocksWindow .clocks-digital-renderer.snoozing:prelight { @@ -134,8 +109,9 @@ ClocksWindow .clocks-digital-renderer.snoozing:prelight { background-image: -gtk-gradient(radial, center center, 0, center bottom, 1.0, - from(shade(@warning_color,1.1)), to(shade(@warning_color,0.99))); - text-shadow: 0 2px 2px rgba(0,0,0,0.5) + from(shade(@warning,1.1)), to(shade(@warning,0.99))); + text-shadow: 0 2px 2px rgba(0,0,0,0.5); + color: @text; } ClocksWindow .clocks-digital-renderer.inactive { @@ -191,6 +167,7 @@ ClocksWindow .clocks-spinbutton { ClocksWindow .clocks-stopwatch-label, ClocksWindow .clocks-timer-label { font-size: 48px; + color: @text; } ClocksWindow .clocks-analog-frame.trough { @@ -211,13 +188,13 @@ ClocksWindow .clocks-laps-panel { ClocksWindow .clocks-laps-panel > .frame:dir(ltr) { border-image: linear-gradient(to bottom, - mix(@borders,@background,0.5)) + mix(@border,@background,0.5)) 0 0 0 1 / 20px 0px 20px 1px stretch; } ClocksWindow .clocks-laps-panel > .frame:dir(rtl) { border-image: linear-gradient(to bottom, - mix(@borders,@background,0.5)) + mix(@border,@background,0.5)) 0 1 0 0 / 20px 1px 20px 0px stretch; } @@ -231,7 +208,7 @@ ClocksWindow .clocks-laps-panel .list-row { padding-right: 20px; font-size: 14px; border-image: linear-gradient(to bottom, - mix(@borders,@background,0.5)) + mix(@border,@background,0.5)) 0 0 1 0 / 0 20px 1px 20px stretch; } @@ -248,9 +225,7 @@ ClocksWindow .clocks-laps-panel .lap-time { /* disguise insensitive spinbuttons as normal labels */ ClocksWindow .spinbutton .clocks-timer-label, ClocksWindow .spinbutton .clocks-timer-label .button { - border-color: transparent; - background-image: none; - box-shadow: none; + color: @foreground; } ClocksWindow .spinbutton .clocks-timer-label, @@ -259,7 +234,7 @@ ClocksWindow .spinbutton .clocks-timer-label GtkLabel { } ClocksWindow .spinbutton .clocks-timer-label .button { - color: transparent; + color: @foreground; } @keyframes clocks-blink { diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css index 9fe1ff7..b74c0af 100644 --- a/Paper/gtk-3.0/apps/pantheon.css +++ b/Paper/gtk-3.0/apps/pantheon.css @@ -260,4 +260,87 @@ NoiseWidgetsTileView { PantheonTerminalPantheonTerminalWindow.background { background: none; +} + +/********** + * Noise * + **********/ + +NoiseTopDisplay .seek-bar { + background-color: @header; + color: @header_text; +} + +/********* + * Panel * + ********/ + +.panel, +.panel:backdrop { + background-color: @panel; + color: @panel_text; + font-weight: bold; +} + +.panel-shadow { + background-image: none; + background-color: transparent; +} + +.panel .menu { + box-shadow: none; +} + +.panel .menu .spinner { + opacity: 1; +} + +.panel .menubar .composited-indicator { + padding: 2px 4px; + text-shadow:0 1px 2px alpha(@panel, 0.7); + icon-shadow:0 1px 2px alpha(@panel, 0.7); +} + +.panel .menubar .composited-indicator:prelight { + background-color: alpha(#000, 0.1); + box-shadow: none; + color: @panel_text; +} + +.panel .menubar .composited-indicator:backdrop GtkLabel, +.panel .menubar .composited-indicator:prelight GtkLabel { + color: @panel_text; +} + +.panel .composited-indicator .menu .menuitem { + padding: 4px 6px; + font-weight: normal; + text-shadow:none; + icon-shadow:none; +} + +.panel .composited-indicator .menu .menuitem GtkImage, +.panel .composited-indicator .menu .menuitem GtkLabel, +.panel .composited-indicator .menu .menuitem:backdrop GtkImage, +.panel .composited-indicator .menu .menuitem:backdrop GtkLabel { + color: @text; +} + +.panel .composited-indicator .menu .menuitem:insensitive GtkImage, +.panel .composited-indicator .menu .menuitem:insensitive GtkLabel { + color: @insensitive_text; +} + +.panel .window-frame.menu.csd, +.panel .window-frame.popup.csd { + box-shadow: none; +} + +.panel .menu .window-frame.menu.csd, +.panel .menu .window-frame.popup.csd { + box-shadow: 0 0 0 1px alpha (#000, 0.20), + 0 10px 20px alpha (#000, 0.19), + 0 6px 6px alpha (#000, 0.23), + inset 0 1px 0 0 rgba(255,255,255,0.1), + inset 0 -3px 3px -4px alpha(#000, 0.4); } \ No newline at end of file diff --git a/Paper/gtk-3.0/granite-widgets.css b/Paper/gtk-3.0/granite-widgets.css index acb564e..1421d8a 100644 --- a/Paper/gtk-3.0/granite-widgets.css +++ b/Paper/gtk-3.0/granite-widgets.css @@ -88,49 +88,4 @@ GraniteWidgetsWelcome GtkLabel { GraniteWidgetsWelcome .h1, GraniteWidgetsWelcome .h3 { color: alpha(@foreground, 0.8); -} - -/********* - * Panel * - ********/ - -.panel { - background-color: @panel; - color: @panel_text; - font-weight: bold; -} - -.panel-shadow { - background-image: none; - background-color: transparent; -} - -.panel .menu { - box-shadow: none; -} - -.panel .menu .spinner { - opacity: 1; -} - -.panel .menu .menuitem { - font-weight: normal; -} - -.panel .menuitem { - padding: 2px 4px; -} - -.panel .window-frame.menu.csd, -.panel .window-frame.popup.csd { - box-shadow: none; -} - -.panel .menu .window-frame.menu.csd, -.panel .menu .window-frame.popup.csd { - box-shadow: 0 0 0 1px alpha (#000, 0.20), - 0 10px 20px alpha (#000, 0.19), - 0 6px 6px alpha (#000, 0.23), - inset 0 1px 0 0 rgba(255,255,255,0.1), - inset 0 -3px 3px -4px alpha(#000, 0.4); } \ No newline at end of file diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css index 5133f23..ef00c8a 100644 --- a/Paper/gtk-3.0/gtk-common.css +++ b/Paper/gtk-3.0/gtk-common.css @@ -22,7 +22,7 @@ /* Insensitive colors */ @define-color insensitive_base shade(@base, 0.95); -@define-color insensitive_background shade(@background, 1.01); +@define-color insensitive_background @background; @define-color insensitive_foreground alpha(@foreground, 0.5); @define-color insensitive_border shade(@border, 1.1); @define-color insensitive_button @insensitive_background; @@ -37,7 +37,7 @@ @define-color backdrop_border shade(@border, 1.02); @define-color backdrop_separator alpha(@separator, 0.9); @define-color backdrop_text shade(@text, 1.1); -@define-color backdrop_selection shade(@selection, 1.3); +@define-color backdrop_selection shade(@selection, 0.95); /* Backdrop-insensitive colors */ @define-color backdrop_insensitive_border mix(@backdrop_background, @backdrop_border, 0.5); diff --git a/Paper/gtk-3.0/gtk-dark.css b/Paper/gtk-3.0/gtk-dark.css index 938a232..94c3a02 100644 --- a/Paper/gtk-3.0/gtk-dark.css +++ b/Paper/gtk-3.0/gtk-dark.css @@ -27,13 +27,13 @@ @define-color border shade(@background, 0.8);/* Borders color */ @define-color separator alpha(#000, 0.1);/* Separator color */ @define-color text @foreground;/* Text color */ -@define-color panel shade(@header, 0.8);/* Panel color */ @define-color header #3B4245;/* Header color */ -@define-color backdrop_header shade(@header, 0.95); /* Header backdrop color */ +@define-color backdrop_header shade(@header, 0.9); /* Header backdrop color */ @define-color header_text alpha(#fff, 0.8);/* Header text color */ @define-color selection #90a4ae;/* Selection color */ @define-color view_background @base;/* View background */ @define-color inactive_frame @border;/* Inactive frame color */ +@define-color panel shade(@header, 0.8);/* Panel color */ @define-color panel_text #A1A8AB;/* Panel text color */ @define-color panel_text_shadow alpha(#000, 0.2);/* Panel text color */ @define-color text_shadow alpha(white, 0.4);/* Text shadow */ diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css index 1f59c22..9077cda 100644 --- a/Paper/gtk-3.0/gtk.css +++ b/Paper/gtk-3.0/gtk.css @@ -27,16 +27,15 @@ @define-color border #D8D8D8;/* Borders color */ @define-color separator alpha(#000, 0.15);/* Separator color */ @define-color text @foreground;/* Text color */ -@define-color panel #454D50;/* Panel color */ @define-color header #636E73;/* Header color */ -@define-color backdrop_header #5A6367; /* Header backdrop color */ +@define-color backdrop_header shade(@header, 0.9);/* Backdrop Header color */ @define-color header_text #fff;/* Header text color */ @define-color header_text_dark alpha(#000, 0.3);/* Header text color */ @define-color selection #dbdee0;/* Selection color */ @define-color view_background @base;/* View background */ @define-color inactive_frame @border;/* Inactive frame color */ -@define-color panel_text #dbdee0;/* Panel text color */ -@define-color panel_text_shadow alpha(#000, 0.2);/* Panel text color */ +@define-color panel shade(@header, 0.8);/* Panel color */ +@define-color panel_text #E0E2E3;/* Panel text color */ @define-color text_shadow alpha(white, 0.4);/* Text shadow */ @define-color icon_shadow @text_shadow;/* Icon shadow */ @define-color progress_color #9fb0b9; /* Progressbar color */ diff --git a/Paper/gtk-3.0/widgets/composited-indicator.css b/Paper/gtk-3.0/widgets/composited-indicator.css index 21e58a8..c74c66d 100644 --- a/Paper/gtk-3.0/widgets/composited-indicator.css +++ b/Paper/gtk-3.0/widgets/composited-indicator.css @@ -42,6 +42,8 @@ .composited-indicator .menuitem:prelight { border-style: none; background-image: none; + background-color: shade(@panel, 1.05); + color: @panel_text; box-shadow: none; } diff --git a/Paper/gtk-3.0/widgets/dialogs.css b/Paper/gtk-3.0/widgets/dialogs.css index 6e8b6ba..ca14fe1 100644 --- a/Paper/gtk-3.0/widgets/dialogs.css +++ b/Paper/gtk-3.0/widgets/dialogs.css @@ -94,4 +94,8 @@ GtkFileChooserDialog .search-bar { GtkFileChooserDialog .dialog-action-box { border-top: 1px solid @border; } GtkFileChooserDialog .dialog-action-box:backdrop { - border-top-color: @backdrop_border; } \ No newline at end of file + border-top-color: @backdrop_border; } + +GtkFileChooserDialog .sidebar.view.cell { + padding: 0; +} \ No newline at end of file diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css index 9b87cc5..1578276 100644 --- a/Paper/gtk-3.0/widgets/header-bar.css +++ b/Paper/gtk-3.0/widgets/header-bar.css @@ -159,7 +159,7 @@ .header-bar .image-button:checked { border-radius: 0px; background-image: none; - background-color: none; + background: none; border: none; color: @header_text; box-shadow:inset 0 -2px 0 0 @header_text; diff --git a/Paper/gtk-3.0/widgets/sidebar.css b/Paper/gtk-3.0/widgets/sidebar.css index 034ae38..9b6cd15 100644 --- a/Paper/gtk-3.0/widgets/sidebar.css +++ b/Paper/gtk-3.0/widgets/sidebar.css @@ -98,13 +98,11 @@ GtkDialog .sidebar .view:hover:selected { .sidebar .view:hover:selected:backdrop, .source-list.view:selected:backdrop, .source-list.view:hover:selected:backdrop { - background: none; color: alpha(@selection, 0.5); } GtkDialog .sidebar .view:selected:backdrop, GtkDialog .sidebar .view:hover:selected:backdrop { - background: none; color: alpha(@selection, 0.5); } @@ -150,3 +148,10 @@ GtkDialog .sidebar .view:hover:selected:backdrop { background-color: alpha(#000, 0.2); color: shade (@background, 0.95); } + +.sidebar .separator { + color: @separator; +} +.sidebar .separator:backdrop { + color: @backdrop_separator; +} diff --git a/Paper/plank/dock.theme b/Paper/plank/dock.theme index 00170b1..cc030ff 100644 --- a/Paper/plank/dock.theme +++ b/Paper/plank/dock.theme @@ -29,11 +29,11 @@ BottomRoundness=0 #The thickness (in pixels) of lines drawn. LineWidth=1 #The color (RGBA) of the outer stroke. -OuterStrokeColor=211;;212;;213;;214 +OuterStrokeColor=211;;212;;213;;200 #The starting color (RGBA) of the fill gradient. -FillStartColor=211;;212;;213;;214 +FillStartColor=211;;212;;213;;200 #The ending color (RGBA) of the fill gradient. -FillEndColor=211;;212;;213;;214 +FillEndColor=211;;212;;213;;200 #The color (RGBA) of the inner stroke. InnerStrokeColor=211;;212;;213;;0