From 7523463106ca8417abd2c0b755e764b2475b94dd Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 8 Jun 2015 19:40:40 +0200 Subject: [PATCH 1/4] add text-shadow to desktop icons fixes #53 --- common/gtk-3.0/3.14/_applications.scss | 1 + common/gtk-3.0/3.14/gtk-contained-solid.css | 3 ++- common/gtk-3.0/3.14/gtk-contained.css | 3 ++- common/gtk-3.0/3.16/_applications.scss | 1 + common/gtk-3.0/3.16/gtk-contained-solid.css | 3 ++- common/gtk-3.0/3.16/gtk-contained.css | 3 ++- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common/gtk-3.0/3.14/_applications.scss b/common/gtk-3.0/3.14/_applications.scss index 6bd23fb..c5b999a 100644 --- a/common/gtk-3.0/3.14/_applications.scss +++ b/common/gtk-3.0/3.14/_applications.scss @@ -82,6 +82,7 @@ NautilusCanvasViewContainer.view .entry { border-radius: 3px; } .nautilus-desktop.nautilus-canvas-item { color: $selected_fg_color; + text-shadow: 1px 1px transparentize(black, 0.4); &:active { color: $fg_color; } &:selected { color: $selected_fg_color; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 0eb9895..bc58065 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -2414,7 +2414,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { border-radius: 2px; } .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { - color: #ffffff; } + color: #ffffff; + text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { color: #5c616c; } .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 157ebb8..2d0e4ad 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -2414,7 +2414,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { border-radius: 2px; } .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { - color: #ffffff; } + color: #ffffff; + text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { color: #5c616c; } .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss index 6c41b73..32894a7 100644 --- a/common/gtk-3.0/3.16/_applications.scss +++ b/common/gtk-3.0/3.16/_applications.scss @@ -82,6 +82,7 @@ NautilusCanvasViewContainer.view .entry { border-radius: 3px; } .nautilus-desktop.nautilus-canvas-item { color: $selected_fg_color; + text-shadow: 1px 1px transparentize(black, 0.4); &:active { color: $fg_color; } &:selected { color: $selected_fg_color; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 9d488e1..e625527 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -2323,7 +2323,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { border-radius: 2px; } .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { - color: #ffffff; } + color: #ffffff; + text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { color: #5c616c; } .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 4289ee0..c2e170a 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -2323,7 +2323,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { border-radius: 2px; } .nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item { - color: #ffffff; } + color: #ffffff; + text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } .nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active { color: #5c616c; } .nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected { From c44fe489dc3f1fe52e679be021c7cc9a6ac9640c Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 8 Jun 2015 19:44:18 +0200 Subject: [PATCH 2/4] gnome-shell: change default font to cantarell --- common/gnome-shell/3.16/_common.scss | 3 +-- common/gnome-shell/3.16/gnome-shell.css | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/gnome-shell/3.16/_common.scss b/common/gnome-shell/3.16/_common.scss index 5f9d48c..08a711c 100644 --- a/common/gnome-shell/3.16/_common.scss +++ b/common/gnome-shell/3.16/_common.scss @@ -25,8 +25,7 @@ $panel-corner-radius: 0px; // Globals // $font-size: 9; -//$font-family: Cantarell, Sans-Serif; -$font-family: Futura Bk bt, Sans-Serif; +$font-family: Cantarell, Sans-Serif; $_bubble_bg_color: opacify($osd_bg_color,0.25); $_bubble_fg_color: $osd_fg_color; $_bubble_borders_color: transparentize($osd_fg_color,0.8); diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 76e83a9..8b46878 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -17,7 +17,7 @@ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. */ stage { - font-family: Futura Bk bt, Sans-Serif; + font-family: Cantarell, Sans-Serif; font-size: 9pt; color: #5c616c; } From 15e235278e7d2483806d357d686b32ce281bb771 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 8 Jun 2015 19:48:51 +0200 Subject: [PATCH 3/4] cleanup --- common/gtk-2.0/gtkrc | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc index 2dfebc4..2381a9c 100644 --- a/common/gtk-2.0/gtkrc +++ b/common/gtk-2.0/gtkrc @@ -970,7 +970,6 @@ style "menubar_item" { stretch = TRUE } } - } style "button" { @@ -1014,47 +1013,6 @@ style "button" { } } -#style "button_nohilight" { -# -# xthickness = 4 -# ythickness = 4 -# -# engine "pixmap" { -# -# image { -# function = BOX -# state = NORMAL -# file = "Buttons/button-default-nohilight.png" -# border = { 4, 4, 4, 4 } -# stretch = TRUE -# } -# -# image { -# function = BOX -# state = PRELIGHT -# file = "Buttons/button-prelight-nohilight.png" -# border = { 4, 4, 4, 4 } -# stretch = TRUE -# } -# -# image { -# function = BOX -# state = ACTIVE -# file = "Buttons/button-pressed-nohilight.png" -# border = { 4, 4, 4, 4 } -# stretch = TRUE -# } -# -# image { -# function = BOX -# state = INSENSITIVE -# file = "Buttons/button-insensitive-nohilight.png" -# border = { 4, 4, 4, 4 } -# stretch = TRUE -# } -# } -#} - style "checkbutton" { fg[PRELIGHT] = @text_color @@ -2531,10 +2489,8 @@ widget_class "**" style "combo widget_class "*HandleBox" style "toolbar" widget_class "***" style "treeview_header" widget_class "**" style "inline_toolbar" -#widget_class "***" style "button_nohilight" widget_class "**" style "combobox_entry" widget_class "**" style "combobox_entry_button" -#widget_class "**" style "button_nohilight" widget_class "***" style "notebook_viewport" # Entries in notebooks draw with notebook's base color, but not if there's From 697b2c390d6b68831b02ba6b8b1491ab9c5970b1 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 8 Jun 2015 20:00:25 +0200 Subject: [PATCH 4/4] gtk2: add focus line fix #48 --- common/gtk-2.0/assets.svg | 17 +++++++++++++---- common/gtk-2.0/assets.txt | 1 + common/gtk-2.0/assets/focus-line.png | Bin 0 -> 165 bytes common/gtk-2.0/gtkrc | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 common/gtk-2.0/assets/focus-line.png diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index c20d97c..5918863 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,12 +565,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="478.52624" - inkscape:cy="293.00874" + inkscape:zoom="1" + inkscape:cx="275.83757" + inkscape:cy="331.30343" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" showborder="false" inkscape:window-width="1366" inkscape:window-height="720" @@ -5403,5 +5403,14 @@ id="rect6168-6" style="opacity:1;fill:#d7d8dd;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index 82bf432..9dd86d9 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -118,3 +118,4 @@ tab-right-active inline-toolbar toolbar menubar +focus-line diff --git a/common/gtk-2.0/assets/focus-line.png b/common/gtk-2.0/assets/focus-line.png new file mode 100644 index 0000000000000000000000000000000000000000..0f5ef9d02de396bcf91e9c49990d165c9335cc6c GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=mSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt)QPE{-7_ zGm~w~zuuH$D{0WHc=u|vsgJ}e2?>b}Tt-R8!VGadJh$)mymJAnX7F_Nb6Mw<&;$TD CnJnM{ literal 0 HcmV?d00001 diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc index 2381a9c..d46640e 100644 --- a/common/gtk-2.0/gtkrc +++ b/common/gtk-2.0/gtkrc @@ -471,7 +471,7 @@ style "default" { image { function = FOCUS - file = "assets/null.png" + file = "assets/focus-line.png" border = { 1, 1, 1, 1 } stretch = TRUE }