From 2972de1b747a88a37e0f6e966577c19a4598366f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 23 Aug 2015 13:38:23 +0200 Subject: fix distcheck --- common/Makefile.am | 41 ++++++++++++++++++++++++----------------- extra/Makefile.am | 7 ++----- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 19b2c8a..d6f732a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -246,22 +246,29 @@ endif # ENABLE_XFWM uninstall-local: + +if ENABLE_LIGHT rm -rf $(ithemedir) +endif # ENABLE_LIGHT + +if ENABLE_DARKER + rm -rf $(ithemedarkerdir) +endif # ENABLE_DARKER + +if ENABLE_DARK + rm -rf $(ithemedarkdir) +endif # ENABLE_DARK + - -rmdir -p $(DESTDIR)$(datadir)/themes 2>/dev/null - - -dist-hook: - cp -r \ - cinnamon \ - gnome-shell \ - gtk-2.0 \ - gtk-3.0 \ - metacity-1 \ - unity \ - xfwm4 \ - xfwm4-dark \ - index.theme \ - index.theme-darker \ - index.theme-dark \ - $(distdir) +EXTRA_DIST = $(srcdir)/cinnamon \ + $(srcdir)/gnome-shell \ + $(srcdir)/gtk-2.0 \ + $(srcdir)/gtk-3.0 \ + $(srcdir)/metacity-1 \ + $(srcdir)/unity \ + $(srcdir)/xfce-notify-4.0 \ + $(srcdir)/xfwm4 \ + $(srcdir)/xfwm4-dark \ + $(srcdir)/index.theme \ + $(srcdir)/index.theme-darker \ + $(srcdir)/index.theme-dark diff --git a/extra/Makefile.am b/extra/Makefile.am index 706c601..a21d248 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -1,5 +1,2 @@ -dist-hook: - cp -r \ - Chrome \ - Arc-Plank \ - $(distdir) +EXTRA_DIST = $(srcdir)/Chrome \ + $(srcdir)/Arc-Plank -- cgit v1.2.3 From 6164a6cd168cc0260baa812e5d9246d9493cf27a Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 23 Aug 2015 18:58:39 +0200 Subject: gnome-shell: dynamic topbar extension support --- common/gnome-shell/3.14/gnome-shell.css | 2 ++ common/gnome-shell/3.14/sass/_common.scss | 3 +++ common/gnome-shell/3.16/gnome-shell.css | 3 +++ common/gnome-shell/3.16/sass/_common.scss | 3 +++ 4 files changed, 11 insertions(+) diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 9d3df68..2fbfd7a 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -626,6 +626,8 @@ StScrollBar { height: 2.1em; min-height: 27px; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } + #panel .dynamic-top-bar-white-btn { + border-image: none; } #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 9697050..3949bda 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -801,6 +801,9 @@ StScrollBar { min-height: 27px; border-image: url('common-assets/panel/panel.svg') 1 1 1 1; + // Fix dynamic top bar extension + .dynamic-top-bar-white-btn { border-image: none; } + &.unlock-screen, &.login-screen, &.lock-screen { diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index e2282fe..43abf98 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -591,6 +591,9 @@ StScrollBar { height: 2.1em; min-height: 27px; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } + #panel.dynamic-top-bar-white-btn { + border-image: none; + background-color: rgba(31, 33, 37, 0.95); } #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index cb4815b..3ecc391 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -769,6 +769,9 @@ StScrollBar { min-height: 27px; border-image: url('common-assets/panel/panel.svg') 1 1 1 1; + // Fix dynamic top bar extension + &.dynamic-top-bar-white-btn { border-image: none; } + &.unlock-screen, &.login-screen, &.lock-screen { -- cgit v1.2.3 From 776b2c1ce55c0a865c6abf2cd12464301776f680 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 23 Aug 2015 18:59:34 +0200 Subject: fix uninstall --- common/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index d6f732a..6e40e8f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -246,10 +246,7 @@ endif # ENABLE_XFWM uninstall-local: - -if ENABLE_LIGHT rm -rf $(ithemedir) -endif # ENABLE_LIGHT if ENABLE_DARKER rm -rf $(ithemedarkerdir) -- cgit v1.2.3 From 6258307032baae39d643214eccb52571f300de01 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 24 Aug 2015 14:11:29 +0200 Subject: gnome-shell: make notification banners light --- common/gnome-shell/3.16/gnome-shell.css | 59 ++++++++++++++++--------------- common/gnome-shell/3.16/sass/_common.scss | 20 ++++++----- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 43abf98..5521b5b 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -25,70 +25,74 @@ stage { min-height: 20px; padding: 5px 32px; transition-duration: 0; - border-radius: 2px; + border-radius: 2px; } + +.button, .notification-banner .notification-button, +.notification-banner:hover .notification-button, +.notification-banner:focus .notification-button, .hotplug-notification-item { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; } - .button:focus { + .button:focus, .notification-banner .notification-button:focus, + .hotplug-notification-item:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } - .button:hover { + .button:hover, .notification-banner .notification-button:hover, + .hotplug-notification-item:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } - .button:hover:focus { + .button:hover:focus, .notification-banner .notification-button:hover:focus, + .hotplug-notification-item:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5294E2; background-color: #fbfbfc; border: 1px solid #5294E2; } - .button:active, .button:active:focus { + .button:active, .notification-banner .notification-button:active, + .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus, + .hotplug-notification-item:active:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; background-color: #5294E2; border: 1px solid #5294E2; } - .button:insensitive { + .button:insensitive, .notification-banner .notification-button:insensitive, + .hotplug-notification-item:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(251, 251, 252, 0.55); } -.modal-dialog-button-box .button, .notification-banner .notification-button, -.notification-banner:hover .notification-button, -.notification-banner:focus .notification-button, .hotplug-notification-item { +.modal-dialog-button-box .button { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.3); } - .modal-dialog-button-box .button:hover, .notification-banner .notification-button:hover, - .hotplug-notification-item:hover { + .modal-dialog-button-box .button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; border: 1px solid #5294E2; background-color: rgba(0, 0, 0, 0.3); } - .modal-dialog-button-box .button:focus, .notification-banner .notification-button:focus, - .hotplug-notification-item:focus { + .modal-dialog-button-box .button:focus { color: #5294E2; } - .modal-dialog-button-box .button:active, .notification-banner .notification-button:active, - .hotplug-notification-item:active { + .modal-dialog-button-box .button:active { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } - .modal-dialog-button-box .button:insensitive, .notification-banner .notification-button:insensitive, - .hotplug-notification-item:insensitive { + .modal-dialog-button-box .button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #555a62; @@ -592,8 +596,7 @@ StScrollBar { min-height: 27px; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } #panel.dynamic-top-bar-white-btn { - border-image: none; - background-color: rgba(31, 33, 37, 0.95); } + border-image: none; } #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { @@ -1391,10 +1394,10 @@ StScrollBar { width: 34em; margin: 5px; padding: 10px; - color: #BAC3CF; + color: #5c616c; background-color: transparent; border: 1px solid transparent; - border-image: url("common-assets/misc/bg.svg") 9 9 9 9; } + border-image: url("light-assets/menu/menu.svg") 9 9 9 9; } .notification-banner .notification-icon, .notification-banner:hover .notification-icon, .notification-banner:focus .notification-icon { @@ -1435,7 +1438,7 @@ StScrollBar { margin: 5px; } .chat-log-message { - color: #BAC3CF; } + color: #5c616c; } .chat-new-group { padding-top: 1em; } @@ -1448,13 +1451,13 @@ StScrollBar { StEntry.chat-response { box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + color: #5c616c; + background-color: #ffffff; + border: 1px solid #cfd6e6; } StEntry.chat-response:focus { box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #BAC3CF; - background-color: rgba(0, 0, 0, 0.2); + color: #5c616c; + background-color: #ffffff; border: 1px solid #5294E2; } .chat-sent { @@ -1468,7 +1471,7 @@ StEntry.chat-response { padding-left: 4px; font-size: 9pt; font-weight: bold; - color: rgba(186, 195, 207, 0.6); } + color: rgba(92, 97, 108, 0.6); } .chat-meta-message:rtl { padding-left: 0; padding-right: 4px; } diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 3ecc391..a8c8e00 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -53,6 +53,10 @@ stage { transition-duration: 0; border-radius: 2px; + @extend %button; +} + +%button { @include button(normal); &:focus { @include button(focus); } @@ -1736,10 +1740,10 @@ StScrollBar { width: 34em; margin: 5px; padding: 10px; - color: $osd_fg_color; + color: $fg_color; background-color: transparent; border: 1px solid transparent; - border-image: url("common-assets/misc/bg.svg") 9 9 9 9; + border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9; .notification-icon { padding: 5px; } @@ -1754,7 +1758,7 @@ StScrollBar { } .notification-button { padding: 4px 4px 5px; - @extend %osd_button; + @extend %button; &:first-child, &:last-child { border-radius: 2px; } } @@ -1765,7 +1769,7 @@ StScrollBar { // Chat Bubbles .chat-body { spacing: 5px; } .chat-response { margin: 5px; } -.chat-log-message { color: $osd_fg_color; } +.chat-log-message { color: $fg_color; } .chat-new-group { padding-top: 1em; } .chat-received { padding-left: 4px; @@ -1774,9 +1778,9 @@ StScrollBar { } StEntry.chat-response { - @include entry(osd); + @include entry(normal); - &:focus { @include entry(osd-focus); } + &:focus { @include entry(focus); } } .chat-sent { @@ -1790,7 +1794,7 @@ StEntry.chat-response { padding-left: 4px; font-size: 9pt; font-weight: bold; - color: transparentize($osd_fg_color, 0.4); + color: transparentize($fg_color, 0.4); &:rtl { padding-left: 0; padding-right: 4px; } } @@ -1805,7 +1809,7 @@ StEntry.chat-response { .hotplug-notification-item { padding: 2px 10px; - @extend %osd_button; + @extend %button; &:focus { padding: 2px 10px; } } -- cgit v1.2.3 From 3f30c8d736ddabea21f1abd3d5ece85a996e924c Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 24 Aug 2015 19:37:32 +0200 Subject: gnome-shell: reset entry box-shadow differently to avoid crashes --- common/gnome-shell/3.14/gnome-shell.css | 80 +++++++++++++++--------------- common/gnome-shell/3.14/sass/_drawing.scss | 9 +++- common/gnome-shell/3.16/gnome-shell.css | 73 ++++++++++++--------------- common/gnome-shell/3.16/sass/_common.scss | 6 --- common/gnome-shell/3.16/sass/_drawing.scss | 9 +++- 5 files changed, 85 insertions(+), 92 deletions(-) diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 2fbfd7a..6478eb4 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -39,37 +39,37 @@ stage { border-radius: 2px; background-gradient-direction: none !important; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; } .popup-menu .modal-dialog-button:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } .popup-menu .modal-dialog-button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } .popup-menu .modal-dialog-button:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5294E2; background-color: #fbfbfc; border: 1px solid #5294E2; } .popup-menu .modal-dialog-button:active, .popup-menu .modal-dialog-button:active:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; border: 1px solid #5294E2; } .popup-menu .modal-dialog-button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(251, 251, 252, 0.55); } @@ -90,7 +90,7 @@ stage { transition-duration: 0; border-radius: 2px; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.3); } @@ -99,7 +99,7 @@ stage { .hotplug-resident-eject-button:hover, .modal-dialog-button:hover, .modal-dialog-button-box .button:hover, .notification-button:hover, .notification-icon-button:hover, .hotplug-resident-mount:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid #5294E2; background-color: rgba(0, 0, 0, 0.3); } @@ -113,7 +113,7 @@ stage { .hotplug-resident-eject-button:active, .modal-dialog-button:active, .modal-dialog-button-box .button:active, .notification-button:active, .notification-icon-button:active, .hotplug-resident-mount:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } @@ -122,7 +122,7 @@ stage { .hotplug-resident-eject-button:insensitive, .modal-dialog-button:insensitive, .modal-dialog-button-box .button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .hotplug-resident-mount:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #555a62; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.15); } @@ -136,20 +136,20 @@ StEntry { transition-duration: 300ms; border-radius: 20px; background-gradient-direction: none !important; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } StEntry:focus, StEntry:hover { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } StEntry:insensitive { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); background-color: #fbfbfb; - border-color: 1px solid #e0e4ee; } + border-color: 1px solid #e0e4ee; + box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.1); } StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; @@ -1282,7 +1282,7 @@ StScrollBar { border-color: #5294E2; } .app-view-control:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } @@ -1492,20 +1492,20 @@ StScrollBar { padding-left: 6px; } .summary-source-button .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.3); } .summary-source-button:hover .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid #5294E2; background-color: rgba(0, 0, 0, 0.3); } .summary-source-button:focus .summary-source, .summary-source-button:selected .summary-source { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } @@ -1561,15 +1561,15 @@ StScrollBar { .notification StEntry { padding: 7px; caret-color: #BAC3CF; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.4); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:focus { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .secondary-icon { icon-size: 1.09em; } @@ -1594,15 +1594,15 @@ StScrollBar { StEntry.chat-response { padding: 7px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.4); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } StEntry.chat-response:focus { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .chat-sent { padding-left: 18pt; @@ -1688,25 +1688,25 @@ StEntry.chat-response { box-shadow: none; background-gradient-direction: none; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.3); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid #5294E2; background-color: rgba(0, 0, 0, 0.3); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .keyboard-key:grayed { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #555a62; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.15); } @@ -1782,25 +1782,25 @@ StEntry.chat-response { padding: 3px 18px; } .login-dialog .modal-dialog-button:default { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; border: 1px solid #5294E2; } .login-dialog .modal-dialog-button:default:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(251, 251, 252, 0.55); } @@ -2007,15 +2007,15 @@ StEntry.chat-response { .lg-dialog StEntry { selection-background-color: #5294E2; selected-color: #ffffff; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.4); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog StEntry:focus { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog .shell-link { color: #2679db; } diff --git a/common/gnome-shell/3.14/sass/_drawing.scss b/common/gnome-shell/3.14/sass/_drawing.scss index 03b9f15..5ab1463 100644 --- a/common/gnome-shell/3.14/sass/_drawing.scss +++ b/common/gnome-shell/3.14/sass/_drawing.scss @@ -15,42 +15,47 @@ // Entries drawing function // //@extend %reset_style; - box-shadow: inset 0 0 transparentize($base_color, 1); @if $t==normal { color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); } @if $t==focus { color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); } @if $t==insensitive { color: $insensitive_fg_color; background-color: mix($entry_bg, $bg_color, 55%); border-color: 1px solid mix($entry_border, $bg_color, 55%); + box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9); } @if $t==osd { color: $osd_fg_color; background-color: transparentize(black, 0.8); border: 1px solid transparentize(black, 0.6); + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-focus { color: $osd_fg_color; background-color: transparentize(black, 0.8); border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-insensitive { color: $osd_insensitive_fg_color; background-color: transparentize(black, 0.9); border-color: 1px solid transparentize(black, 0.6); + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } } @@ -63,7 +68,7 @@ //@extend %reset_style; text-shadow: 0 1px transparentize($base_color, 1); - box-shadow: inset 0 0 transparentize($base_color, 1); + box-shadow: inset 0 0 black; @if $t==normal { // diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 5521b5b..4dcd04c 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -31,28 +31,28 @@ stage { .notification-banner:hover .notification-button, .notification-banner:focus .notification-button, .hotplug-notification-item { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; } .button:focus, .notification-banner .notification-button:focus, .hotplug-notification-item:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } .button:hover, .notification-banner .notification-button:hover, .hotplug-notification-item:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } .button:hover:focus, .notification-banner .notification-button:hover:focus, .hotplug-notification-item:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5294E2; background-color: #fbfbfc; border: 1px solid #5294E2; } @@ -60,27 +60,27 @@ stage { .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus, .hotplug-notification-item:active:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; border: 1px solid #5294E2; } .button:insensitive, .notification-banner .notification-button:insensitive, .hotplug-notification-item:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(251, 251, 252, 0.55); } .modal-dialog-button-box .button { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.3); } .modal-dialog-button-box .button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid #5294E2; background-color: rgba(0, 0, 0, 0.3); } @@ -88,13 +88,13 @@ stage { color: #5294E2; } .modal-dialog-button-box .button:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .modal-dialog-button-box .button:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #555a62; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.15); } @@ -106,20 +106,20 @@ StEntry { selected-color: #ffffff; transition-duration: 300ms; border-radius: 20px; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; - border: 1px solid #cfd6e6; } + border: 1px solid #cfd6e6; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } StEntry:focus, StEntry:hover { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.1); } StEntry:insensitive { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: rgba(92, 97, 108, 0.55); background-color: #fbfbfb; - border-color: 1px solid #e0e4ee; } + border-color: 1px solid #e0e4ee; + box-shadow: inset 0 2px 4px rgba(251, 251, 251, 0.1); } StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; @@ -768,7 +768,7 @@ StScrollBar { .world-clocks-button:focus, .message-list-section-title:hover, .message-list-section-title:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } @@ -776,7 +776,7 @@ StScrollBar { .world-clocks-button:active, .message-list-section-title:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; border: 1px solid #5294E2; } @@ -1245,7 +1245,7 @@ StScrollBar { border-color: #5294E2; } .app-view-control:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } @@ -1449,17 +1449,6 @@ StScrollBar { padding-left: 0px; padding-right: 4px; } -StEntry.chat-response { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #5c616c; - background-color: #ffffff; - border: 1px solid #cfd6e6; } - StEntry.chat-response:focus { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); - color: #5c616c; - background-color: #ffffff; - border: 1px solid #5294E2; } - .chat-sent { padding-left: 18pt; color: #5294E2; } @@ -1573,25 +1562,25 @@ StEntry.chat-response { border-radius: 3px; box-shadow: none; text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.3); } .keyboard-key:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #BAC3CF; border: 1px solid #5294E2; background-color: rgba(0, 0, 0, 0.3); } .keyboard-key:active, .keyboard-key:checked { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; border: 1px solid #5294E2; background-color: #5294E2; } .keyboard-key:grayed { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #555a62; border: 1px solid rgba(0, 0, 0, 0.45); background-color: rgba(0, 0, 0, 0.15); } @@ -1667,25 +1656,25 @@ StEntry.chat-response { padding: 3px 18px; } .login-dialog .modal-dialog-button:default { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; } .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; } .login-dialog .modal-dialog-button:default:active { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: #ffffff; background-color: #5294E2; border: 1px solid #5294E2; } .login-dialog .modal-dialog-button:default:insensitive { text-shadow: 0 1px rgba(255, 255, 255, 0); - box-shadow: inset 0 0 rgba(255, 255, 255, 0); + box-shadow: inset 0 0 black; color: rgba(92, 97, 108, 0.55); border: 1px solid rgba(207, 214, 230, 0.55); background-color: rgba(251, 251, 252, 0.55); } @@ -1892,15 +1881,15 @@ StEntry.chat-response { .lg-dialog StEntry { selection-background-color: #5294E2; selected-color: #ffffff; - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid rgba(0, 0, 0, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.4); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog StEntry:focus { - box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); - border: 1px solid #5294E2; } + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .lg-dialog .shell-link { color: #2679db; } diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index a8c8e00..b25bc4c 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -1777,12 +1777,6 @@ StScrollBar { &:rtl { padding-left: 0px; padding-right: 4px; } } -StEntry.chat-response { - @include entry(normal); - - &:focus { @include entry(focus); } -} - .chat-sent { padding-left: 18pt; color: $selected_bg_color; diff --git a/common/gnome-shell/3.16/sass/_drawing.scss b/common/gnome-shell/3.16/sass/_drawing.scss index 03b9f15..5ab1463 100644 --- a/common/gnome-shell/3.16/sass/_drawing.scss +++ b/common/gnome-shell/3.16/sass/_drawing.scss @@ -15,42 +15,47 @@ // Entries drawing function // //@extend %reset_style; - box-shadow: inset 0 0 transparentize($base_color, 1); @if $t==normal { color: $text_color; background-color: $entry_bg; border: 1px solid $entry_border; + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); } @if $t==focus { color: $fg_color; background-color: $entry_bg; border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.9); } @if $t==insensitive { color: $insensitive_fg_color; background-color: mix($entry_bg, $bg_color, 55%); border-color: 1px solid mix($entry_border, $bg_color, 55%); + box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.9); } @if $t==osd { color: $osd_fg_color; background-color: transparentize(black, 0.8); border: 1px solid transparentize(black, 0.6); + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-focus { color: $osd_fg_color; background-color: transparentize(black, 0.8); border: 1px solid $selected_bg_color; + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @if $t==osd-insensitive { color: $osd_insensitive_fg_color; background-color: transparentize(black, 0.9); border-color: 1px solid transparentize(black, 0.6); + box-shadow: inset 0 2px 4px transparentize(black, 0.95); } } @@ -63,7 +68,7 @@ //@extend %reset_style; text-shadow: 0 1px transparentize($base_color, 1); - box-shadow: inset 0 0 transparentize($base_color, 1); + box-shadow: inset 0 0 black; @if $t==normal { // -- cgit v1.2.3 From fa43da15f2cc2c34ffe231d2d566bc691d7ccaf8 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 26 Aug 2015 13:08:42 +0200 Subject: make textboxes less rounded --- common/cinnamon/cinnamon.css | 8 +- common/cinnamon/sass/_common.scss | 8 +- common/gnome-shell/3.14/gnome-shell.css | 4 +- common/gnome-shell/3.14/sass/_common.scss | 4 +- common/gnome-shell/3.16/gnome-shell.css | 4 +- common/gnome-shell/3.16/sass/_common.scss | 4 +- common/gtk-2.0/assets-dark.svg | 381 ++++++++++----------- .../assets-dark/combo-entry-focus-notebook-rtl.png | Bin 283 -> 286 bytes .../assets-dark/combo-entry-focus-notebook.png | Bin 269 -> 298 bytes .../gtk-2.0/assets-dark/combo-entry-focus-rtl.png | Bin 283 -> 283 bytes common/gtk-2.0/assets-dark/combo-entry-focus.png | Bin 268 -> 290 bytes .../combo-entry-insensitive-notebook-rtl.png | Bin 236 -> 248 bytes .../combo-entry-insensitive-notebook.png | Bin 231 -> 243 bytes .../assets-dark/combo-entry-insensitive-rtl.png | Bin 234 -> 251 bytes .../assets-dark/combo-entry-insensitive.png | Bin 232 -> 249 bytes .../assets-dark/combo-entry-notebook-rtl.png | Bin 255 -> 283 bytes .../gtk-2.0/assets-dark/combo-entry-notebook.png | Bin 247 -> 289 bytes common/gtk-2.0/assets-dark/combo-entry-rtl.png | Bin 264 -> 291 bytes common/gtk-2.0/assets-dark/combo-entry.png | Bin 244 -> 293 bytes .../assets-dark/entry-border-active-bg-solid.png | Bin 839 -> 372 bytes .../gtk-2.0/assets-dark/entry-border-active-bg.png | Bin 918 -> 400 bytes .../gtk-2.0/assets-dark/entry-border-bg-solid.png | Bin 690 -> 326 bytes common/gtk-2.0/assets-dark/entry-border-bg.png | Bin 818 -> 374 bytes .../assets-dark/entry-border-disabled-bg.png | Bin 616 -> 302 bytes .../notebook-entry-border-active-bg.png | Bin 927 -> 410 bytes .../assets-dark/notebook-entry-border-bg.png | Bin 763 -> 356 bytes .../notebook-entry-border-disabled-bg.png | Bin 592 -> 288 bytes .../assets-dark/toolbar-entry-border-active-bg.png | Bin 934 -> 409 bytes .../assets-dark/toolbar-entry-border-bg.png | Bin 815 -> 352 bytes .../toolbar-entry-border-disabled-bg.png | Bin 693 -> 324 bytes common/gtk-2.0/assets.svg | 364 ++++++++++---------- .../assets/combo-entry-focus-notebook-rtl.png | Bin 279 -> 287 bytes .../gtk-2.0/assets/combo-entry-focus-notebook.png | Bin 275 -> 287 bytes common/gtk-2.0/assets/combo-entry-focus-rtl.png | Bin 281 -> 287 bytes common/gtk-2.0/assets/combo-entry-focus.png | Bin 277 -> 293 bytes .../combo-entry-insensitive-notebook-rtl.png | Bin 246 -> 252 bytes .../assets/combo-entry-insensitive-notebook.png | Bin 238 -> 246 bytes .../gtk-2.0/assets/combo-entry-insensitive-rtl.png | Bin 249 -> 259 bytes common/gtk-2.0/assets/combo-entry-insensitive.png | Bin 226 -> 256 bytes common/gtk-2.0/assets/combo-entry-notebook-rtl.png | Bin 270 -> 279 bytes common/gtk-2.0/assets/combo-entry-notebook.png | Bin 247 -> 276 bytes common/gtk-2.0/assets/combo-entry-rtl.png | Bin 271 -> 287 bytes common/gtk-2.0/assets/combo-entry.png | Bin 250 -> 289 bytes .../assets/entry-border-active-bg-solid.png | Bin 807 -> 364 bytes common/gtk-2.0/assets/entry-border-active-bg.png | Bin 905 -> 398 bytes common/gtk-2.0/assets/entry-border-bg-solid.png | Bin 702 -> 339 bytes common/gtk-2.0/assets/entry-border-bg.png | Bin 826 -> 368 bytes common/gtk-2.0/assets/entry-border-disabled-bg.png | Bin 618 -> 302 bytes .../assets/notebook-entry-border-active-bg.png | Bin 869 -> 397 bytes common/gtk-2.0/assets/notebook-entry-border-bg.png | Bin 805 -> 354 bytes .../assets/notebook-entry-border-disabled-bg.png | Bin 647 -> 307 bytes .../assets/toolbar-entry-border-active-bg.png | Bin 888 -> 391 bytes common/gtk-2.0/assets/toolbar-entry-border-bg.png | Bin 789 -> 366 bytes .../assets/toolbar-entry-border-disabled-bg.png | Bin 667 -> 321 bytes .../toolbar-entry-border-active-bg-dark.png | Bin 934 -> 409 bytes .../toolbar-entry-border-active-bg.png | Bin 888 -> 391 bytes .../toolbar-entry-border-bg-dark.png | Bin 815 -> 352 bytes .../menubar-toolbar/toolbar-entry-border-bg.png | Bin 789 -> 366 bytes .../toolbar-entry-border-disabled-bg-dark.png | Bin 693 -> 324 bytes .../toolbar-entry-border-disabled-bg.png | Bin 667 -> 321 bytes common/gtk-3.0/3.14/gtk-contained-dark.css | 14 +- common/gtk-3.0/3.14/gtk-contained-darker.css | 14 +- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 14 +- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 14 +- common/gtk-3.0/3.14/gtk-contained-solid.css | 14 +- common/gtk-3.0/3.14/gtk-contained.css | 14 +- common/gtk-3.0/3.14/sass/_applications.scss | 10 +- common/gtk-3.0/3.14/sass/_common.scss | 4 +- common/gtk-3.0/3.16/gtk-contained-dark.css | 4 +- common/gtk-3.0/3.16/gtk-contained-darker.css | 4 +- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 4 +- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 4 +- common/gtk-3.0/3.16/gtk-contained-solid.css | 4 +- common/gtk-3.0/3.16/gtk-contained.css | 4 +- common/gtk-3.0/3.16/sass/_applications.scss | 10 +- common/gtk-3.0/3.16/sass/_common.scss | 4 +- 76 files changed, 454 insertions(+), 459 deletions(-) diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index 3e3b65b..74bda1e 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -85,7 +85,7 @@ stage { selection-background-color: #5294E2; selected-color: #ffffff; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #5c616c; background-color: #ffffff; @@ -112,7 +112,7 @@ stage { selection-background-color: #5294E2; selected-color: #ffffff; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; box-shadow: inset 0 0 rgba(255, 255, 255, 0); color: #BAC3CF; background-color: rgba(0, 0, 0, 0.2); @@ -229,7 +229,7 @@ StScrollBar { color: #5294e2; } #Tooltip { - border-radius: l3px; + border-radius: 3px; padding: 5px 12px; background-color: rgba(42, 44, 51, 0.95); color: #BAC3CF; @@ -740,7 +740,7 @@ StScrollBar { .run-dialog-entry { width: 21em; padding: 7px; - border-radius: 20px; + border-radius: 3px; caret-color: #BAC3CF; selected-color: #ffffff; selection-background-color: #5294E2; diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index 6f3d5ad..2f0bbe4 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -67,7 +67,7 @@ stage { selection-background-color: $selected_bg_color; selected-color: $selected_fg_color; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; @include entry(normal); @@ -88,7 +88,7 @@ stage { selection-background-color: $selected_bg_color; selected-color: $selected_fg_color; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; @include entry(osd); @@ -234,7 +234,7 @@ StScrollBar { // Tooltip // #Tooltip { - border-radius: l3px; + border-radius: 3px; padding: 5px 12px; background-color: $osd_bg_color; color: $osd_fg_color; @@ -899,7 +899,7 @@ StScrollBar { &-entry { width: 21em; padding: 7px; - border-radius: 20px; + border-radius: 3px; caret-color: $osd_fg_color; selected-color: $selected_fg_color; selection-background-color: $selected_bg_color; diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 6478eb4..f7edf8b 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -134,7 +134,7 @@ StEntry { selection-background-color: #5294E2; selected-color: #ffffff; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; background-gradient-direction: none !important; color: #5c616c; background-color: #ffffff; @@ -1034,7 +1034,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 20px; + border-radius: 3px; border: 1px solid rgba(0, 0, 0, 0.25); background-color: rgba(255, 255, 255, 0.9); } .search-entry:focus { diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 3949bda..aee547e 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -110,7 +110,7 @@ StEntry { selection-background-color: $selected_bg_color; selected-color: $selected_fg_color; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; background-gradient-direction: none !important; @include entry(normal); @@ -1307,7 +1307,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 20px; + border-radius: 3px; border: 1px solid transparentize(black, 0.75); background-color: transparentize($entry_bg, 0.1); diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 4dcd04c..49c987b 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -105,7 +105,7 @@ StEntry { selection-background-color: #5294E2; selected-color: #ffffff; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; color: #5c616c; background-color: #ffffff; border: 1px solid #cfd6e6; @@ -1051,7 +1051,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 20px; + border-radius: 3px; border: 1px solid rgba(0, 0, 0, 0.25); background-color: rgba(255, 255, 255, 0.9); } .search-entry:focus { diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index b25bc4c..36f414b 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -84,7 +84,7 @@ StEntry { selection-background-color: $selected_bg_color; selected-color: $selected_fg_color; transition-duration: 300ms; - border-radius: 20px; + border-radius: 3px; @include entry(normal); @@ -1327,7 +1327,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 20px; + border-radius: 3px; border: 1px solid transparentize(black, 0.75); background-color: transparentize($entry_bg, 0.1); diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index 2e97930..c383e92 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,11 +565,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="16" - inkscape:cx="405.59481" - inkscape:cy="392.29239" + inkscape:zoom="4" + inkscape:cx="0.57764109" + inkscape:cy="348.64275" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer3" showgrid="false" showborder="false" inkscape:window-width="1366" @@ -581,7 +581,7 @@ inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:snap-global="true" - showguides="false" + showguides="true" inkscape:guide-bbox="true" inkscape:bbox-nodes="true" inkscape:object-nodes="true" @@ -626,8 +626,7 @@ id="layer3" inkscape:label="superbackdrop" style="display:inline" - transform="translate(7,283.63782)" - sodipodi:insensitive="true"> + transform="translate(7,283.63782)"> + ry="2.5" /> + ry="3" /> @@ -1821,23 +1820,23 @@ + rx="2.5" + ry="2.5" /> + rx="3.0000002" + ry="3" /> + ry="3" /> @@ -1901,23 +1900,23 @@ + rx="2.5" + ry="2.5" /> + rx="3.0000002" + ry="3" /> + ry="3" /> @@ -1992,23 +1991,23 @@ + rx="2.5" + ry="2.5" /> + rx="3" + ry="3" /> + ry="3" /> @@ -2075,23 +2074,23 @@ + rx="2.5" + ry="2.5" /> + rx="3" + ry="3" /> + ry="3" /> @@ -2300,23 +2299,23 @@ + rx="2.5" + ry="2.5" /> + rx="3" + ry="3" /> + ry="3" /> @@ -2383,23 +2382,23 @@ + rx="2.5" + ry="2.5" /> + rx="3" + ry="3" /> + ry="3" /> @@ -5004,23 +5003,23 @@ + rx="2.5" + ry="2.5" /> + rx="3.0000002" + ry="3" /> + d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 113.5 67 L 114.5 67 L 131.5 67 L 132.5 67 C 133.885 67 135 68.115 135 69.5 L 135 86.5 C 135 87.885 133.885 89 132.5 89 L 131.5 89 L 114.5 89 L 113.5 89 C 112.115 89 111 87.885 111 86.5 L 111 69.5 C 111 68.115 112.115 67 113.5 67 z " + transform="translate(-113,-345.63782)" + id="rect9321-3-7" /> + ry="3" /> + d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 147.5 67 L 148.5 67 L 165.5 67 L 166.5 67 C 167.885 67 169 68.115 169 69.5 L 169 86.5 C 169 87.885 167.885 89 166.5 89 L 165.5 89 L 148.5 89 L 147.5 89 C 146.115 89 145 87.885 145 86.5 L 145 69.5 C 145 68.115 146.115 67 147.5 67 z " + transform="translate(-113,-345.63782)" + id="rect9321-0-2-2" /> @@ -5074,22 +5073,21 @@ inkscape:label="#g9335" clip-path="url(#clipPath5131)"> + ry="3" /> diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png index 9f7659c..aafb94a 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png index 6a35867..2bdbd03 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-notebook.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png index b59479a..867bd35 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-focus-rtl.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-focus.png b/common/gtk-2.0/assets-dark/combo-entry-focus.png index 344254c..20eb8c4 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-focus.png and b/common/gtk-2.0/assets-dark/combo-entry-focus.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png index 6b1caa3..cee0032 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png index 8f0a28d..8fe24dc 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png index 0320a05..0ac56e4 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-insensitive.png b/common/gtk-2.0/assets-dark/combo-entry-insensitive.png index bfdced0..9d8be35 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-insensitive.png and b/common/gtk-2.0/assets-dark/combo-entry-insensitive.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png index 0715513..939e10b 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-notebook.png b/common/gtk-2.0/assets-dark/combo-entry-notebook.png index c424720..1dfbe4a 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-notebook.png and b/common/gtk-2.0/assets-dark/combo-entry-notebook.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry-rtl.png b/common/gtk-2.0/assets-dark/combo-entry-rtl.png index dd89a2c..e48c045 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry-rtl.png and b/common/gtk-2.0/assets-dark/combo-entry-rtl.png differ diff --git a/common/gtk-2.0/assets-dark/combo-entry.png b/common/gtk-2.0/assets-dark/combo-entry.png index 0c9ec42..88ecac3 100644 Binary files a/common/gtk-2.0/assets-dark/combo-entry.png and b/common/gtk-2.0/assets-dark/combo-entry.png differ diff --git a/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png b/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png index b63fd56..ebe2f9f 100644 Binary files a/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png and b/common/gtk-2.0/assets-dark/entry-border-active-bg-solid.png differ diff --git a/common/gtk-2.0/assets-dark/entry-border-active-bg.png b/common/gtk-2.0/assets-dark/entry-border-active-bg.png index eba6d64..d3a0184 100644 Binary files a/common/gtk-2.0/assets-dark/entry-border-active-bg.png and b/common/gtk-2.0/assets-dark/entry-border-active-bg.png differ diff --git a/common/gtk-2.0/assets-dark/entry-border-bg-solid.png b/common/gtk-2.0/assets-dark/entry-border-bg-solid.png index d666f84..356a144 100644 Binary files a/common/gtk-2.0/assets-dark/entry-border-bg-solid.png and b/common/gtk-2.0/assets-dark/entry-border-bg-solid.png differ diff --git a/common/gtk-2.0/assets-dark/entry-border-bg.png b/common/gtk-2.0/assets-dark/entry-border-bg.png index 6a32cae..b4c169e 100644 Binary files a/common/gtk-2.0/assets-dark/entry-border-bg.png and b/common/gtk-2.0/assets-dark/entry-border-bg.png differ diff --git a/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png index e9af0cf..a6b717c 100644 Binary files a/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png and b/common/gtk-2.0/assets-dark/entry-border-disabled-bg.png differ diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png index 4d4188e..820e9ed 100644 Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png and b/common/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png differ diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png index 61b07b4..c31d380 100644 Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png and b/common/gtk-2.0/assets-dark/notebook-entry-border-bg.png differ diff --git a/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png index 4d32e93..e0ea69e 100644 Binary files a/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png and b/common/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png differ diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png index f8ce4d8..f5d30f3 100644 Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png and b/common/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png differ diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png index 3849377..716060a 100644 Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png and b/common/gtk-2.0/assets-dark/toolbar-entry-border-bg.png differ diff --git a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png index 227548c..707df1c 100644 Binary files a/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png and b/common/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png differ diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index 0ea70ce..30a93ac 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,11 +565,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="5.6568542" - inkscape:cx="449.14178" - inkscape:cy="382.90905" + inkscape:zoom="1" + inkscape:cx="83.616238" + inkscape:cy="357.69052" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer3" showgrid="false" showborder="false" inkscape:window-width="1366" @@ -1746,25 +1746,25 @@ id="rect9321-3" style="opacity:1;fill:#f5f6f7;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" /> + ry="2.5" /> + ry="3" /> @@ -1816,23 +1816,23 @@ + rx="2.5" + ry="2.5" /> + inkscape:transform-center-x="-5.0639158" + inkscape:transform-center-y="0.42353316" + rx="3.0000002" + ry="3" /> + ry="3" /> @@ -1896,23 +1896,23 @@ + rx="2.5" + ry="2.5" /> + rx="3.0000002" + ry="3" /> + ry="3" /> @@ -1987,23 +1987,23 @@ + rx="3" + ry="3" /> + ry="3" /> @@ -2070,23 +2070,23 @@ + rx="3" + ry="3" /> + ry="3" /> @@ -2295,23 +2295,23 @@ + rx="3" + ry="3" /> + ry="3" /> @@ -2378,23 +2378,23 @@ + rx="3" + ry="3" /> + ry="3" /> @@ -5049,23 +5049,23 @@ + rx="2.5" + ry="2.5" /> + rx="3.0000002" + ry="3" /> + d="M 110 66 L 110 90 L 136 90 L 136 66 L 110 66 z M 113.5 67 L 114.5 67 L 131.5 67 L 132.5 67 C 133.885 67 135 68.115 135 69.5 L 135 86.5 C 135 87.885 133.885 89 132.5 89 L 131.5 89 L 114.5 89 L 113.5 89 C 112.115 89 111 87.885 111 86.5 L 111 69.5 C 111 68.115 112.115 67 113.5 67 z " + transform="translate(-113,-345.63782)" + id="rect9321-3-7" /> + ry="3" /> + d="M 144 66 L 144 90 L 170 90 L 170 66 L 144 66 z M 147.5 67 L 148.5 67 L 165.5 67 L 166.5 67 C 167.885 67 169 68.115 169 69.5 L 169 86.5 C 169 87.885 167.885 89 166.5 89 L 165.5 89 L 148.5 89 L 147.5 89 C 146.115 89 145 87.885 145 86.5 L 145 69.5 C 145 68.115 146.115 67 147.5 67 z " + transform="translate(-113,-345.63782)" + id="rect9321-0-2-2" /> @@ -5119,22 +5119,21 @@ inkscape:label="#g9335" clip-path="url(#clipPath5131)"> + ry="3" /> diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png index 6f9f3b0..f538ef1 100644 Binary files a/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png differ diff --git a/common/gtk-2.0/assets/combo-entry-focus-notebook.png b/common/gtk-2.0/assets/combo-entry-focus-notebook.png index ecaa70d..02ef5b5 100644 Binary files a/common/gtk-2.0/assets/combo-entry-focus-notebook.png and b/common/gtk-2.0/assets/combo-entry-focus-notebook.png differ diff --git a/common/gtk-2.0/assets/combo-entry-focus-rtl.png b/common/gtk-2.0/assets/combo-entry-focus-rtl.png index 19ec0e4..f59520a 100644 Binary files a/common/gtk-2.0/assets/combo-entry-focus-rtl.png and b/common/gtk-2.0/assets/combo-entry-focus-rtl.png differ diff --git a/common/gtk-2.0/assets/combo-entry-focus.png b/common/gtk-2.0/assets/combo-entry-focus.png index d207b00..4755502 100644 Binary files a/common/gtk-2.0/assets/combo-entry-focus.png and b/common/gtk-2.0/assets/combo-entry-focus.png differ diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png index b491831..7f6fb70 100644 Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png differ diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png b/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png index 6da5a1c..3313b01 100644 Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png and b/common/gtk-2.0/assets/combo-entry-insensitive-notebook.png differ diff --git a/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png b/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png index 82ff427..a9d83a0 100644 Binary files a/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png and b/common/gtk-2.0/assets/combo-entry-insensitive-rtl.png differ diff --git a/common/gtk-2.0/assets/combo-entry-insensitive.png b/common/gtk-2.0/assets/combo-entry-insensitive.png index cee3ce2..4aa5a61 100644 Binary files a/common/gtk-2.0/assets/combo-entry-insensitive.png and b/common/gtk-2.0/assets/combo-entry-insensitive.png differ diff --git a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png index 23c8eaa..10757a6 100644 Binary files a/common/gtk-2.0/assets/combo-entry-notebook-rtl.png and b/common/gtk-2.0/assets/combo-entry-notebook-rtl.png differ diff --git a/common/gtk-2.0/assets/combo-entry-notebook.png b/common/gtk-2.0/assets/combo-entry-notebook.png index 1042b0d..c6cfc73 100644 Binary files a/common/gtk-2.0/assets/combo-entry-notebook.png and b/common/gtk-2.0/assets/combo-entry-notebook.png differ diff --git a/common/gtk-2.0/assets/combo-entry-rtl.png b/common/gtk-2.0/assets/combo-entry-rtl.png index 70ce5dd..74c9b99 100644 Binary files a/common/gtk-2.0/assets/combo-entry-rtl.png and b/common/gtk-2.0/assets/combo-entry-rtl.png differ diff --git a/common/gtk-2.0/assets/combo-entry.png b/common/gtk-2.0/assets/combo-entry.png index c2e0f74..d7c033e 100644 Binary files a/common/gtk-2.0/assets/combo-entry.png and b/common/gtk-2.0/assets/combo-entry.png differ diff --git a/common/gtk-2.0/assets/entry-border-active-bg-solid.png b/common/gtk-2.0/assets/entry-border-active-bg-solid.png index d6127a1..8e53276 100644 Binary files a/common/gtk-2.0/assets/entry-border-active-bg-solid.png and b/common/gtk-2.0/assets/entry-border-active-bg-solid.png differ diff --git a/common/gtk-2.0/assets/entry-border-active-bg.png b/common/gtk-2.0/assets/entry-border-active-bg.png index 1828058..ec36c2d 100644 Binary files a/common/gtk-2.0/assets/entry-border-active-bg.png and b/common/gtk-2.0/assets/entry-border-active-bg.png differ diff --git a/common/gtk-2.0/assets/entry-border-bg-solid.png b/common/gtk-2.0/assets/entry-border-bg-solid.png index 6b49cce..49d349a 100644 Binary files a/common/gtk-2.0/assets/entry-border-bg-solid.png and b/common/gtk-2.0/assets/entry-border-bg-solid.png differ diff --git a/common/gtk-2.0/assets/entry-border-bg.png b/common/gtk-2.0/assets/entry-border-bg.png index 3d9a897..8c48843 100644 Binary files a/common/gtk-2.0/assets/entry-border-bg.png and b/common/gtk-2.0/assets/entry-border-bg.png differ diff --git a/common/gtk-2.0/assets/entry-border-disabled-bg.png b/common/gtk-2.0/assets/entry-border-disabled-bg.png index 42c1552..354eaad 100644 Binary files a/common/gtk-2.0/assets/entry-border-disabled-bg.png and b/common/gtk-2.0/assets/entry-border-disabled-bg.png differ diff --git a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png index d390ded..567833f 100644 Binary files a/common/gtk-2.0/assets/notebook-entry-border-active-bg.png and b/common/gtk-2.0/assets/notebook-entry-border-active-bg.png differ diff --git a/common/gtk-2.0/assets/notebook-entry-border-bg.png b/common/gtk-2.0/assets/notebook-entry-border-bg.png index 8767bc6..e8fbaff 100644 Binary files a/common/gtk-2.0/assets/notebook-entry-border-bg.png and b/common/gtk-2.0/assets/notebook-entry-border-bg.png differ diff --git a/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png index 5733e91..b86093d 100644 Binary files a/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png and b/common/gtk-2.0/assets/notebook-entry-border-disabled-bg.png differ diff --git a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png index c978290..427548a 100644 Binary files a/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png and b/common/gtk-2.0/assets/toolbar-entry-border-active-bg.png differ diff --git a/common/gtk-2.0/assets/toolbar-entry-border-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-bg.png index 1bef4f5..320deb9 100644 Binary files a/common/gtk-2.0/assets/toolbar-entry-border-bg.png and b/common/gtk-2.0/assets/toolbar-entry-border-bg.png differ diff --git a/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png index d5dea4a..512d5bd 100644 Binary files a/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png and b/common/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png differ diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png index f8ce4d8..f5d30f3 100644 Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png differ diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png index c978290..427548a 100644 Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg.png differ diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png index 3849377..716060a 100644 Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg-dark.png differ diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png index 1bef4f5..320deb9 100644 Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png differ diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png index 227548c..707df1c 100644 Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png differ diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png index d5dea4a..512d5bd 100644 Binary files a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png and b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg.png differ diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index eb0bf39..8f006c7 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -141,14 +141,14 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2d3036; background-color: #383c45; background-image: linear-gradient(to bottom, #383c45); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } @@ -2813,15 +2813,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3033,7 +3033,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: rgba(24, 27, 31, 0.97); background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index 6527a56..ca48f53 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -141,14 +141,14 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } @@ -2814,15 +2814,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3034,7 +3034,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: rgba(24, 27, 31, 0.97); background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 178b3af..4dfdc34 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -141,14 +141,14 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2d3036; background-color: #383c45; background-image: linear-gradient(to bottom, #383c45); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } @@ -2813,15 +2813,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3033,7 +3033,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: #181b1f; background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 5ce2657..2e8cc1c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -141,14 +141,14 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } @@ -2814,15 +2814,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3034,7 +3034,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: #181b1f; background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); 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 a804228..9a58fb7 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -141,14 +141,14 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } @@ -2813,15 +2813,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3033,7 +3033,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 89e41ca..ac6e168 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -141,14 +141,14 @@ GtkFlowBox .grid-child { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } @@ -2813,15 +2813,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3033,7 +3033,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index 4889325..cbf5da2 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -243,15 +243,15 @@ GbSearchBox.linked { > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; &:hover { box-shadow: -1px 0 $selected_bg_color; } } > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; &:hover { box-shadow: 1px 0 $selected_bg_color; } } @@ -537,7 +537,7 @@ MarlinViewWindow *:selected:focus { } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; @include entry(header-normal); &:focus { @include entry(header-focus) } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index d9e56c9..40e8cdd 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -213,11 +213,11 @@ GtkFlowBox .grid-child { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms $ease-out-quad; @include entry(normal); - .header-bar & { padding: 6px 11px; } + .header-bar & { padding: 6px; } //&.image { // icons inside the entry // &.left { padding-left: 0; } diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 4819a39..96bd5c9 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -141,14 +141,14 @@ GtkTextView { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2d3036; background-color: #383c45; background-image: linear-gradient(to bottom, #383c45); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 84a241a..6ed598d 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -141,14 +141,14 @@ GtkTextView { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 7a4ae0c..0098fa5 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -141,14 +141,14 @@ GtkTextView { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; border-color: #2d3036; background-color: #383c45; background-image: linear-gradient(to bottom, #383c45); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index f0578bb..de0c7eb 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -141,14 +141,14 @@ GtkTextView { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } 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 75064e1..4674dd0 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -141,14 +141,14 @@ GtkTextView { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 4cea811..42e765d 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -141,14 +141,14 @@ GtkTextView { .entry { border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } .header-bar .entry { - padding: 6px 11px; } + padding: 6px; } .entry.image { padding-left: 3px; padding-right: 3px; } diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index 6e1301c..63eda9c 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -291,15 +291,15 @@ GbSearchBox.linked { > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; &:hover { box-shadow: -1px 0 $selected_bg_color; } } > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; &:hover { box-shadow: 1px 0 $selected_bg_color; } } @@ -585,7 +585,7 @@ MarlinViewWindow *:selected:focus { } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; @include entry(header-normal); &:focus { @include entry(header-focus) } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 68d56d8..cba3a1c 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -213,11 +213,11 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers border: 1px solid; padding: 5px 8px 6px; - border-radius: 15px; + border-radius: 3px; transition: all 200ms $ease-out-quad; @include entry(normal); - .header-bar & { padding: 6px 11px; } + .header-bar & { padding: 6px; } //&.image { // icons inside the entry // &.left { padding-left: 0; } -- cgit v1.2.3 From be56f427f2a18661f91eba8fd29cba39ae02533d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 26 Aug 2015 20:10:02 +0200 Subject: rounded search entries --- common/gnome-shell/3.14/gnome-shell.css | 2 +- common/gnome-shell/3.14/sass/_common.scss | 2 +- common/gnome-shell/3.16/gnome-shell.css | 2 +- common/gnome-shell/3.16/sass/_common.scss | 2 +- common/gtk-3.0/3.14/gtk-contained-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-darker.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 3 +++ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 3 +++ 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.14/sass/_common.scss | 2 ++ common/gtk-3.0/3.16/gtk-contained-dark.css | 13 ++++++++----- common/gtk-3.0/3.16/gtk-contained-darker.css | 13 ++++++++----- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 13 ++++++++----- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 13 ++++++++----- common/gtk-3.0/3.16/gtk-contained-solid.css | 13 ++++++++----- common/gtk-3.0/3.16/gtk-contained.css | 13 ++++++++----- common/gtk-3.0/3.16/sass/_common.scss | 2 ++ 18 files changed, 74 insertions(+), 34 deletions(-) diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index f7edf8b..fd409c3 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -1034,7 +1034,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 3px; + border-radius: 20px; border: 1px solid rgba(0, 0, 0, 0.25); background-color: rgba(255, 255, 255, 0.9); } .search-entry:focus { diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index aee547e..9aee0a1 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -1307,7 +1307,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 3px; + border-radius: 20px; border: 1px solid transparentize(black, 0.75); background-color: transparentize($entry_bg, 0.1); diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 49c987b..eecc3a4 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -1051,7 +1051,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 3px; + border-radius: 20px; border: 1px solid rgba(0, 0, 0, 0.25); background-color: rgba(255, 255, 255, 0.9); } .search-entry:focus { diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 36f414b..2578ae7 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -1327,7 +1327,7 @@ StScrollBar { .search-entry { width: 320px; padding: 7px 9px; - border-radius: 3px; + border-radius: 20px; border: 1px solid transparentize(black, 0.75); background-color: transparentize($entry_bg, 0.1); diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 8f006c7..8b36966 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -257,6 +257,9 @@ GtkFlowBox .grid-child { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index ca48f53..cc4f8fb 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -257,6 +257,9 @@ GtkFlowBox .grid-child { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 4dfdc34..aad9184 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -257,6 +257,9 @@ GtkFlowBox .grid-child { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 2e8cc1c..b913ed9 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -257,6 +257,9 @@ GtkFlowBox .grid-child { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ 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 9a58fb7..ed9c121 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -257,6 +257,9 @@ GtkFlowBox .grid-child { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index ac6e168..9512f1e 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -257,6 +257,9 @@ GtkFlowBox .grid-child { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 40e8cdd..d7ca6fe 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -357,6 +357,8 @@ GtkFlowBox .grid-child { } } +GtkSearchEntry.entry { border-radius: 20px; } + /*********** * Buttons * ***********/ diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 96bd5c9..2730afb 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -257,6 +257,9 @@ GtkTextView { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ @@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: rgba(24, 27, 31, 0.97); background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 6ed598d..3ba01b1 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -257,6 +257,9 @@ GtkTextView { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ @@ -2780,15 +2783,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3000,7 +3003,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: rgba(24, 27, 31, 0.97); background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.87)); diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 0098fa5..2e74a04 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -257,6 +257,9 @@ GtkTextView { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ @@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: #181b1f; background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index de0c7eb..01ed2e9 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -257,6 +257,9 @@ GtkTextView { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ @@ -2780,15 +2783,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -3000,7 +3003,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(207, 218, 231, 0.8); border-color: #181b1f; background-image: linear-gradient(to bottom, rgba(38, 42, 48, 0.9)); 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 4674dd0..e625d6b 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -257,6 +257,9 @@ GtkTextView { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ @@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 42e765d..c8e64db 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -257,6 +257,9 @@ GtkTextView { border-color: rgba(0, 0, 0, 0.4); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } +GtkSearchEntry.entry { + border-radius: 20px; } + /*********** * Buttons * ***********/ @@ -2779,15 +2782,15 @@ GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) { border-left-style: none; - border-radius: 0 14.5px 14.5px 0; - outline-radius: 0 12.5px 12.5px 0; } + border-radius: 0 3px 3px 0; + outline-radius: 0 1px 1px 0; } GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover { box-shadow: -1px 0 #5294E2; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) { border-right-style: none; - border-radius: 14.5px 0 0 14.5px; - outline-radius: 12.5px 0 0 12.5px; } + border-radius: 3px 0 0 3px; + outline-radius: 1px 0 0 1px; } GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover { box-shadow: 1px 0 #5294E2; } @@ -2999,7 +3002,7 @@ MarlinViewWindow *:selected:focus { outline-color: transparent; } .marlin-pathbar.pathbar { - border-radius: 14.5px; + border-radius: 3px; color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index cba3a1c..7049206 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -357,6 +357,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } } +GtkSearchEntry.entry { border-radius: 20px; } + /*********** * Buttons * ***********/ -- cgit v1.2.3 From 454ff7b4900691c52b375bead673117b7c686b2e Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 26 Aug 2015 20:43:27 +0200 Subject: update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4f1d0b1..bb719c9 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell. #####Arc -![alt tag](http://i.imgur.com/fDa94sy.png) +![alt tag](http://i.imgur.com/aRTIvO9.png) #####Arc-Darker -![alt tag](http://i.imgur.com/crDBZzD.png) +![alt tag](http://i.imgur.com/6s8L7fm.png) #####Arc-Dark -![alt tag](http://i.imgur.com/RkIVgJ2.png) +![alt tag](http://i.imgur.com/ZpI1AAf.png) ### Requirements @@ -141,4 +141,4 @@ If you get artifacts like black or invisible backgrounds under Unity, disable ov If you find a bug, please report it at https://github.com/horst3180/arc-theme/issues ### Full Preview -![alt tag](http://i.imgur.com/6SDjAc4.jpg) +![alt tag](http://i.imgur.com/wzneKCh.png) -- cgit v1.2.3 From a6470aa48a32b8d124868a055f249f439bcd5c8e Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 26 Aug 2015 21:09:09 +0200 Subject: bump version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55abb32..5bfec79 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT( [arc-theme], - [20150817], + [20150826], [https://github.com/horst3180/Arc-theme/issues], [arc-theme], [https://github.com/horst3180/Arc-theme], -- cgit v1.2.3 From fc5afcbe1288d47568df3a59300aa1514990178a Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 27 Aug 2015 16:58:55 +0200 Subject: xfce-notify: don't use color variables --- common/xfce-notify-4.0/gtkrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/xfce-notify-4.0/gtkrc b/common/xfce-notify-4.0/gtkrc index 05ed853..2ef8877 100644 --- a/common/xfce-notify-4.0/gtkrc +++ b/common/xfce-notify-4.0/gtkrc @@ -12,11 +12,11 @@ style "notify-window" { style "notify-button" { bg[NORMAL] = "#434652" bg[PRELIGHT] = "#5C6070" - bg[ACTIVE] = @selected_bg_color + bg[ACTIVE] = "#5294E2" fg[NORMAL] = "#BAC3CF" fg[PRELIGHT] = "#BAC3CF" - fg[ACTIVE] = @selected_fg_color + fg[ACTIVE] = "#ffffff" engine "murrine" { gradient_shades = { 1.0, 1.0, 1.0, 1.0 } @@ -27,7 +27,7 @@ style "notify-button" { } style "notify-text" { - GtkWidget::link-color = @link_color + GtkWidget::link-color = "#5294E2" fg[NORMAL] = "#BAC3CF" fg[PRELIGHT] = "#BAC3CF" @@ -49,9 +49,9 @@ style "notify-progressbar" { ythickness = 0 fg[PRELIGHT] = "#000000" - bg[NORMAL] = @selected_bg_color + bg[NORMAL] = "#5294E2" bg[ACTIVE] = "#131417" - bg[SELECTED] = @selected_bg_color + bg[SELECTED] = "#5294E2" engine "murrine" { gradient_shades = { 1.0, 1.0, 1.0, 1.0 } -- cgit v1.2.3 From b811483e7f6fb97afa531a873c73a48f48ef8468 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 27 Aug 2015 20:54:34 +0200 Subject: better readability on insensitive active buttons --- common/gtk-3.0/3.14/gtk-contained-dark.css | 12 ++++++------ common/gtk-3.0/3.14/gtk-contained-darker.css | 12 ++++++------ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 12 ++++++------ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 12 ++++++------ common/gtk-3.0/3.14/gtk-contained-solid.css | 12 ++++++------ common/gtk-3.0/3.14/gtk-contained.css | 12 ++++++------ common/gtk-3.0/3.14/sass/_drawing.scss | 6 +++--- common/gtk-3.0/3.16/gtk-contained-dark.css | 12 ++++++------ common/gtk-3.0/3.16/gtk-contained-darker.css | 12 ++++++------ common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 12 ++++++------ common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 12 ++++++------ common/gtk-3.0/3.16/gtk-contained-solid.css | 12 ++++++------ common/gtk-3.0/3.16/gtk-contained.css | 12 ++++++------ common/gtk-3.0/3.16/sass/_drawing.scss | 6 +++--- 14 files changed, 78 insertions(+), 78 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 8b36966..33af2ea 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index cc4f8fb..907ac95 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index aad9184..17ad721 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index b913ed9..e257d0d 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { 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 ed9c121..544f5b7 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 9512f1e..44ad237 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss index c073126..2cb08e1 100644 --- a/common/gtk-3.0/3.14/sass/_drawing.scss +++ b/common/gtk-3.0/3.14/sass/_drawing.scss @@ -168,9 +168,9 @@ // // insensitive pushed button // - color: transparentize($selected_fg_color, 0.45); - border-color: transparentize($selected_bg_color, 0.45); - background-color: transparentize($selected_bg_color, 0.45); + color: transparentize($selected_fg_color, 0.2); + border-color: transparentize($selected_bg_color, 0.25); + background-color: transparentize($selected_bg_color, 0.25); opacity: 0.6; diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 2730afb..5198944 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 3ba01b1..bf9231f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 2e74a04..8a16555 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index 01ed2e9..9691287 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { 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 e625d6b..3ec8a8c 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index c8e64db..d960ac8 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -319,9 +319,9 @@ GtkSearchEntry.entry { .button:insensitive > GtkLabel { color: inherit; } .button:insensitive:active, .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel { color: inherit; } @@ -547,9 +547,9 @@ GtkSearchEntry.entry { color: inherit; } .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { - color: rgba(255, 255, 255, 0.55); - border-color: rgba(82, 148, 226, 0.55); - background-color: rgba(82, 148, 226, 0.55); + color: rgba(255, 255, 255, 0.8); + border-color: rgba(82, 148, 226, 0.75); + background-color: rgba(82, 148, 226, 0.75); opacity: 0.6; } .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { diff --git a/common/gtk-3.0/3.16/sass/_drawing.scss b/common/gtk-3.0/3.16/sass/_drawing.scss index c073126..2cb08e1 100644 --- a/common/gtk-3.0/3.16/sass/_drawing.scss +++ b/common/gtk-3.0/3.16/sass/_drawing.scss @@ -168,9 +168,9 @@ // // insensitive pushed button // - color: transparentize($selected_fg_color, 0.45); - border-color: transparentize($selected_bg_color, 0.45); - background-color: transparentize($selected_bg_color, 0.45); + color: transparentize($selected_fg_color, 0.2); + border-color: transparentize($selected_bg_color, 0.25); + background-color: transparentize($selected_bg_color, 0.25); opacity: 0.6; -- cgit v1.2.3