2
0
Эх сурвалжийг харах

Merge pull request #4910 from deniszulic/master

Added X for closing
Lauri Ojansivu 2 жил өмнө
parent
commit
acaefab0f4

+ 7 - 0
client/components/sidebar/sidebar.css

@@ -14,6 +14,12 @@
   box-shadow: -10px 0px 5px -10px #b3b3b3;
   box-shadow: -10px 0px 5px -10px #b3b3b3;
   z-index: 10;
   z-index: 10;
 }
 }
+.sidebar-xmark {
+  position: absolute;
+  right: 10px;
+  top: 5px;
+  font-size: 25px;
+}
 .sidebar .sidebar-content {
 .sidebar .sidebar-content {
   padding: 12px;
   padding: 12px;
   margin-bottom: 1.6em;
   margin-bottom: 1.6em;
@@ -24,6 +30,7 @@
   left: 0;
   left: 0;
   overflow-x: hidden;
   overflow-x: hidden;
   overflow-y: auto;
   overflow-y: auto;
+  width: 90%;
 }
 }
 .sidebar .sidebar-content .hide-btn {
 .sidebar .sidebar-content .hide-btn {
   display: none;
   display: none;

+ 1 - 0
client/components/sidebar/sidebar.jade

@@ -5,6 +5,7 @@ template(name="sidebar")
     //  title="{{showTongueTitle}}")
     //  title="{{showTongueTitle}}")
     //  i.fa.fa-navicon
     //  i.fa.fa-navicon
     .sidebar-shadow
     .sidebar-shadow
+      a.sidebar-xmark.js-close-sidebar ✕
       .sidebar-content.js-board-sidebar-content
       .sidebar-content.js-board-sidebar-content
         //a.hide-btn.js-hide-sidebar
         //a.hide-btn.js-hide-sidebar
         //  i.fa.fa-navicon
         //  i.fa.fa-navicon

+ 3 - 0
client/components/sidebar/sidebar.js

@@ -125,6 +125,9 @@ BlazeComponent.extendComponent({
         'click .js-shortcuts'() {
         'click .js-shortcuts'() {
           FlowRouter.go('shortcuts');
           FlowRouter.go('shortcuts');
         },
         },
+        'click .js-close-sidebar'() {
+          Sidebar.toggle()
+        },
       },
       },
     ];
     ];
   },
   },