Merge 21ae5a4 into f006937

tracim · Sep 17, 2018 · cd9233f · cd9233f
2 parents f006937 + 21ae5a4
commit cd9233f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/frontend/src/component/Workspace/ContentItem.jsx b/frontend/src/component/Workspace/ContentItem.jsx
@@ -34,7 +34,7 @@ const ContentItem = props => {
       }
 
       <div
-        className='content__status d-sm-flex justify-content-center'
+        className='content__status d-sm-flex justify-content-between align-items-center'
         style={{color: status.hexcolor}}
       >
         <div className='content__status__text d-none d-sm-block'>

diff --git a/frontend/src/container/Sidebar.jsx b/frontend/src/container/Sidebar.jsx
@@ -63,7 +63,7 @@ class Sidebar extends React.Component {
     if (!this.shouldDisplaySidebar()) return null
 
     return (
-      <div className={classnames('sidebar primaryColorBgDarken', {'sidebarclose': sidebarClose})}>
+      <div className={classnames('sidebar primaryColorBg', {'sidebarclose': sidebarClose})}>
 
         <div className='sidebar__expand primaryColorBg' onClick={this.handleClickToggleSidebar}>
           <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
@@ -90,7 +90,7 @@ class Sidebar extends React.Component {
 
           <div className='sidebar__content__btnnewworkspace'>
             <button
-              className='sidebar__content__btnnewworkspace__btn btn highlightBtn primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'
+              className='sidebar__content__btnnewworkspace__btn btn primaryColorBgLighten primaryColorBorderDarken primaryColorBgDarkenHover  mb-5'
               onClick={this.handleClickNewWorkspace}
             >
               {t('Create a workspace')}

diff --git a/frontend/src/css/ContentItem.styl b/frontend/src/css/ContentItem.styl
@@ -48,7 +48,7 @@
     font-weight normal
     &__text
       margin-left 15px
-      font-size 20px
+      font-size 18px
     &__icon
       font-size 20px
 

diff --git a/frontend/src/css/Sidebar.styl b/frontend/src/css/Sidebar.styl
@@ -48,7 +48,9 @@ leftside()
       &__btn
         display block
         margin 0 auto
-        color offWhite
+        padding 10px 20px
+        &:hover
+          color offWhite
     &__navigation
       padding 0
       width sidebar-width

diff --git a/frontend/src/img/applat.png b/frontend/src/img/applat.png