style: toolbar_x: close_btn

4 files changed, 29 insertions, 19 deletions

diff --git a/res/client/css/partials/tool-bar.scss b/res/client/css/partials/tool-bar.scss
index 71ee32be..546961f7 100644
--- a/res/client/css/partials/tool-bar.scss
+++ b/res/client/css/partials/tool-bar.scss
@@ -10,6 +10,18 @@
     width: $toolbar-button-width;
 }
 
+.toolbar__close_btn {
+    border-bottom-left-radius: 6px;
+    background-color: dimgray;
+    color: white;
+    cursor: pointer;
+    font-family: fantasy;
+    font-size: 12px;
+    padding: 2px 8px;
+    position: absolute;
+    right: 0px;
+}
+
 #tool-bar {
     margin-top: $two-baselines;
     position: absolute;
diff --git a/res/client/css/partials/toolbar__cmd.scss b/res/client/css/partials/toolbar__cmd.scss
index b5f076bd..79e0b2e2 100644
--- a/res/client/css/partials/toolbar__cmd.scss
+++ b/res/client/css/partials/toolbar__cmd.scss
@@ -53,15 +53,6 @@
     overflow: auto;
 }
 
-#cmd_bar__rzdoc_close {
-    border-bottom-left-radius: 6px;
-    background-color: dimgray;
-    font-family: fantasy;
-    font-size: 12px;
-    position: absolute;
-    right: 0px;
-}
-
 .cmd_bar__rzdoc_open__item {
     border-radius: 3px;
     background-color: white;
diff --git a/res/client/css/style.css b/res/client/css/style.css
index a141d309..a39c4bcd 100644
--- a/res/client/css/style.css
+++ b/res/client/css/style.css
@@ -718,6 +718,17 @@ p {
   text-align: center;
   width: 65px; }
 
+.toolbar__close_btn {
+  border-bottom-left-radius: 6px;
+  background-color: dimgray;
+  color: white;
+  cursor: pointer;
+  font-family: fantasy;
+  font-size: 12px;
+  padding: 2px 8px;
+  position: absolute;
+  right: 0px; }
+
 #tool-bar {
   margin-top: 24px;
   position: absolute;
@@ -837,14 +848,6 @@ p {
 #cmd_bar__rzdoc_open__rzdoc_list {
   overflow: auto; }
 
-#cmd_bar__rzdoc_close {
-  border-bottom-left-radius: 6px;
-  background-color: dimgray;
-  font-family: fantasy;
-  font-size: 12px;
-  position: absolute;
-  right: 0px; }
-
 .cmd_bar__rzdoc_open__item {
   border-radius: 3px;
   background-color: white;
diff --git a/src/client/buttons.js b/src/client/buttons.js
index 1a80dd36..69aa8c44 100644
--- a/src/client/buttons.js
+++ b/src/client/buttons.js
@@ -111,7 +111,10 @@ $('#btn_rzdoc__new').click(function() {
 
     cmd_bar = $('<div class="cmd-bar" id="cmd_bar__rzdoc_new">');
     cmd_bar_body = $('<div class="cmd-bar_body" id="cmd_bar__rzdoc_new__body">');
-    close_btn = $('<span class="cmd-bar_btn" id="cmd_bar__rzdoc_close">x</span>');
+
+    close_btn = $('<div id="cmd_bar__rzdoc_close">x</div>');
+    close_btn.addClass('toolbar__close_btn');
+
     submit_btn = $('<span class="cmd-bar_btn" id="cmd_bar__rzdoc_new__submit">Create</span>');
 
     cmd_bar.append(close_btn);
@@ -162,7 +165,8 @@ $('#btn_rzdoc__open').click(function() {
     cmd_bar = $('<div class="cmd-bar" id="cmd_bar__rzdoc_open">');
     cmd_bar.css('display', 'none');
 
-    close_btn = $('<span class="cmd-bar_btn" id="cmd_bar__rzdoc_close">x</span>');
+    close_btn = $('<div id="cmd_bar__rzdoc_close">x</div>');
+    close_btn.addClass('toolbar__close_btn');
     close_btn.appendTo(cmd_bar);
 
     cmd_bar_body = $('<div class="cmd-bar_body" id="cmd_bar__rzdoc_open__rzdoc_list">');