tool-bar: include merge/link buttons, use link-icon, merge icon still missing

2 files changed, 12 insertions, 6 deletions

diff --git a/res/client/css/partials/input-bar.scss b/res/client/css/partials/input-bar.scss
index 3fb106b4..9a6614f6 100644
--- a/res/client/css/partials/input-bar.scss
+++ b/res/client/css/partials/input-bar.scss
@@ -39,12 +39,6 @@
   }
 }
 
-#selection-tools {
-  position: absolute;
-  top: 180px;
-  left: 24px;
-}
-
 #textanalyser.ui-autocomplete-input {
   font-family: $base-font-family;
   color: $mid-grey;
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;
+}