From 562b3beabb8b477f58bdcd231ad0b83e970b5d61 Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Thu, 12 Mar 2015 15:31:54 -0400 Subject: [PATCH] Refinement --- Paper/gnome-shell/assets/close-window.svg | 76 +++++++++++-------- Paper/gnome-shell/gnome-shell.css | 21 ++--- Paper/gtk-3.0/apps/nautilus.css | 12 --- Paper/gtk-3.0/gtk-common.css | 2 +- .../widgets/destructive-action-buttons.css | 16 +++- .../widgets/suggested-action-buttons.css | 16 +++- 6 files changed, 85 insertions(+), 58 deletions(-) diff --git a/Paper/gnome-shell/assets/close-window.svg b/Paper/gnome-shell/assets/close-window.svg index 25515cf..18318d0 100644 --- a/Paper/gnome-shell/assets/close-window.svg +++ b/Paper/gnome-shell/assets/close-window.svg @@ -14,18 +14,18 @@ id="Foreground" x="0px" y="0px" - width="24" - height="24" - viewBox="0 0 17.454545 17.454545" + width="32" + height="32" + viewBox="0 0 23.272727 23.272727" enable-background="new 0 0 16 16" xml:space="preserve" sodipodi:version="0.32" - inkscape:version="0.48.4 r9939" + inkscape:version="0.91 r13725" sodipodi:docname="close-window.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">image/svg+xml \ No newline at end of file + sodipodi:nodetypes="ccccccccccccccccccccccccc" /> \ No newline at end of file diff --git a/Paper/gnome-shell/gnome-shell.css b/Paper/gnome-shell/gnome-shell.css index 6373fcf..f82822c 100644 --- a/Paper/gnome-shell/gnome-shell.css +++ b/Paper/gnome-shell/gnome-shell.css @@ -770,9 +770,10 @@ StScrollBar { .message-content { padding: 8px; } + .system-switch-user-submenu-icon { - icon-size: 24px; - border: 1px solid rgba(238, 238, 236, 0.4); } + icon-size: 48px; + border: none; } #appMenu { spinner-image: url("assets/process-working.svg"); @@ -820,10 +821,9 @@ StScrollBar { .window-close, .notification-close { background-image: url("assets/close-window.svg"); - background-size: 24px; - padding: 6px; - height: 24px; - width: 24px; } + background-size: 32px; + height: 32px; + width: 32px; } .window-close { -shell-close-overlap: 16px; } @@ -909,7 +909,7 @@ StScrollBar { .window-clone-border { border: 4px solid rgba(159, 176, 185, 0.7); border-radius: 4px; - box-shadow: inset 0px 0px 0px 0px #9FB0B9; } + box-shadow: 0 2px 5px 0 rgba(0,0,0,0.5); } .window-caption { spacing: 25px; @@ -920,7 +920,8 @@ StScrollBar { -shell-caption-spacing: 12px; } .window-caption:hover { background-color: #454d50; - color: #dbdee0; } + color: #dbdee0; + box-shadow: 0 2px 5px 0 rgba(0,0,0,0.5); } .search-entry { width: 320px; @@ -1700,10 +1701,10 @@ StScrollBar { background-color: rgba(0, 0, 0, 0.8); spacing: 4px; padding: 4px; - border: 2px solid grey; + border: 1px solid rgba(0,0,0,0.7); border-radius: 4px; } #LookingGlassDialog > #Toolbar { - border: 1px solid grey; + border: 1px solid rgba(0,0,0,0.7); border-radius: 4px; } #LookingGlassDialog .labels { spacing: 4px; } diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css index c8b2cf8..cf44342 100644 --- a/Paper/gtk-3.0/apps/nautilus.css +++ b/Paper/gtk-3.0/apps/nautilus.css @@ -209,16 +209,4 @@ NautilusWindow .dynamic-notebook tab.right:active { .nautilus-desktop.nautilus-canvas-item:selected:backdrop { color: @backdrop_selected_foreground; -} - -NautilusWindow .frame { - border-width: 0 0 1px 0; -} - -NautilusWindow GtkScrolledWindow.frame { - border-width: 0; -} - -NautilusWindow .sidebar .frame { - border-width: 0px; } \ 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 7e171c5..255fcdd 100644 --- a/Paper/gtk-3.0/gtk-common.css +++ b/Paper/gtk-3.0/gtk-common.css @@ -64,7 +64,7 @@ /* Selected color */ @define-color selected_background @selection; @define-color selected_border shade(@selection, 0.9); -@define-color selected_foreground shade(@selection, 0.8); +@define-color selected_foreground alpha(#000, 0.5); @define-color selection_foreground @selected_foreground; /**************** diff --git a/Paper/gtk-3.0/widgets/destructive-action-buttons.css b/Paper/gtk-3.0/widgets/destructive-action-buttons.css index bd14c18..cd2ab85 100644 --- a/Paper/gtk-3.0/widgets/destructive-action-buttons.css +++ b/Paper/gtk-3.0/widgets/destructive-action-buttons.css @@ -89,7 +89,13 @@ .destructive-action.button:active GtkImage, .destructive-action.button:focus GtkImage, .destructive-action.button:hover GtkImage { - color: @selected_foreground; + color: @suggested_action_button_foreground; +} + +.destructive-action.image-button:active GtkImage, +.destructive-action.image-button:focus GtkImage, +.destructive-action.image-button:hover GtkImage { + color: @suggested_action_button_foreground; } .destructive-action.button:backdrop GtkImage, @@ -118,7 +124,13 @@ .destructive-action.button:active GtkLabel, .destructive-action.button:focus GtkLabel, .destructive-action.button:hover GtkLabel { - color: @selected_foreground; + color: @destructive_action_button_foreground; +} + +.destructive-action.text-button:active GtkLabel, +.destructive-action.text-button:focus GtkLabel, +.destructive-action.text-button:hover GtkLabel { + color: @destructive_action_button_foreground; } .destructive-action.button:backdrop GtkLabel, diff --git a/Paper/gtk-3.0/widgets/suggested-action-buttons.css b/Paper/gtk-3.0/widgets/suggested-action-buttons.css index fa3a162..46eb6b7 100644 --- a/Paper/gtk-3.0/widgets/suggested-action-buttons.css +++ b/Paper/gtk-3.0/widgets/suggested-action-buttons.css @@ -131,7 +131,13 @@ .suggested-action.button:active GtkImage, .suggested-action.button:focus GtkImage, .suggested-action.button:hover GtkImage { - color: @selected_foreground; + color: @suggested_action_button_foreground; +} + +.suggested-action.image-button:active GtkImage, +.suggested-action.image-button:focus GtkImage, +.suggested-action.image-button:hover GtkImage { + color: @suggested_action_button_foreground; } .suggested-action.button:backdrop GtkImage, @@ -160,7 +166,13 @@ .suggested-action.button:active GtkLabel, .suggested-action.button:focus GtkLabel, .suggested-action.button:hover GtkLabel { - color: @selected_foreground; + color: @suggested_action_button_foreground; +} + +.suggested-action.text-button:active GtkLabel, +.suggested-action.text-button:focus GtkLabel, +.suggested-action.text-button:hover GtkLabel { + color: @suggested_action_button_foreground; } .suggested-action.button:backdrop GtkLabel,