From 77fd9f40360322b082984ec085eda63752982c39 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Wed, 25 Feb 2015 02:28:30 +0200
Subject: tool-bar: include merge/link buttons, use link-icon, merge icon still
 missing

---
 res/client/css/partials/tool-bar.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'res/client/css/partials/tool-bar.scss')

diff --git a/res/client/css/partials/tool-bar.scss b/res/client/css/partials/tool-bar.scss
index d9b66afe..4f2d898a 100644
--- a/res/client/css/partials/tool-bar.scss
+++ b/res/client/css/partials/tool-bar.scss
@@ -3,7 +3,9 @@
     cursor: pointer;
     float: right;
     height: $three-baselines;
+    line-height: $three-baselines;
     margin-left: 10px;
+    text-align: center;
     width: 50px;
 }
 
@@ -25,3 +27,13 @@
     background-position: center;
     background-repeat: no-repeat;
 }
+
+#btn_merge {
+    width: 80px;
+}
+
+#btn_link_fan {
+    background: url(../img/url-icon.png);
+    background-position: center;
+    background-repeat: no-repeat;
+}
-- 
cgit v1.3.1