summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/client/css/partials/input-bar.scss6
-rw-r--r--res/client/css/style.css5
-rw-r--r--res/templates/index.html3
3 files changed, 14 insertions, 0 deletions
diff --git a/res/client/css/partials/input-bar.scss b/res/client/css/partials/input-bar.scss
index 05c7abd2..568c703b 100644
--- a/res/client/css/partials/input-bar.scss
+++ b/res/client/css/partials/input-bar.scss
@@ -42,6 +42,12 @@
}
}
+#merge-tool {
+ position: absolute;
+ top: 160px;
+ left: 24px;
+}
+
#textanalyser.ui-autocomplete-input {
font-family: $base-font-family;
color: $mid-grey;
diff --git a/res/client/css/style.css b/res/client/css/style.css
index aef50fc7..ae58ef0e 100644
--- a/res/client/css/style.css
+++ b/res/client/css/style.css
@@ -535,6 +535,11 @@ body.debug .debug-ui-right {
#input-container__graph-input:focus {
width: 80%; }
+#merge-tool {
+ position: absolute;
+ top: 160px;
+ left: 24px; }
+
#textanalyser.ui-autocomplete-input {
font-family: "Source_Regular", sans-serif;
color: #919095; }
diff --git a/res/templates/index.html b/res/templates/index.html
index 27129a4c..d4353d17 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -65,6 +65,9 @@ var rz_config = { // set as a global variable
<button id="btn_add"></button>
<div id="input-suggestion" class="suggestion" style="display: none"></div>
</div>
+ <div class='merge-tool' id='merge-tool'>
+ <button id="btn_merge" style="display: none">merge nodes</button>
+ </div>
</div>
<div class="info-container">
<div class="edge_info" style="display:none">Title: <span id="edgetitle"></span><br/>