Merge remote branch 'ebroder/master'

diff --git a/bluechips/public/css/main.css b/bluechips/public/css/main.css
index c55df6c37b6477276078435654f8bd7b9aa6e50b..86d9122d06a47b7870f874b633e43213ed4977b7 100644 (file)
--- a/bluechips/public/css/main.css
+++ b/bluechips/public/css/main.css
@@ -10,7 +10,7 @@ em {
     font-style: italic;
 }
 a {
-    color: #068600;
+    color: #002286;
 }
 h1.title {
     font-size: 1.5em;

diff --git a/bluechips/public/icons/dashboard.png b/bluechips/public/icons/dashboard.png
index 2ad717cf68aa920f89a5b7f47390626864da3270..a2f9cb317a8a6807657d8ec8497f6e7036f7d1c4 100644 (file)
Binary files a/bluechips/public/icons/dashboard.png and b/bluechips/public/icons/dashboard.png differ

diff --git a/bluechips/public/icons/history.png b/bluechips/public/icons/history.png
index 6156d0f2eb2d038f998851cf296a9651a534d922..6e324dbc2166c6d15bda07091dd29cbf96938b6a 100644 (file)
Binary files a/bluechips/public/icons/history.png and b/bluechips/public/icons/history.png differ

diff --git a/bluechips/public/icons/spend.png b/bluechips/public/icons/spend.png
index 000faa8b9f30bc5c31d0d232a61012f25842e3e0..08e9bc2788d86b6eed64bee7ed48261493f8ab2a 100644 (file)
Binary files a/bluechips/public/icons/spend.png and b/bluechips/public/icons/spend.png differ

diff --git a/bluechips/public/icons/transfer.png b/bluechips/public/icons/transfer.png
index 18d9dc922bf47efe0b49332ba7b5edb601c12191..5a66f4d4cd240d3c8fbfc51c162eb88a330dc452 100644 (file)
Binary files a/bluechips/public/icons/transfer.png and b/bluechips/public/icons/transfer.png differ

diff --git a/bluechips/public/icons/user.png b/bluechips/public/icons/user.png
index 795a416457801ec11b45b74c19ed229891cb82e2..9ea3b1d789d8d690e4b1824ca477571f7c677f54 100644 (file)
Binary files a/bluechips/public/icons/user.png and b/bluechips/public/icons/user.png differ