Browse Source

Merge branch 'develop' of github.com:tracim/tracim_frontend into develop

Skylsmoi 6 years ago
parent
commit
610600b9a1
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/css/Generic.styl
  2. 1 1
      src/css/Sidebar.styl

+ 1 - 1
src/css/Generic.styl View File

56
   min-height calc(100% - 50px)
56
   min-height calc(100% - 50px)
57
 
57
 
58
 .pageWrapperGeneric
58
 .pageWrapperGeneric
59
-  width 100%
59
+  width calc(100% - 300px) // 300px => width of the sidebar
60
   &__header
60
   &__header
61
     display flex
61
     display flex
62
   &__content
62
   &__content

+ 1 - 1
src/css/Sidebar.styl View File

2
   position absolute
2
   position absolute
3
   left 0
3
   left 0
4
   display none
4
   display none
5
-  border 1px solid darkBlue
5
+  border 1px solid thirdColor
6
   border-top-width 2px
6
   border-top-width 2px
7
   padding 11px 15px
7
   padding 11px 15px
8
   background-color blue
8
   background-color blue