Browse Source

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

Skylsmoi 6 years ago
parent
commit
1dab481b62

File diff suppressed because it is too large
+ 1 - 1
dist/tracim_lib.js


+ 3 - 0
src/component/PopinFixed/PopinFixed.styl View File

22
       color white
22
       color white
23
     &__title
23
     &__title
24
       margin-right 15px
24
       margin-right 15px
25
+      border-radius 5px
25
       color white
26
       color white
26
       text-overflow ellipsis
27
       text-overflow ellipsis
27
       overflow hidden
28
       overflow hidden
28
       white-space nowrap
29
       white-space nowrap
30
+      & > input
31
+        padding-left 5px
29
     &__edittitle
32
     &__edittitle
30
       margin 0 15px
33
       margin 0 15px
31
       border 1px solid transparent
34
       border 1px solid transparent

+ 5 - 3
src/component/Timeline/Timeline.styl View File

3
 .timeline
3
 .timeline
4
   display flex
4
   display flex
5
   flex-direction column
5
   flex-direction column
6
-  margin 10px
6
+  margin 10px 10px 10px 5px
7
   border-radius 10px
7
   border-radius 10px
8
-  height 100%
8
+  height calc(100% - 10px) // 10px => margin
9
   &__header
9
   &__header
10
     flex 0 1 auto
10
     flex 0 1 auto
11
     border-radius 10px 10px 0 0
11
     border-radius 10px 10px 0 0
54
       width 100%
54
       width 100%
55
       background-color lightGrey
55
       background-color lightGrey
56
       &__btn
56
       &__btn
57
-        padding 5px 25px
57
+        display flex
58
+        justify-content center
59
+        padding 5px 20px
58
         border-radius 5px
60
         border-radius 5px
59
         width 145px
61
         width 145px
60
         color white
62
         color white