Browse Source

https://github.com/tracim/tracim/issues/803, https://github.com/tracim/tracim/issues/802, fix the margin of dashboard, fix the scroll on member list and recent activity on dasboard

AlexiCauvin 6 years ago
parent
commit
3ccd38bfca

+ 3 - 4
frontend/src/component/Dashboard/MemberList.styl View File

1
 @import "../../../node_modules/tracim_frontend_lib/src/css/Variable.styl"
1
 @import "../../../node_modules/tracim_frontend_lib/src/css/Variable.styl"
2
 
2
 
3
 .memberlist
3
 .memberlist
4
-  margin 0 0 50px 0
5
-  width 35%
4
+  margin 0 0 50px 10px
5
+  width 37%
6
   &__title
6
   &__title
7
     margin-bottom 20px
7
     margin-bottom 20px
8
     padding 6px
8
     padding 6px
10
   &__wrapper
10
   &__wrapper
11
     position relative
11
     position relative
12
     border 1px solid grey
12
     border 1px solid grey
13
-    height 480px
13
+    min-height 480px
14
   &__list
14
   &__list
15
     margin 0
15
     margin 0
16
     padding 0
16
     padding 0
17
     list-style none
17
     list-style none
18
     height 400px
18
     height 400px
19
-    overflow-Y scroll
20
     &__item
19
     &__item
21
       display flex
20
       display flex
22
       border-bottom 1px solid grey
21
       border-bottom 1px solid grey

+ 1 - 2
frontend/src/component/Dashboard/RecentActivity.styl View File

5
   width 60%
5
   width 60%
6
   &__wrapper
6
   &__wrapper
7
     border 1px solid grey
7
     border 1px solid grey
8
-    height 480px
9
-    overflow-y scroll
8
+    min-height 480px
10
   &__header
9
   &__header
11
     display flex
10
     display flex
12
     justify-content space-between
11
     justify-content space-between