Browse Source

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

Skylsmoi 6 years ago
parent
commit
0211cd7e96

+ 1 - 5
frontend/src/component/Dashboard/ContentTypeBtn.styl View File

4
   display flex
4
   display flex
5
   flex-direction column
5
   flex-direction column
6
   justify-content center
6
   justify-content center
7
-  margin 15px
7
+  margin 15px 15px 0 0
8
   border-radius 10px
8
   border-radius 10px
9
   padding 15px
9
   padding 15px
10
   width 230px
10
   width 230px
12
   box-shadow shadow-all
12
   box-shadow shadow-all
13
   text-align center
13
   text-align center
14
   cursor pointer
14
   cursor pointer
15
-  &:nth-child(1)
16
-    margin-left 0
17
-  &:nth-last-child
18
-    margin-right 0

+ 18 - 2
frontend/src/component/Dashboard/MemberList.styl View File

138
         padding 8px 30px
138
         padding 8px 30px
139
         cursor pointer
139
         cursor pointer
140
 
140
 
141
-@media (min-width min-sm) and (max-width: max-lg)
141
+/***** MEDIAQUERIES *****/
142
+
143
+/*** MEDIA 992px and 1199px ***/
144
+
145
+@media (min-width: min-lg) and (max-width: max-lg)
146
+
142
   .memberlist
147
   .memberlist
143
     width 50%
148
     width 50%
144
 
149
 
150
+/*** MEDIA 768px and 991px ***/
151
+
152
+@media (min-width: min-md) and (max-width: max-md)
153
+
154
+  .memberlist
155
+    width 50%
156
+
157
+/*** MEDIA 576px and 767px ***/
158
+
145
 @media (min-width: min-sm) and (max-width: max-sm)
159
 @media (min-width: min-sm) and (max-width: max-sm)
146
   .memberlist
160
   .memberlist
147
     margin 50px 0
161
     margin 50px 0
148
-    width 90%
162
+    width 100%
163
+
164
+/*** MEDIA 575px ***/
149
 
165
 
150
 @media (max-width: max-xs)
166
 @media (max-width: max-xs)
151
   .memberlist
167
   .memberlist

+ 19 - 3
frontend/src/component/Dashboard/RecentActivity.styl View File

43
       padding 10px 25px
43
       padding 10px 25px
44
       cursor pointer
44
       cursor pointer
45
 
45
 
46
-@media (min-width min-sm) and (max-width: max-lg)
46
+
47
+/**** MEDIAQUERIES ****/
48
+
49
+/**** MEDIA 992px and 1199px ****/
50
+
51
+@media (min-width min-lg) and (max-width: max-lg)
47
   .activity
52
   .activity
53
+    margin-right 0
48
     width 100%
54
     width 100%
49
 
55
 
56
+/**** MEDIA 768px and 991px ****/
57
+
50
 @media (min-width: min-md) and (max-width: max-md)
58
 @media (min-width: min-md) and (max-width: max-md)
51
   .activity
59
   .activity
52
-    margin 25px 15px 25px 0
60
+    margin 25px 0 25px 0
61
+    width 100%
62
+
63
+/**** MEDIA 576px and 767px ****/
53
 
64
 
54
 @media (min-width: min-sm) and (max-width: max-sm)
65
 @media (min-width: min-sm) and (max-width: max-sm)
55
   .activity
66
   .activity
56
-    margin 25px 15px 25px 0
67
+    margin 25px 0 25px 0
68
+    width 100%
69
+
70
+/**** MEDIA 575px ****/
57
 
71
 
58
 @media (max-width: max-xs)
72
 @media (max-width: max-xs)
59
   .activity
73
   .activity
60
     margin 25px 0
74
     margin 25px 0
61
     width 100%
75
     width 100%
76
+    &__wrapper
77
+      margin-top 45px
62
     &__header
78
     &__header
63
       display block
79
       display block
64
       height auto
80
       height auto

+ 37 - 0
frontend/src/component/Dashboard/UserStatus.styl View File

28
         padding 0
28
         padding 0
29
         &__item
29
         &__item
30
           padding 10px
30
           padding 10px
31
+
32
+/**** MEDIAQUERIES ****/
33
+
34
+/**** MEDIA 992px & 1199px ****/
35
+
36
+@media (min-width: min-lg) and (max-width: max-lg)
37
+
38
+  .userstatus
39
+    width 100%
40
+    &__role
41
+      display flex
42
+
43
+/**** MEDIA 768px & 991px ****/
44
+
45
+@media (min-width: min-md) and (max-width: max-md)
46
+
47
+  .userstatus
48
+    width 100%
49
+    &__role
50
+      display flex
51
+
52
+/**** MEDIA 576px & 767px ****/
53
+
54
+@media (min-width: min-sm) and (max-width: max-sm)
55
+
56
+  .userstatus
57
+    width 100%
58
+    &__role
59
+      display flex
60
+
61
+/**** MEDIA 575px ****/
62
+
63
+@media (max-width: max-xs)
64
+
65
+  .userstatus
66
+    width 100%
67
+

+ 22 - 12
frontend/src/css/Dashboard.styl View File

60
     &__calltoaction
60
     &__calltoaction
61
       justify-content center
61
       justify-content center
62
 
62
 
63
+
64
+/**** MEDIAQUERIES ****/
65
+
63
 /**** MEDIA 992px & 1199px ****/
66
 /**** MEDIA 992px & 1199px ****/
64
 
67
 
65
 @media (min-width: min-lg) and (max-width: max-lg)
68
 @media (min-width: min-lg) and (max-width: max-lg)
66
 
69
 
67
   .dashboard
70
   .dashboard
68
-    margin-left 15px
71
+    &__workspace
72
+      width 100%
73
+
74
+/**** MEDIA 768px & 991px ****/
75
+
76
+@media (min-width: min-md) and (max-width: max-md)
77
+
78
+  .dashboard
79
+    &__workspace
80
+      width 100%
69
 
81
 
70
 /**** MEDIA 576px & 767px ****/
82
 /**** MEDIA 576px & 767px ****/
71
 
83
 
72
 @media (min-width: min-sm) and (max-width: max-sm)
84
 @media (min-width: min-sm) and (max-width: max-sm)
73
 
85
 
74
   .dashboard
86
   .dashboard
75
-    &__activity
76
-      margin 25px 15px 25px 0
87
+    &__workspace
88
+      width 100%
77
 
89
 
78
 /**** MEDIA 575px ****/
90
 /**** MEDIA 575px ****/
79
 
91
 
80
 @media (max-width: max-xs)
92
 @media (max-width: max-xs)
81
 
93
 
82
   .dashboard
94
   .dashboard
83
-    margin-left 0
84
-    &__title
85
-      margin-left 10px
95
+    &__header
96
+      &__advancedmode
97
+        margin 25px 15px
86
     &__workspace
98
     &__workspace
87
-      margin-left 10px
88
-      width auto
89
-    &__userstatut
90
-      margin-left 10px
91
-      width auto
99
+      width 100%
92
     &__calltoaction
100
     &__calltoaction
101
+      flex-direction column
102
+      align-items center
93
       justify-content center
103
       justify-content center
94
       &__button
104
       &__button
95
-        margin 10px
105
+        margin 20px 0