浏览代码

fixed problems related to timeline and content height's in mozilla

AlexiCauvin 7 年前
父节点
当前提交
3330ca2944
共有 3 个文件被更改,包括 5 次插入3 次删除
  1. 1 1
      dist/tracim_lib.js
  2. 2 0
      src/component/PopinFixed/PopinFixed.styl
  3. 2 2
      src/component/Timeline/Timeline.styl

文件差异内容过多而无法显示
+ 1 - 1
dist/tracim_lib.js


+ 2 - 0
src/component/PopinFixed/PopinFixed.styl 查看文件

81
     height calc(100% - 209px)
81
     height calc(100% - 209px)
82
     &__left
82
     &__left
83
       width 55%
83
       width 55%
84
+      height calc(100% - 20px) // 20px => margin of timeline
84
     &__right
85
     &__right
85
       width 45%
86
       width 45%
87
+      height calc(100% - 10px) // 10px => margin of timeline
86
 
88
 
87
 @media (min-width: min-sm) and (max-width: max-lg)
89
 @media (min-width: min-sm) and (max-width: max-lg)
88
 
90
 

+ 2 - 2
src/component/Timeline/Timeline.styl 查看文件

5
   flex-direction column
5
   flex-direction column
6
   margin 10px 10px 10px 5px
6
   margin 10px 10px 10px 5px
7
   border-radius 10px
7
   border-radius 10px
8
-  height calc(100% - 10px) // 10px => margin
8
+  height 100%
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
20
     padding-left 0
20
     padding-left 0
21
     border-bottom 1px solid grey
21
     border-bottom 1px solid grey
22
     background-color off-white
22
     background-color off-white
23
-    overflow-Y auto
23
+    overflow-y auto
24
     list-style none
24
     list-style none
25
     &__item
25
     &__item
26
       padding 0 25px 0 35px
26
       padding 0 25px 0 35px