diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index d287491..c0b0814 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.828427" - inkscape:cx="230.24498" - inkscape:cy="123.25417" + inkscape:zoom="7.9999996" + inkscape:cx="254.60434" + inkscape:cy="52.761079" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -4504,200 +4504,6 @@ id="rect5799-8-9" style="opacity:1;fill:#2d303b;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" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets-dark/slider-horiz-active.png b/common/gtk-2.0/assets-dark/slider-horiz-active.png index 65dcf04..ac4d545 100644 Binary files a/common/gtk-2.0/assets-dark/slider-horiz-active.png and b/common/gtk-2.0/assets-dark/slider-horiz-active.png differ diff --git a/common/gtk-2.0/assets-dark/slider-horiz-insens.png b/common/gtk-2.0/assets-dark/slider-horiz-insens.png index 4a4a86e..f210765 100644 Binary files a/common/gtk-2.0/assets-dark/slider-horiz-insens.png and b/common/gtk-2.0/assets-dark/slider-horiz-insens.png differ diff --git a/common/gtk-2.0/assets-dark/slider-horiz-prelight.png b/common/gtk-2.0/assets-dark/slider-horiz-prelight.png index f423a02..edf65a1 100644 Binary files a/common/gtk-2.0/assets-dark/slider-horiz-prelight.png and b/common/gtk-2.0/assets-dark/slider-horiz-prelight.png differ diff --git a/common/gtk-2.0/assets-dark/slider-horiz.png b/common/gtk-2.0/assets-dark/slider-horiz.png index b7aa7df..36188ad 100644 Binary files a/common/gtk-2.0/assets-dark/slider-horiz.png and b/common/gtk-2.0/assets-dark/slider-horiz.png differ diff --git a/common/gtk-2.0/assets-dark/slider-vert-active.png b/common/gtk-2.0/assets-dark/slider-vert-active.png index cf8b488..3483a5c 100644 Binary files a/common/gtk-2.0/assets-dark/slider-vert-active.png and b/common/gtk-2.0/assets-dark/slider-vert-active.png differ diff --git a/common/gtk-2.0/assets-dark/slider-vert-insens.png b/common/gtk-2.0/assets-dark/slider-vert-insens.png index 6ee55f7..bdfd350 100644 Binary files a/common/gtk-2.0/assets-dark/slider-vert-insens.png and b/common/gtk-2.0/assets-dark/slider-vert-insens.png differ diff --git a/common/gtk-2.0/assets-dark/slider-vert-prelight.png b/common/gtk-2.0/assets-dark/slider-vert-prelight.png index 87583fd..8de958f 100644 Binary files a/common/gtk-2.0/assets-dark/slider-vert-prelight.png and b/common/gtk-2.0/assets-dark/slider-vert-prelight.png differ diff --git a/common/gtk-2.0/assets-dark/slider-vert.png b/common/gtk-2.0/assets-dark/slider-vert.png index 16aec2c..4af4067 100644 Binary files a/common/gtk-2.0/assets-dark/slider-vert.png and b/common/gtk-2.0/assets-dark/slider-vert.png differ diff --git a/common/gtk-2.0/assets-dark/trough-scrollbar-horiz.png b/common/gtk-2.0/assets-dark/trough-scrollbar-horiz.png new file mode 100644 index 0000000..d7d3d82 Binary files /dev/null and b/common/gtk-2.0/assets-dark/trough-scrollbar-horiz.png differ diff --git a/common/gtk-2.0/assets-dark/trough-scrollbar-vert.png b/common/gtk-2.0/assets-dark/trough-scrollbar-vert.png new file mode 100644 index 0000000..96220cb Binary files /dev/null and b/common/gtk-2.0/assets-dark/trough-scrollbar-vert.png differ diff --git a/common/gtk-2.0/assets-dark/trough-scrollbar.png b/common/gtk-2.0/assets-dark/trough-scrollbar.png deleted file mode 100644 index b2948ed..0000000 Binary files a/common/gtk-2.0/assets-dark/trough-scrollbar.png and /dev/null differ diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index b86330f..f9adeb6 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,12 +565,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.828427" - inkscape:cx="254.63694" - inkscape:cy="69.196962" + inkscape:zoom="4" + inkscape:cx="248.42235" + inkscape:cy="35.189651" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" showborder="false" inkscape:window-width="1366" inkscape:window-height="720" @@ -622,7 +622,8 @@ id="layer3" inkscape:label="superbackdrop" style="display:inline" - transform="translate(7,283.63782)"> + transform="translate(7,283.63782)" + sodipodi:insensitive="true"> - - - - - - - - - - - - + style="opacity:1;fill:#d3d4d8;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" /> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index 6acfe2c..e7fc513 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -105,7 +105,8 @@ slider-vert slider-vert-active slider-vert-insens slider-vert-prelight -trough-scrollbar +trough-scrollbar-horiz +trough-scrollbar-vert frame frame-gap-end frame-gap-start diff --git a/common/gtk-2.0/assets/slider-horiz-active.png b/common/gtk-2.0/assets/slider-horiz-active.png index 65dcf04..ac4d545 100644 Binary files a/common/gtk-2.0/assets/slider-horiz-active.png and b/common/gtk-2.0/assets/slider-horiz-active.png differ diff --git a/common/gtk-2.0/assets/slider-horiz-insens.png b/common/gtk-2.0/assets/slider-horiz-insens.png index 83624fc..b075566 100644 Binary files a/common/gtk-2.0/assets/slider-horiz-insens.png and b/common/gtk-2.0/assets/slider-horiz-insens.png differ diff --git a/common/gtk-2.0/assets/slider-horiz-prelight.png b/common/gtk-2.0/assets/slider-horiz-prelight.png index 0548db7..264272e 100644 Binary files a/common/gtk-2.0/assets/slider-horiz-prelight.png and b/common/gtk-2.0/assets/slider-horiz-prelight.png differ diff --git a/common/gtk-2.0/assets/slider-horiz.png b/common/gtk-2.0/assets/slider-horiz.png index 8302fa8..e3c2ab0 100644 Binary files a/common/gtk-2.0/assets/slider-horiz.png and b/common/gtk-2.0/assets/slider-horiz.png differ diff --git a/common/gtk-2.0/assets/slider-vert-active.png b/common/gtk-2.0/assets/slider-vert-active.png index cf8b488..3483a5c 100644 Binary files a/common/gtk-2.0/assets/slider-vert-active.png and b/common/gtk-2.0/assets/slider-vert-active.png differ diff --git a/common/gtk-2.0/assets/slider-vert-insens.png b/common/gtk-2.0/assets/slider-vert-insens.png index f7e3fef..a1822a8 100644 Binary files a/common/gtk-2.0/assets/slider-vert-insens.png and b/common/gtk-2.0/assets/slider-vert-insens.png differ diff --git a/common/gtk-2.0/assets/slider-vert-prelight.png b/common/gtk-2.0/assets/slider-vert-prelight.png index b87c599..c2eda00 100644 Binary files a/common/gtk-2.0/assets/slider-vert-prelight.png and b/common/gtk-2.0/assets/slider-vert-prelight.png differ diff --git a/common/gtk-2.0/assets/slider-vert.png b/common/gtk-2.0/assets/slider-vert.png index b54788f..5fd3c55 100644 Binary files a/common/gtk-2.0/assets/slider-vert.png and b/common/gtk-2.0/assets/slider-vert.png differ diff --git a/common/gtk-2.0/assets/trough-scrollbar-horiz.png b/common/gtk-2.0/assets/trough-scrollbar-horiz.png new file mode 100644 index 0000000..19625d7 Binary files /dev/null and b/common/gtk-2.0/assets/trough-scrollbar-horiz.png differ diff --git a/common/gtk-2.0/assets/trough-scrollbar-vert.png b/common/gtk-2.0/assets/trough-scrollbar-vert.png new file mode 100644 index 0000000..b1077e0 Binary files /dev/null and b/common/gtk-2.0/assets/trough-scrollbar-vert.png differ diff --git a/common/gtk-2.0/assets/trough-scrollbar.png b/common/gtk-2.0/assets/trough-scrollbar.png deleted file mode 100644 index 652102f..0000000 Binary files a/common/gtk-2.0/assets/trough-scrollbar.png and /dev/null differ diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc index eb9ef82..f9487b3 100644 --- a/common/gtk-2.0/main.rc +++ b/common/gtk-2.0/main.rc @@ -27,7 +27,7 @@ style "default" { GtkScrollbar::trough-border = 0 GtkRange::trough-border = 0 - GtkRange::slider-width = 11 + GtkRange::slider-width = 13 GtkRange::stepper-size = 0 GtkScrollbar::activate-slider = 1 @@ -553,7 +553,7 @@ style "scrollbar" { image { function = BOX detail = "trough" - file = "assets/trough-scrollbar.png" + file = "assets/trough-scrollbar-horiz.png" border = { 2, 2, 3, 3 } stretch = TRUE orientation = HORIZONTAL @@ -562,7 +562,7 @@ style "scrollbar" { image { function = BOX detail = "trough" - file = "assets/trough-scrollbar.png" + file = "assets/trough-scrollbar-vert.png" border = { 3, 3, 2, 2 } stretch = TRUE orientation = VERTICAL