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

1 files changed, 10 insertions, 5 deletions

diff --git a/res/client/css/style.css b/res/client/css/style.css
index a4ae2040..a6e3555e 100644
--- a/res/client/css/style.css
+++ b/res/client/css/style.css
@@ -229,11 +229,6 @@ body.debug .debug-ui-right {
   #input-container__graph-input:focus {
     width: 80%; }
 
-#selection-tools {
-  position: absolute;
-  top: 180px;
-  left: 24px; }
-
 #textanalyser.ui-autocomplete-input {
   font-family: "Source_Regular", sans-serif;
   color: #919095; }
@@ -664,7 +659,9 @@ p {
   cursor: pointer;
   float: right;
   height: 36px;
+  line-height: 36px;
   margin-left: 10px;
+  text-align: center;
   width: 50px; }
 
 #tool-bar {
@@ -683,6 +680,14 @@ p {
   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; }
+
 .graph-view {
   background-color: #f5f5fa;
   height: 100%; }