Browse Source

fix issue https://github.com/tracim/tracim/issues/636

AlexiCauvin 5 years ago
parent
commit
6f30d2aef5
2 changed files with 28 additions and 24 deletions
  1. 27 23
      frontend/src/container/Sidebar.jsx
  2. 1 1
      frontend/src/css/Header.styl

+ 27 - 23
frontend/src/container/Sidebar.jsx View File

@@ -63,29 +63,33 @@ class Sidebar extends React.Component {
63 63
             <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
64 64
           </div>
65 65
 
66
-          <nav className='sidebar__navigation'>
67
-            <ul className='sidebar__navigation__workspace'>
68
-              { workspaceList.map(ws =>
69
-                <WorkspaceListItem
70
-                  idWs={ws.id}
71
-                  label={ws.label}
72
-                  allowedApp={ws.sidebarEntry}
73
-                  lang={activeLang}
74
-                  activeFilterList={ws.id === workspaceIdInUrl ? [qs.parse(this.props.location.search).type] : []}
75
-                  isOpenInSidebar={ws.isOpenInSidebar}
76
-                  onClickTitle={() => this.handleClickWorkspace(ws.id, !ws.isOpenInSidebar)}
77
-                  onClickAllContent={this.handleClickAllContent}
78
-                  // onClickContentFilter={this.handleClickContentFilter}
79
-                  key={ws.id}
80
-                />
81
-              )}
82
-            </ul>
83
-          </nav>
84
-
85
-          <div className='sidebar__btnnewworkspace'>
86
-            <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
87
-              {t('Sidebar.create_new_workspace')}
88
-            </button>
66
+          <div className='sidebar__wrapper'>
67
+
68
+            <nav className='sidebar__navigation'>
69
+              <ul className='sidebar__navigation__workspace'>
70
+                { workspaceList.map(ws =>
71
+                  <WorkspaceListItem
72
+                    idWs={ws.id}
73
+                    label={ws.label}
74
+                    allowedApp={ws.sidebarEntry}
75
+                    lang={activeLang}
76
+                    activeFilterList={ws.id === workspaceIdInUrl ? [qs.parse(this.props.location.search).type] : []}
77
+                    isOpenInSidebar={ws.isOpenInSidebar}
78
+                    onClickTitle={() => this.handleClickWorkspace(ws.id, !ws.isOpenInSidebar)}
79
+                    onClickAllContent={this.handleClickAllContent}
80
+                    // onClickContentFilter={this.handleClickContentFilter}
81
+                    key={ws.id}
82
+                  />
83
+                )}
84
+              </ul>
85
+            </nav>
86
+
87
+            <div className='sidebar__btnnewworkspace'>
88
+              <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
89
+                {t('Sidebar.create_new_workspace')}
90
+              </button>
91
+            </div>
92
+
89 93
           </div>
90 94
 
91 95
           <div className='sidebar__footer mb-2'>

+ 1 - 1
frontend/src/css/Header.styl View File

@@ -2,7 +2,7 @@
2 2
   position fixed
3 3
   width 100%
4 4
   border-bottom 1px solid grey
5
-  z-index 5
5
+  z-index 6
6 6
   &__logo
7 7
     &__img
8 8
       width 150px