[gnome-themes-standard/wip/jimmac/updated-gtk2: 14/106] Updated scrollbars.
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard/wip/jimmac/updated-gtk2: 14/106] Updated scrollbars.
- Date: Thu, 3 Mar 2016 22:18:28 +0000 (UTC)
commit 626bc8a082eee486aa2dd161e99218d071dec0b4
Author: Juraj Fiala <doctorjellyface riseup net>
Date: Sun Jan 3 18:57:41 2016 +0100
Updated scrollbars.
.../Adwaita/gtk-2.0/Scrollbars/slider-h-active.png | Bin 0 -> 247 bytes
.../Adwaita/gtk-2.0/Scrollbars/slider-h-hover.png | Bin 0 -> 247 bytes
themes/Adwaita/gtk-2.0/Scrollbars/slider-h.png | Bin 0 -> 247 bytes
.../gtk-2.0/Scrollbars/slider-horiz-active.png | Bin 2871 -> 0 bytes
.../gtk-2.0/Scrollbars/slider-horiz-insens.png | Bin 2885 -> 0 bytes
.../gtk-2.0/Scrollbars/slider-horiz-prelight.png | Bin 2883 -> 0 bytes
themes/Adwaita/gtk-2.0/Scrollbars/slider-horiz.png | Bin 2871 -> 0 bytes
.../Adwaita/gtk-2.0/Scrollbars/slider-v-active.png | Bin 0 -> 242 bytes
.../Adwaita/gtk-2.0/Scrollbars/slider-v-hover.png | Bin 0 -> 242 bytes
themes/Adwaita/gtk-2.0/Scrollbars/slider-v.png | Bin 0 -> 242 bytes
.../gtk-2.0/Scrollbars/slider-vert-active.png | Bin 2866 -> 0 bytes
.../gtk-2.0/Scrollbars/slider-vert-insens.png | Bin 2883 -> 0 bytes
.../gtk-2.0/Scrollbars/slider-vert-prelight.png | Bin 2883 -> 0 bytes
themes/Adwaita/gtk-2.0/Scrollbars/slider-vert.png | Bin 2866 -> 0 bytes
themes/Adwaita/gtk-2.0/Scrollbars/trough-h.png | Bin 0 -> 146 bytes
.../gtk-2.0/Scrollbars/trough-scrollbar-horiz.png | Bin 2768 -> 0 bytes
.../gtk-2.0/Scrollbars/trough-scrollbar-vert.png | Bin 2768 -> 0 bytes
themes/Adwaita/gtk-2.0/Scrollbars/trough-v.png | Bin 0 -> 145 bytes
themes/Adwaita/gtk-2.0/adwaita-bits.svg | 265 ++++++++++++++++++--
themes/Adwaita/gtk-2.0/main.rc | 43 ++--
20 files changed, 266 insertions(+), 42 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/slider-h-active.png
b/themes/Adwaita/gtk-2.0/Scrollbars/slider-h-active.png
new file mode 100644
index 0000000..d806b72
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/slider-h-active.png differ
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/slider-h-hover.png
b/themes/Adwaita/gtk-2.0/Scrollbars/slider-h-hover.png
new file mode 100644
index 0000000..e405438
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/slider-h-hover.png differ
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/slider-h.png b/themes/Adwaita/gtk-2.0/Scrollbars/slider-h.png
new file mode 100644
index 0000000..6e8facd
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/slider-h.png differ
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/slider-v-active.png
b/themes/Adwaita/gtk-2.0/Scrollbars/slider-v-active.png
new file mode 100644
index 0000000..a303d47
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/slider-v-active.png differ
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/slider-v-hover.png
b/themes/Adwaita/gtk-2.0/Scrollbars/slider-v-hover.png
new file mode 100644
index 0000000..04a7905
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/slider-v-hover.png differ
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/slider-v.png b/themes/Adwaita/gtk-2.0/Scrollbars/slider-v.png
new file mode 100644
index 0000000..3362b07
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/slider-v.png differ
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/trough-h.png b/themes/Adwaita/gtk-2.0/Scrollbars/trough-h.png
new file mode 100644
index 0000000..453cba6
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/trough-h.png differ
diff --git a/themes/Adwaita/gtk-2.0/Scrollbars/trough-v.png b/themes/Adwaita/gtk-2.0/Scrollbars/trough-v.png
new file mode 100644
index 0000000..8cc6d42
Binary files /dev/null and b/themes/Adwaita/gtk-2.0/Scrollbars/trough-v.png differ
diff --git a/themes/Adwaita/gtk-2.0/adwaita-bits.svg b/themes/Adwaita/gtk-2.0/adwaita-bits.svg
index 374d1cf..28dcfc8 100644
--- a/themes/Adwaita/gtk-2.0/adwaita-bits.svg
+++ b/themes/Adwaita/gtk-2.0/adwaita-bits.svg
@@ -14,7 +14,7 @@
height="480px"
id="svg3032"
version="1.1"
- inkscape:version="0.48.2 r9819"
+ inkscape:version="0.91 r13725"
sodipodi:docname="adwaita-bits.svg">
<defs
id="defs3034">
@@ -1416,20 +1416,20 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="225.95688"
- inkscape:cy="295.42715"
+ inkscape:zoom="5.6568543"
+ inkscape:cx="294.32172"
+ inkscape:cy="469.23939"
inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
inkscape:snap-bbox="true"
inkscape:snap-global="true"
inkscape:snap-nodes="false"
- inkscape:window-width="1248"
- inkscape:window-height="665"
- inkscape:window-x="1"
- inkscape:window-y="59"
- inkscape:window-maximized="0"
+ inkscape:window-width="1440"
+ inkscape:window-height="863"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
showguides="false"
inkscape:guide-bbox="true">
<inkscape:grid
@@ -2998,19 +2998,15 @@
style="color:#000000;fill:none;stroke:#2a79cb;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
/>
</g>
</g>
- <g
- id="ProgressBar_progressbar_v"
- inkscape:label="#g4818"
- transform="translate(220,0)">
- <use
- transform="matrix(0,1,1,0,10,22)"
- height="1"
- width="1"
- id="use4783"
- xlink:href="#g4761"
- y="0"
- x="0" />
- </g>
+ <use
+ x="0"
+ y="0"
+ xlink:href="#g4761"
+ id="use4783"
+ width="1"
+ height="1"
+ transform="matrix(0,1,1,0,230,22)"
+ style="stroke-width:4.4;stroke-miterlimit:4;stroke-dasharray:none" />
<g
id="Spin_up-background-notebook"
inkscape:label="#g4383"
@@ -3455,5 +3451,230 @@
rx="0"
ry="0" />
</g>
+ <g
+ id="Scrollbars_slider-v"
+ inkscape:label="#g9440"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ y="1"
+ x="298"
+ height="12"
+ width="13"
+ id="rect9402"
+
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <a
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider.png"
+ inkscape:label="#a5307"
+ transform="translate(2,4)"
+ id="a5307">
+ <rect
+
style="fill:#787c7d;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect5272"
+ width="6"
+ height="6"
+ x="300"
+ y="0"
+ rx="3"
+ ry="3" />
+ </a>
+ </g>
+ <g
+ id="Scrollbars_slider-v-hover"
+ inkscape:label="#g9445"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider-hover.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect9413"
+ width="13"
+ height="12"
+ x="314"
+ y="1" />
+ <a
+ inkscape:label="#a5307-0"
+ style="fill:#535859;fill-opacity:1"
+ transform="translate(18,4)"
+ id="a5307-0">
+ <rect
+
style="fill:#535859;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect5272-4"
+ width="6"
+ height="6"
+ x="300"
+ y="0"
+ rx="3"
+ ry="3" />
+ </a>
+ </g>
+ <g
+ id="Scrollbars_slider-v-active"
+ inkscape:label="#g9450"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider-active.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ y="1"
+ x="330"
+ height="12"
+ width="13"
+ id="rect9415"
+
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <a
+ inkscape:label="#a5307-0-9"
+ style="fill:#2a76c6;fill-opacity:1"
+ transform="translate(34,4)"
+ id="a5307-0-9">
+ <rect
+
style="fill:#2a76c6;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect5272-4-2"
+ width="6"
+ height="6"
+ x="300"
+ y="0"
+ rx="3"
+ ry="3" />
+ </a>
+ </g>
+ <g
+ id="Scrollbars_trough-v"
+ inkscape:label="#g5368"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-vert-test.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ transform="translate(-4,-2)">
+ <rect
+ y="9"
+ x="296"
+ height="1"
+ width="1"
+ id="rect5364"
+
style="fill:#9d9d99;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <rect
+
style="fill:#d7d7d5;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect5366"
+ width="1"
+ height="1"
+ x="297"
+ y="9" />
+ </g>
+ <g
+ id="Scrollbars_trough-h"
+ inkscape:label="#g9323"
+ transform="translate(-4,-7)"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/trough-scrollbar-h.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+
style="fill:#9d9d99;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect9317"
+ width="1"
+ height="1"
+ x="299"
+ y="11" />
+ <rect
+ y="12"
+ x="299"
+ height="1"
+ width="1"
+ id="rect9319"
+
style="fill:#d7d7d5;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ <g
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider-h.png"
+ inkscape:label="#g9440"
+ id="Scrollbars_slider-h"
+ transform="matrix(0,1,-1,0,312,-281.5)">
+ <rect
+
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4713"
+ width="13"
+ height="12"
+ x="298"
+ y="1" />
+ <a
+ id="a4715"
+ transform="translate(2,4)"
+ inkscape:label="#a5307"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <rect
+ ry="3"
+ rx="3"
+ y="0"
+ x="300"
+ height="6"
+ width="6"
+ id="rect4717"
+
style="fill:#787c7d;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </a>
+ </g>
+ <g
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider-hover-h.png"
+ inkscape:label="#g9445"
+ id="Scrollbars_slider-h-hover"
+ transform="matrix(0,1,-1,0,328,-297.5)">
+ <rect
+ y="1"
+ x="314"
+ height="12"
+ width="13"
+ id="rect4721"
+
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <a
+ id="a4723"
+ transform="translate(18,4)"
+ style="fill:#535859;fill-opacity:1"
+ inkscape:label="#a5307-0">
+ <rect
+ ry="3"
+ rx="3"
+ y="0"
+ x="300"
+ height="6"
+ width="6"
+ id="rect4725"
+
style="fill:#535859;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </a>
+ </g>
+ <g
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+
inkscape:export-filename="/home/juraj/Projekty/gnome-themes-standard/themes/Adwaita/gtk-2.0/Scrollbars/slider-active-h.png"
+ inkscape:label="#g9450"
+ id="Scrollbars_slider-h-active"
+ transform="matrix(0,1,-1,0,344,-313.5)">
+ <rect
+
style="fill:none;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4729"
+ width="13"
+ height="12"
+ x="330"
+ y="1" />
+ <a
+ id="a4731"
+ transform="translate(34,4)"
+ style="fill:#2a76c6;fill-opacity:1"
+ inkscape:label="#a5307-0-9">
+ <rect
+ ry="3"
+ rx="3"
+ y="0"
+ x="300"
+ height="6"
+ width="6"
+ id="rect4733"
+
style="fill:#2a76c6;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </a>
+ </g>
</g>
</svg>
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index 41ea259..dfddf07 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -555,13 +555,16 @@ style "default" {
style "scrollbar" {
+ bg[ACTIVE] = "red"#shade(0.97, @bg_color)
+ bg[NORMAL] = "red"#shade(0.97, @bg_color)
+
engine "pixmap" {
image {
function = BOX
detail = "trough"
- file = "Scrollbars/trough-scrollbar-horiz.png"
- border = { 19, 19, 4, 4 }
+ file = "Scrollbars/trough-h.png"
+ border = {0, 0, 1, 0}
stretch = TRUE
orientation = HORIZONTAL
}
@@ -569,8 +572,8 @@ style "scrollbar" {
image {
function = BOX
detail = "trough"
- file = "Scrollbars/trough-scrollbar-vert.png"
- border = { 4, 4, 19, 19 }
+ file = "Scrollbars/trough-v.png"
+ border = {1, 0, 0, 0}
stretch = TRUE
orientation = VERTICAL
}
@@ -582,8 +585,8 @@ style "scrollbar" {
image {
function = SLIDER
state = NORMAL
- file = "Scrollbars/slider-horiz.png"
- border = { 7, 7, 5, 5 }
+ file = "Scrollbars/slider-h.png"
+ border = {6, 6, 7, 6 }
stretch = TRUE
orientation = HORIZONTAL
}
@@ -591,8 +594,8 @@ style "scrollbar" {
image {
function = SLIDER
state = ACTIVE
- file = "Scrollbars/slider-horiz-active.png"
- border = { 7, 7, 5, 5 }
+ file = "Scrollbars/slider-h-active.png"
+ border = {6, 6, 7, 6 }
stretch = TRUE
orientation = HORIZONTAL
}
@@ -600,8 +603,8 @@ style "scrollbar" {
image {
function = SLIDER
state = PRELIGHT
- file = "Scrollbars/slider-horiz-prelight.png"
- border = { 7, 7, 5, 5 }
+ file = "Scrollbars/slider-h-hover.png"
+ border = {6, 6, 7, 6 }
stretch = TRUE
orientation = HORIZONTAL
}
@@ -609,8 +612,8 @@ style "scrollbar" {
image {
function = SLIDER
state = INSENSITIVE
- file = "Scrollbars/slider-horiz-insens.png"
- border = { 7, 7, 5, 5 }
+ file = "Others/null.png"
+ border = {0, 0, 0, 0}
stretch = TRUE
orientation = HORIZONTAL
}
@@ -622,8 +625,8 @@ style "scrollbar" {
image {
function = SLIDER
state = NORMAL
- file = "Scrollbars/slider-vert.png"
- border = { 5, 5, 7, 7 }
+ file = "Scrollbars/slider-v.png"
+ border = {7, 6, 6, 6}
stretch = TRUE
orientation = VERTICAL
}
@@ -631,8 +634,8 @@ style "scrollbar" {
image {
function = SLIDER
state = ACTIVE
- file = "Scrollbars/slider-vert-active.png"
- border = { 5, 5, 7, 7 }
+ file = "Scrollbars/slider-v-active.png"
+ border = {7, 6, 6, 6}
stretch = TRUE
orientation = VERTICAL
}
@@ -640,8 +643,8 @@ style "scrollbar" {
image {
function = SLIDER
state = PRELIGHT
- file = "Scrollbars/slider-vert-prelight.png"
- border = { 5, 5, 7, 7 }
+ file = "Scrollbars/slider-v-hover.png"
+ border = {7, 6, 6, 6}
stretch = TRUE
orientation = VERTICAL
}
@@ -649,8 +652,8 @@ style "scrollbar" {
image {
function = SLIDER
state = INSENSITIVE
- file = "Scrollbars/slider-vert-insens.png"
- border = { 5, 5, 7, 7 }
+ file = "Others/null.png"
+ border = {0, 0, 0, 0}
stretch = TRUE
orientation = VERTICAL
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
