diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-dark.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-darker.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/sass/_applications.scss | 10 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/sass/_common.scss | 3 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/gtk-contained-dark.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/gtk-contained-darker.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/gtk-contained-solid.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/gtk-contained.css | 6 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/sass/_applications.scss | 10 | ||||
-rw-r--r-- | common/gtk-3.0/3.16/sass/_common.scss | 3 |
16 files changed, 62 insertions, 36 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 64749da..a75d2af 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } @@ -2881,7 +2883,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #2d3036; } GbViewStack.focused GtkBox.header.notebook { - background-color: #444852; } + background-color: #383C45; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 c3f73a9..8a59577 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -1279,8 +1279,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2882,7 +2884,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 e98b5dc..faacd77 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 @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } @@ -2881,7 +2883,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #2d3036; } GbViewStack.focused GtkBox.header.notebook { - background-color: #444852; } + background-color: #383C45; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 31f8211..a97ce32 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 @@ -1279,8 +1279,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2882,7 +2884,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 7884c30..fcdf640 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2881,7 +2883,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index b0e2e00..ea30eb8 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -1278,8 +1278,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2881,7 +2883,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook GtkLabel.button.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index f4b2c8d..4889325 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -306,26 +306,26 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { } GbSourceStyleSchemeWidget GtkSourceView { - font-family: Monospace; + font-family: Monospace; } GtkScrolledWindow.gb-linked-scroller { - border-top: none; + border-top: none; } // Disable various animatinos that are enabled by default and really annoying // to the overall flow of Builder. GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button { - transition: none; + transition: none; } GbViewStack GtkBox.header.notebook, GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { - border-bottom: 1px solid $borders_color; + border-bottom: 1px solid $borders_color; } GbViewStack.focused GtkBox.header.notebook { - background-color: $bg_color; + background-color: $base_color; .button.dim-label { opacity: 1; } } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index adafd37..90351b7 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1438,7 +1438,8 @@ column-header.button.dnd { // for treeview-like derive widgets transparentize(if($variant == 'light', black, white), 0.89) 80%, transparentize(if($variant == 'light', black, white), 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch; - &:active { background-color: $base_color; } + &:active, &:hover { background-color: $base_color; } + &:active:hover { color: $fg_color; } &:insensitive { border-color: $bg_color; background-image: none; 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 3ed50e0..b334350 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } @@ -2847,7 +2849,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #2d3036; } GbViewStack.focused GtkBox.header.notebook { - background-color: #444852; } + background-color: #383C45; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 f617941..f11ab3f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -1295,8 +1295,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2848,7 +2850,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 4325240..82c14ca 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 @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, rgba(255, 255, 255, 0) 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #383C45; } + column-header .button:active:hover { + color: #D3DAE3; } column-header .button:insensitive { border-color: #444852; background-image: none; } @@ -2847,7 +2849,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #2d3036; } GbViewStack.focused GtkBox.header.notebook { - background-color: #444852; } + background-color: #383C45; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 b3b3330..9d20a36 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 @@ -1295,8 +1295,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2848,7 +2850,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } 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 921527e..f78fa60 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2847,7 +2849,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 81111fa..a5021a3 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -1294,8 +1294,10 @@ column-header .button, column-header .button:hover, column-header .button:active border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, transparent 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, transparent 80%) 0 1 0 0/0 1px 0 0 stretch; } - column-header .button:active { + column-header .button:active, column-header .button:hover { background-color: #ffffff; } + column-header .button:active:hover { + color: #5c616c; } column-header .button:insensitive { border-color: #F5F6F7; background-image: none; } @@ -2847,7 +2849,7 @@ GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { border-bottom: 1px solid #dbdfe3; } GbViewStack.focused GtkBox.header.notebook { - background-color: #F5F6F7; } + background-color: #ffffff; } GbViewStack.focused GtkBox.header.notebook .button.dim-label, GbViewStack.focused GtkBox.header.notebook .button.label.separator, GbViewStack.focused GtkBox.header.notebook .header-bar .button.subtitle, .header-bar GbViewStack.focused GtkBox.header.notebook .button.subtitle { opacity: 1; } diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index 09680e1..6e1301c 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -354,26 +354,26 @@ GtkEntry.gb-command-bar-entry.entry.flat:focus { } GbSourceStyleSchemeWidget GtkSourceView { - font-family: Monospace; + font-family: Monospace; } GtkScrolledWindow.gb-linked-scroller { - border-top: none; + border-top: none; } // Disable various animatinos that are enabled by default and really annoying // to the overall flow of Builder. GbSearchDisplayGroup GtkListBox .list-row, GbDocumentStack .button { - transition: none; + transition: none; } GbViewStack GtkBox.header.notebook, GbEditorWorkspace > GtkPaned > GtkBox > GtkBox.header.notebook { - border-bottom: 1px solid $borders_color; + border-bottom: 1px solid $borders_color; } GbViewStack.focused GtkBox.header.notebook { - background-color: $bg_color; + background-color: $base_color; .button.dim-label { opacity: 1; } } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index ccbf3c2..27a9cbc 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1460,7 +1460,8 @@ column-header.button.dnd { // for treeview-like derive widgets transparentize(if($variant == 'light', black, white), 0.89) 80%, transparentize(if($variant == 'light', black, white), 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch; - &:active { background-color: $base_color; } + &:active, &:hover { background-color: $base_color; } + &:active:hover { color: $fg_color; } &:insensitive { border-color: $bg_color; background-image: none; |