diff --git a/examples/desktop-reference.ebox b/examples/desktop-reference.ebox index de48dfa..646f692 100644 --- a/examples/desktop-reference.ebox +++ b/examples/desktop-reference.ebox @@ -17,8 +17,8 @@ (desktop-grid-label (:color "#3F5273") (:color "#566B86")) (desktop-grid-dots (:color "#334866") (:color "#A6B3C3")) (desktop-grid-hint (:color "#5A6D8E") (:color "#566A83")) - (desktop-studio (:background-color "#26223B" :color "#D6CDEF") - (:background-color "#E9E3F2" :color "#4F3F67")) + (desktop-studio (:border "#8977B5" :background-color "#26223B" :color "#D6CDEF") + (:border "#9782B6" :background-color "#E9E3F2" :color "#4F3F67")) (desktop-studio-heading (:color "#F5F0FF") (:color "#37284F")) (desktop-studio-caption (:color "#A999C8") (:color "#67577E")) (desktop-studio-text (:color "#B8A9D0") (:color "#5F4D78")) @@ -29,14 +29,14 @@ (:background-color "#DED3F6" :color "#51356C")) (desktop-art-play (:background-color "#D8EAAB" :color "#303D22") (:background-color "#DBE8C3" :color "#41512B")) - (desktop-notes (:background-color "#EEE3CB" :color "#514430") - (:background-color "#FFF4D8" :color "#5B482B")) + (desktop-notes (:border "#A18B61" :background-color "#EEE3CB" :color "#514430") + (:border "#B69B62" :background-color "#FFF4D8" :color "#5B482B")) (desktop-notes-caption (:color "#8C744E") (:color "#7A623E")) (desktop-notes-muted (:color "#887651") (:color "#836D49")) (desktop-notes-rule (:color "#A18B61") (:color "#A38E65")) (desktop-notes-footer (:color "#746345") (:color "#705935")) - (desktop-signal (:background-color "#17343E" :color "#BFE5E9") - (:background-color "#DBEEF0" :color "#315B65")) + (desktop-signal (:border "#518F9D" :background-color "#17343E" :color "#BFE5E9") + (:border "#6B9EA8" :background-color "#DBEEF0" :color "#315B65")) (desktop-signal-heading (:color "#E4FBF9") (:color "#184B57")) (desktop-signal-caption (:color "#7BAEB9") (:color "#436971")) (desktop-signal-muted (:color "#699CA9") (:color "#496F77")) @@ -44,12 +44,12 @@ (desktop-wave-muted (:background-color "#518F9D") (:background-color "#9EC9CF")) (desktop-wave-cyan (:background-color "#8DE1E4") (:background-color "#5EADB5")) (desktop-wave-violet (:background-color "#BBA9FF") (:background-color "#927AC9")) - (desktop-terminal (:background-color "#101F22" :color "#B6D7CC") - (:background-color "#E0EEE4" :color "#355E4C")) + (desktop-terminal (:border "#608C7F" :background-color "#101F22" :color "#B6D7CC") + (:border "#7B9F88" :background-color "#E0EEE4" :color "#355E4C")) (desktop-terminal-accent (:color "#A7E8BB") (:color "#256544")) (desktop-terminal-muted (:color "#608C7F") (:color "#496D5B")) - (desktop-palette (:background-color "#39283D" :color "#EBCBDE") - (:background-color "#F0E1EB" :color "#65485E")) + (desktop-palette (:border "#AF8DA9" :background-color "#39283D" :color "#EBCBDE") + (:border "#B18AA4" :background-color "#F0E1EB" :color "#65485E")) (desktop-palette-caption (:color "#AF8DA9") (:color "#7B5670")) (desktop-palette-accent (:color "#F3A8C9") (:color "#925277")) (desktop-swatch-violet (:background-color "#BBA9FF") (:background-color "#9578CF")) diff --git a/tests/ebox-playground-desktop-tests.el b/tests/ebox-playground-desktop-tests.el index 757a3bb..a3ef6cc 100644 --- a/tests/ebox-playground-desktop-tests.el +++ b/tests/ebox-playground-desktop-tests.el @@ -216,7 +216,12 @@ TYPE defaults to `down-mouse-1'; repeated presses use their native event type." (let ((node (plist-get match :node)) (style (nth 2 entry))) (while style (let ((property (pop style)) (expected (pop style))) - (unless (eq property :hover-style) + (when (eq property :border) + (dolist (edge '(top right bottom left)) + (should (equal (ebox-get node (intern (format ":border-%s-color" edge))) + expected)) + (should (> (ebox-get node (intern (format ":border-%s-pixel" edge))) 0)))) + (unless (memq property '(:hover-style :border)) (should (equal (ebox-get node (if (eq property :background-color) :bgcolor property)) expected))))))))))