From ae9b9b59eb328f72872fbfeb80aa887c92d944d0 Mon Sep 17 00:00:00 2001
From: nicolas-p <z.nicolas@gmail.com>
Date: Sat, 18 Jul 2015 15:48:02 +0200
Subject: [PATCH] Use colour constants

---
 basis/ui/gadgets/buttons/buttons.factor       | 3 ++-
 basis/ui/gadgets/status-bar/status-bar.factor | 2 +-
 basis/ui/tools/browser/browser.factor         | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index 3a3338e6fc..4e6f62c27f 100644
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -123,6 +123,7 @@ PRIVATE>
 
 CONSTANT: button-background COLOR: grey95
 CONSTANT: button-clicked-background COLOR: FactorDarkSlateBlue
+CONSTANT: toolbar-border COLOR: grey75
 
 : <border-button-pen> ( -- pen )
     "button" button-background button-clicked-background
@@ -255,5 +256,5 @@ PRIVATE>
 : add-toolbar ( track -- track )
     dup <toolbar> { 3 3 } <border> 
     button-background <solid> >>interior
-    COLOR: grey75 <solid-underlined> >>boundary
+    toolbar-border <solid-underlined> >>boundary
     align-left f track-add ;
diff --git a/basis/ui/gadgets/status-bar/status-bar.factor b/basis/ui/gadgets/status-bar/status-bar.factor
index c1c850495e..9d1b3ba704 100644
--- a/basis/ui/gadgets/status-bar/status-bar.factor
+++ b/basis/ui/gadgets/status-bar/status-bar.factor
@@ -26,7 +26,7 @@ CONSTANT: status-bar-foreground COLOR: white
 : open-status-window ( gadget title/attributes -- )
     ?attributes f <model> >>status <world>
     dup status>> <status-bar> 
-    { 7 2 } <border> COLOR: FactorDarkSlateBlue <solid> >>interior 
+    { 7 2 } <border> status-bar-background <solid> >>interior 
     { 1 1 } >>fill 
     f track-add
     open-world-window ;
diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index dcbe3f986e..0ff58eafa5 100644
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -37,10 +37,12 @@ M: browser-gadget set-history-value
 : <help-header> ( browser-gadget -- gadget )
     model>> [ '[ _ $title ] try ] <pane-control> ;
     
+CONSTANT: help-header-background COLOR: FactorLightTan
+    
 : add-help-header ( track -- track )
     dup <help-header> { 3 3 } <border>
-    COLOR: FactorLightTan <solid> >>interior
-    COLOR: grey75 <solid-underlined> >>boundary
+    help-header-background <solid> >>interior
+    toolbar-border <solid-underlined> >>boundary
     { 1 0 } >>fill f track-add ;
 
 : <help-pane> ( browser-gadget -- gadget )
@@ -70,7 +72,7 @@ M: browser-gadget set-history-value
 : add-browser-toolbar ( track -- track )
     dup <browser-toolbar> { 3 3 } <border> 
     button-background <solid> >>interior
-    COLOR: grey75 <solid-underlined> >>boundary 
+    toolbar-border <solid-underlined> >>boundary 
     { 1 0 } >>fill f track-add ;
 
 : <browser-gadget> ( link -- gadget )