diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/gtk-3.0/3.20/gtk-dark.css | 25 | ||||
-rw-r--r-- | common/gtk-3.0/3.20/gtk-darker.css | 25 | ||||
-rw-r--r-- | common/gtk-3.0/3.20/gtk-solid-dark.css | 25 | ||||
-rw-r--r-- | common/gtk-3.0/3.20/gtk-solid-darker.css | 25 | ||||
-rw-r--r-- | common/gtk-3.0/3.20/gtk-solid.css | 25 | ||||
-rw-r--r-- | common/gtk-3.0/3.20/gtk.css | 25 | ||||
-rw-r--r-- | common/gtk-3.0/3.20/sass/_common.scss | 41 |
7 files changed, 76 insertions, 115 deletions
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 3285967..d062a86 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1387,21 +1387,13 @@ treeview.view { background-color: #404552; font-weight: bold; } treeview.view header button:hover { - color: #5294E2; - box-shadow: none; - transition: none; } + color: #5294E2; } treeview.view header button:active { - color: #D3DAE3; - transition: none; } - treeview.view header button:last-child, - treeview.view header button:last-child:hover, - treeview.view header button:last-child:active { - border-right-style: none; - border-image: none; } - treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover { - transition: none; - color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } + color: #D3DAE3; } + treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover { + transition: none; + color: #5294E2; + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { min-height: 0; @@ -1410,7 +1402,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he background-image: none; 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; } + border-image: linear-gradient(to bottom, #404552 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, #404552 80%) 0 1 0 0/0 1px 0 0 stretch; } treeview.view header button:active, treeview.view header button:hover { background-color: #404552; } treeview.view header button:active:hover { @@ -1418,6 +1410,9 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view header button:disabled { border-color: #383C4A; background-image: none; } + treeview.view header button:last-child { + border-right-style: none; + border-image: none; } menubar, .menubar { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 01c3d14..cdebeb2 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1386,21 +1386,13 @@ treeview.view { background-color: #ffffff; font-weight: bold; } treeview.view header button:hover { - color: #5294E2; - box-shadow: none; - transition: none; } + color: #5294E2; } treeview.view header button:active { - color: #5c616c; - transition: none; } - treeview.view header button:last-child, - treeview.view header button:last-child:hover, - treeview.view header button:last-child:active { - border-right-style: none; - border-image: none; } - treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover { - transition: none; - color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } + color: #5c616c; } + treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover { + transition: none; + color: #5294E2; + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { min-height: 0; @@ -1409,7 +1401,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he background-image: none; 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; } + border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; } treeview.view header button:active, treeview.view header button:hover { background-color: #ffffff; } treeview.view header button:active:hover { @@ -1417,6 +1409,9 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view header button:disabled { border-color: #F5F6F7; background-image: none; } + treeview.view header button:last-child { + border-right-style: none; + border-image: none; } menubar, .menubar { diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 013d674..4d8782a 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1387,21 +1387,13 @@ treeview.view { background-color: #404552; font-weight: bold; } treeview.view header button:hover { - color: #5294E2; - box-shadow: none; - transition: none; } + color: #5294E2; } treeview.view header button:active { - color: #D3DAE3; - transition: none; } - treeview.view header button:last-child, - treeview.view header button:last-child:hover, - treeview.view header button:last-child:active { - border-right-style: none; - border-image: none; } - treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover { - transition: none; - color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } + color: #D3DAE3; } + treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover { + transition: none; + color: #5294E2; + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #404552, inset -1px 0 #404552; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { min-height: 0; @@ -1410,7 +1402,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he background-image: none; 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; } + border-image: linear-gradient(to bottom, #404552 20%, rgba(255, 255, 255, 0.11) 20%, rgba(255, 255, 255, 0.11) 80%, #404552 80%) 0 1 0 0/0 1px 0 0 stretch; } treeview.view header button:active, treeview.view header button:hover { background-color: #404552; } treeview.view header button:active:hover { @@ -1418,6 +1410,9 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view header button:disabled { border-color: #383C4A; background-image: none; } + treeview.view header button:last-child { + border-right-style: none; + border-image: none; } menubar, .menubar { diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index eb0735f..3045a49 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1386,21 +1386,13 @@ treeview.view { background-color: #ffffff; font-weight: bold; } treeview.view header button:hover { - color: #5294E2; - box-shadow: none; - transition: none; } + color: #5294E2; } treeview.view header button:active { - color: #5c616c; - transition: none; } - treeview.view header button:last-child, - treeview.view header button:last-child:hover, - treeview.view header button:last-child:active { - border-right-style: none; - border-image: none; } - treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover { - transition: none; - color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } + color: #5c616c; } + treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover { + transition: none; + color: #5294E2; + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { min-height: 0; @@ -1409,7 +1401,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he background-image: none; 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; } + border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; } treeview.view header button:active, treeview.view header button:hover { background-color: #ffffff; } treeview.view header button:active:hover { @@ -1417,6 +1409,9 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view header button:disabled { border-color: #F5F6F7; background-image: none; } + treeview.view header button:last-child { + border-right-style: none; + border-image: none; } menubar, .menubar { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 8590239..aa1dc53 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1390,21 +1390,13 @@ treeview.view { background-color: #ffffff; font-weight: bold; } treeview.view header button:hover { - color: #5294E2; - box-shadow: none; - transition: none; } + color: #5294E2; } treeview.view header button:active { - color: #5c616c; - transition: none; } - treeview.view header button:last-child, - treeview.view header button:last-child:hover, - treeview.view header button:last-child:active { - border-right-style: none; - border-image: none; } - treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover { - transition: none; - color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } + color: #5c616c; } + treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover { + transition: none; + color: #5294E2; + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { min-height: 0; @@ -1413,7 +1405,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he background-image: none; 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; } + border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; } treeview.view header button:active, treeview.view header button:hover { background-color: #ffffff; } treeview.view header button:active:hover { @@ -1421,6 +1413,9 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view header button:disabled { border-color: #F5F6F7; background-image: none; } + treeview.view header button:last-child { + border-right-style: none; + border-image: none; } menubar, .menubar { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index b5920a8..e2cdf2c 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1390,21 +1390,13 @@ treeview.view { background-color: #ffffff; font-weight: bold; } treeview.view header button:hover { - color: #5294E2; - box-shadow: none; - transition: none; } + color: #5294E2; } treeview.view header button:active { - color: #5c616c; - transition: none; } - treeview.view header button:last-child, - treeview.view header button:last-child:hover, - treeview.view header button:last-child:active { - border-right-style: none; - border-image: none; } - treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover { - transition: none; - color: #5294E2; - box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } + color: #5c616c; } + treeview.view header button.dnd, treeview.view header button.dnd:selected, treeview.view header button.dnd:hover { + transition: none; + color: #5294E2; + box-shadow: inset 1px 1px 0 1px #5294E2, inset -1px 0 0 1px #5294E2, inset 1px 1px #ffffff, inset -1px 0 #ffffff; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { min-height: 0; @@ -1413,7 +1405,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he background-image: none; 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; } + border-image: linear-gradient(to bottom, #ffffff 20%, rgba(0, 0, 0, 0.11) 20%, rgba(0, 0, 0, 0.11) 80%, #ffffff 80%) 0 1 0 0/0 1px 0 0 stretch; } treeview.view header button:active, treeview.view header button:hover { background-color: #ffffff; } treeview.view header button:active:hover { @@ -1421,6 +1413,9 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view header button:disabled { border-color: #F5F6F7; background-image: none; } + treeview.view header button:last-child { + border-right-style: none; + border-image: none; } menubar, .menubar { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 602b782..bce6118 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1419,42 +1419,29 @@ treeview.view { header { button { - @extend %column_header_button; $_column_header_color: mix($fg_color,$base_color,80%); + + &, &:hover, &:active { @extend %column_header_button; } + color: $_column_header_color; background-color: $base_color; font-weight: bold; &:hover { - @extend %column_header_button; color: $selected_bg_color; - box-shadow: none; - transition: none; //I shouldn't need this } &:active { - @extend %column_header_button; color: $fg_color; - transition: none; //I shouldn't need this } &.dnd { - @extend header.button.dnd; + &, &:selected, &:hover { + transition: none; + color: $selected_bg_color; + box-shadow: inset 1px 1px 0 1px $selected_bg_color, + inset -1px 0 0 1px $selected_bg_color, + inset 1px 1px $base_color, inset -1px 0 $base_color; + } } } - button:last-child, - button:last-child:hover, - button:last-child:active { //treeview-like derived widgets in Banshee and Evolution - border-right-style: none; - border-image: none; - } - } - header.button.dnd { // for treeview-like derive widgets - transition: none; - color: $selected_bg_color; - box-shadow: inset 1px 1px 0 1px $selected_bg_color, - inset -1px 0 0 1px $selected_bg_color, - inset 1px 1px $base_color, inset -1px 0 $base_color;; - &:active { @extend header.button.dnd; } - &:selected { @extend header.button.dnd; } - &:hover { @extend header.button.dnd; } } } @@ -1466,10 +1453,10 @@ treeview.view { border-style: none solid none none; border-radius: 0; border-image: linear-gradient(to bottom, - transparentize(if($variant == 'light', black, white), 1) 20%, + $base_color 20%, transparentize(if($variant == 'light', black, white), 0.89) 20%, 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; + $base_color 80%) 0 1 0 0 / 0 1px 0 0 stretch; &:active, &:hover { background-color: $base_color; } &:active:hover { color: $fg_color; } @@ -1477,6 +1464,10 @@ treeview.view { border-color: $bg_color; background-image: none; } + &:last-child { + border-right-style: none; + border-image: none; + } } // |