diff options
Diffstat (limited to 'common/gtk-3.0/3.18')
-rw-r--r-- | common/gtk-3.0/3.18/gtk-contained-dark.css | 21 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/gtk-contained-darker.css | 21 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/gtk-contained-solid-dark.css | 21 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/gtk-contained-solid-darker.css | 21 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/gtk-contained-solid.css | 21 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/gtk-contained.css | 21 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/sass/_applications.scss | 2 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/sass/_common.scss | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.18/sass/_drawing.scss | 6 |
9 files changed, 80 insertions, 60 deletions
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css index 25a7051..808a3f4 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -148,14 +148,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; } @@ -264,6 +264,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 * ***********/ @@ -323,9 +326,9 @@ GtkTextView { .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; } @@ -551,9 +554,9 @@ GtkTextView { 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 { @@ -3610,7 +3613,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.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css index 0c37ccb..d78b205 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -148,14 +148,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; } @@ -264,6 +264,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 * ***********/ @@ -323,9 +326,9 @@ GtkTextView { .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; } @@ -551,9 +554,9 @@ GtkTextView { 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 { @@ -3611,7 +3614,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.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css index a3a4791..c54fa10 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css @@ -148,14 +148,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; } @@ -264,6 +264,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 * ***********/ @@ -323,9 +326,9 @@ GtkTextView { .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; } @@ -551,9 +554,9 @@ GtkTextView { 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 { @@ -3610,7 +3613,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.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css index 43e7b64..a4bf7f7 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css @@ -148,14 +148,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; } @@ -264,6 +264,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 * ***********/ @@ -323,9 +326,9 @@ GtkTextView { .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; } @@ -551,9 +554,9 @@ GtkTextView { 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 { @@ -3611,7 +3614,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.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css index 3f2f5ed..b22780a 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -148,14 +148,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; } @@ -264,6 +264,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 * ***********/ @@ -323,9 +326,9 @@ GtkTextView { .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; } @@ -551,9 +554,9 @@ GtkTextView { 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 { @@ -3610,7 +3613,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.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 74926c1..b48451a 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -148,14 +148,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; } @@ -264,6 +264,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 * ***********/ @@ -323,9 +326,9 @@ GtkTextView { .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; } @@ -551,9 +554,9 @@ GtkTextView { 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 { @@ -3610,7 +3613,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.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index b1ef201..cd3d82c 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -614,7 +614,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.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 4b1c0c7..eae5de1 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/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; } @@ -357,6 +357,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } } +GtkSearchEntry.entry { border-radius: 20px; } + /*********** * Buttons * ***********/ diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss index c073126..2cb08e1 100644 --- a/common/gtk-3.0/3.18/sass/_drawing.scss +++ b/common/gtk-3.0/3.18/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; |