diff --git a/data/style.css b/data/style.css index 4addc9d..40b62a3 100644 --- a/data/style.css +++ b/data/style.css @@ -11,12 +11,22 @@ ); } +.clr-palette button:nth-child(1) { + border-radius: 12px 0 0 12px; +} + +.clr-palette button:nth-child(2), +.clr-palette button:nth-child(3) { + border-radius: 0; +} + +.clr-palette button:nth-child(4) { + border-radius: 0 12px 12px 0; +} + .clr-palette button image { - color: #ffffff; + color: @accent_color_fg; } .clr-palette button.light image { - color: #000000; -} -.clr-props { - background: @surface_container_bg_color; + color: @scrim; } diff --git a/data/ui/window.blp b/data/ui/window.blp index 09de256..34d0554 100644 --- a/data/ui/window.blp +++ b/data/ui/window.blp @@ -11,8 +11,8 @@ template $ColorwayMainWindow : He.ApplicationWindow { Box { Box { orientation: vertical; - spacing: 12; - styles [ "clr-props" ] + spacing: 0; + styles [ "sidebar-view" ] He.AppBar headerbar1 { show-back: false; @@ -22,7 +22,7 @@ template $ColorwayMainWindow : He.ApplicationWindow { WindowHandle { Box color_box { orientation: vertical; - spacing: 18; + spacing: 6; margin-start: 18; margin-end: 18; margin-bottom: 18; @@ -31,7 +31,7 @@ template $ColorwayMainWindow : He.ApplicationWindow { } Box { orientation: vertical; - spacing: 12; + spacing: 0; He.AppBar headerbar { show-back: false; diff --git a/src/window.vala b/src/window.vala index 5639c57..c0b4d21 100644 --- a/src/window.vala +++ b/src/window.vala @@ -538,12 +538,12 @@ namespace Colorway { var snap = new Gtk.Snapshot (); mbox.snapshot (snap); - var sf = new Cairo.ImageSurface (Cairo.Format.ARGB32, 176, 44); // 260×32 is the color result box size; + var sf = new Cairo.ImageSurface (Cairo.Format.ARGB32, 224, 34); // 224×34 is the color result box size; var cr = new Cairo.Context (sf); var node = snap.to_node (); node.draw(cr); - var pb = Gdk.pixbuf_get_from_surface (sf, 0, 0, 176, 44); + var pb = Gdk.pixbuf_get_from_surface (sf, 0, 0, 224, 34); var mt = Gdk.Texture.for_pixbuf (pb); var display = Gdk.Display.get_default ();