Skylsmoi 7 years ago
parent
commit
1576df73ae

+ 10 - 10
jsonserver/static_db.json View File

107
         "id": 1,
107
         "id": 1,
108
         "parent_id": null,
108
         "parent_id": null,
109
         "workspace_id": 1,
109
         "workspace_id": 1,
110
-        "title": "La programmation fonctionnelle",
110
+        "title": "Design v2",
111
         "type": "PageHtml",
111
         "type": "PageHtml",
112
         "status": "validated"
112
         "status": "validated"
113
       },
113
       },
123
         "id": 6,
123
         "id": 6,
124
         "parent_id": null,
124
         "parent_id": null,
125
         "workspace_id": 1,
125
         "workspace_id": 1,
126
-        "title": "Une photo moche",
126
+        "title": "Une photo",
127
         "type": "File",
127
         "type": "File",
128
         "status": "current"
128
         "status": "current"
129
       },
129
       },
131
         "id": 10,
131
         "id": 10,
132
         "parent_id": null,
132
         "parent_id": null,
133
         "workspace_id": 1,
133
         "workspace_id": 1,
134
-        "title": "le README.md d'un random repo github",
134
+        "title": "README.md de tracim_lib",
135
         "type": "PageMarkdown",
135
         "type": "PageMarkdown",
136
         "status": "current"
136
         "status": "current"
137
       },
137
       },
139
         "id": 7,
139
         "id": 7,
140
         "parent_id": null,
140
         "parent_id": null,
141
         "workspace_id": 1,
141
         "workspace_id": 1,
142
-        "title": "Une liste de truc à faire que je ferai jamais",
142
+        "title": "Etape d'installation de Tracim",
143
         "type": "Task",
143
         "type": "Task",
144
         "status": "current"
144
         "status": "current"
145
       },
145
       },
147
         "id": 8,
147
         "id": 8,
148
         "parent_id": null,
148
         "parent_id": null,
149
         "workspace_id": 1,
149
         "workspace_id": 1,
150
-        "title": "Ça, ça marche pas. Merci de le fix",
150
+        "title": "Fixe du fichier css",
151
         "type": "Issue",
151
         "type": "Issue",
152
         "status": "current"
152
         "status": "current"
153
       },
153
       },
166
       "id": 4,
166
       "id": 4,
167
       "parent_id": 3,
167
       "parent_id": 3,
168
       "workspace_id": 1,
168
       "workspace_id": 1,
169
-      "title": "des trucs de backend",
169
+      "title": "Backend appli n°578",
170
       "type": "File",
170
       "type": "File",
171
       "status": "outdated"
171
       "status": "outdated"
172
     },
172
     },
174
       "id": 5,
174
       "id": 5,
175
       "parent_id": 3,
175
       "parent_id": 3,
176
       "workspace_id": 1,
176
       "workspace_id": 1,
177
-      "title": "on s'emmerde",
177
+      "title": "La programmation fonctionnelle",
178
       "type": "PageHtml",
178
       "type": "PageHtml",
179
       "status": "outdated"
179
       "status": "outdated"
180
     },
180
     },
182
       "id": 11,
182
       "id": 11,
183
       "parent_id": 3,
183
       "parent_id": 3,
184
       "workspace_id": 1,
184
       "workspace_id": 1,
185
-      "title": "Hidden features",
185
+      "title": "ticket à fixe",
186
       "type": "folder",
186
       "type": "folder",
187
       "content": []
187
       "content": []
188
     }
188
     }
192
       "id": 12,
192
       "id": 12,
193
       "parent_id": 11,
193
       "parent_id": 11,
194
       "workspace_id": 1,
194
       "workspace_id": 1,
195
-      "title": "flatMap",
195
+      "title": "ticket à fixe",
196
       "type": "PageHtml",
196
       "type": "PageHtml",
197
       "status": "current"
197
       "status": "current"
198
     },
198
     },
200
       "id": 13,
200
       "id": 13,
201
       "parent_id": 11,
201
       "parent_id": 11,
202
       "workspace_id": 1,
202
       "workspace_id": 1,
203
-      "title": "c'est tout pété",
203
+      "title": "issue n°555",
204
       "type": "Issue",
204
       "type": "Issue",
205
       "status": "current"
205
       "status": "current"
206
     }
206
     }

+ 4 - 3
src/css/AccountPage.styl View File

49
       border-radius 10px
49
       border-radius 10px
50
       padding 0
50
       padding 0
51
       width 20%
51
       width 20%
52
+      min-height 600px
52
       background-color off-white
53
       background-color off-white
53
       &__responsive
54
       &__responsive
54
         font-size 20px
55
         font-size 20px
79
       border-radius 10px
80
       border-radius 10px
80
       padding 20px
81
       padding 20px
81
       width 80%
82
       width 80%
83
+      min-height 600px
82
       background-color off-white
84
       background-color off-white
83
       .personaldata
85
       .personaldata
84
         &__text
86
         &__text
126
               background-color blue
128
               background-color blue
127
               color white
129
               color white
128
           &__submenu
130
           &__submenu
129
-            width 203px
130
-            max-height 300px
131
+            max-height 265px
131
             overflow-Y auto
132
             overflow-Y auto
132
             &__item
133
             &__item
133
               &:hover, &:focus
134
               &:hover, &:focus
264
               text-overflow ellipsis
265
               text-overflow ellipsis
265
               white-space nowrap
266
               white-space nowrap
266
               overflow hidden
267
               overflow hidden
267
-              width 310px
268
+              width 175px
268
               &:focus
269
               &:focus
269
                 overflow visible
270
                 overflow visible
270
                 width auto
271
                 width auto

+ 15 - 6
src/css/FileItem.styl View File

1
+iconrules()
2
+  display inline-block
3
+  margin-right 10px
4
+  font-size 20px
5
+
1
 .file
6
 .file
2
   display flex
7
   display flex
3
   border-bottom 0
8
   border-bottom 0
12
     justify-content space-between
17
     justify-content space-between
13
     padding 15px 5px
18
     padding 15px 5px
14
     &__text
19
     &__text
20
+      margin-right 10px
15
       font-size 17px
21
       font-size 17px
16
     &__icons
22
     &__icons
17
       &__download
23
       &__download
18
-        display inline-block
19
-        margin-right 10px
24
+        iconrules()
25
+        &:hover, &:focus
26
+          color blue
20
       &__archive
27
       &__archive
21
-        display inline-block
22
-        margin-right 10px
28
+        iconrules()
29
+        &:hover, &:focus
30
+          color blue
23
       &__delete
31
       &__delete
24
-        display inline-block
25
-        margin-right 10px
32
+        iconrules()
33
+        &:hover, &:focus
34
+          color blue
26
   &__status
35
   &__status
27
     font-size 30px
36
     font-size 30px
28
     text-align center
37
     text-align center

+ 11 - 2
src/css/Folder.styl View File

45
       folderopen()
45
       folderopen()
46
       & > .file, > .folder
46
       & > .file, > .folder
47
         folderopen()
47
         folderopen()
48
-
49
   &__header
48
   &__header
50
     position relative
49
     position relative
51
     display flex
50
     display flex
83
         font-size 25px
82
         font-size 25px
84
         color darkBlue
83
         color darkBlue
85
       &__text
84
       &__text
86
-        margin auto 15px
85
+        margin auto 15px auto 5px
87
         font-size 17px
86
         font-size 17px
88
         color darkBlue
87
         color darkBlue
89
       &__addbtn
88
       &__addbtn
106
         & > i
105
         & > i
107
           margin-right 15px
106
           margin-right 15px
108
 
107
 
108
+@media (min-width: min-sm) and (max-width: max-sm)
109
+
110
+  .folder
111
+    &__header
112
+      padding 10px
113
+      &__triangleborder
114
+        top 59px
115
+      &__contenttype
116
+        display none
117
+
109
 @media (max-width: max-xs)
118
 @media (max-width: max-xs)
110
   .folder
119
   .folder
111
     &__header
120
     &__header

+ 2 - 4
src/css/Generic.styl View File

17
 @media (min-width: min-md) and (max-width: max-md)
17
 @media (min-width: min-md) and (max-width: max-md)
18
   .pageWrapperGeneric
18
   .pageWrapperGeneric
19
     display block
19
     display block
20
-    padding-top 87px
21
     &__header
20
     &__header
22
       margin 95px 0 5px 30px
21
       margin 95px 0 5px 30px
23
     &__content
22
     &__content
25
 @media (min-width: min-sm) and (max-width: max-sm)
24
 @media (min-width: min-sm) and (max-width: max-sm)
26
   .pageWrapperGeneric
25
   .pageWrapperGeneric
27
     display block
26
     display block
28
-    padding-top 87px
29
     &__header
27
     &__header
30
       margin 95px 0 35px 0
28
       margin 95px 0 35px 0
31
       &__title
29
       &__title
36
 @media (max-width: max-xs)
34
 @media (max-width: max-xs)
37
   .pageWrapperGeneric
35
   .pageWrapperGeneric
38
     display block
36
     display block
39
-    padding-top 87px
40
     &__header
37
     &__header
41
       display block
38
       display block
42
       margin-top 60px
39
       margin-top 60px
59
 
56
 
60
 
57
 
61
 .pageContentGeneric
58
 .pageContentGeneric
62
-  margin 10px 0 120px 0
59
+  margin 10px 0 0 0
63
   width 100%
60
   width 100%
61
+  height 100%
64
 
62
 
65
 .dropdownCreateBtn
63
 .dropdownCreateBtn
66
   &__label
64
   &__label

+ 9 - 2
src/css/Header.styl View File

94
               box-shadow none
94
               box-shadow none
95
           .profilgroup__setting
95
           .profilgroup__setting
96
             padding 0
96
             padding 0
97
+            left inherit
98
+            right 0
97
             &__link
99
             &__link
98
               padding 10px 0
100
               padding 10px 0
99
 
101
 
133
         width 418px
135
         width 418px
134
         &__itemquestion
136
         &__itemquestion
135
           display none
137
           display none
136
-        &__itemprofil__profilgroup
137
-          margin-top 20px
138
+        &__itemprofil
139
+          &__profilgroup
140
+            margin-top 20px
141
+          .profilgroup__setting
142
+            left 0
143
+
144
+

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

48
     color white
48
     color white
49
     transition all sidebar-animate-speed
49
     transition all sidebar-animate-speed
50
   &__btnnewworkspace
50
   &__btnnewworkspace
51
-    margin-top 50px
51
+    margin 50px 0
52
     overflow hidden
52
     overflow hidden
53
     &__btn
53
     &__btn
54
       display block
54
       display block

+ 2 - 1
src/css/Workspace.styl View File

1
 .workspace
1
 .workspace
2
   &__header
2
   &__header
3
     display flex
3
     display flex
4
+    flex-wrap wrap
4
     margin-right 15px
5
     margin-right 15px
5
   &__content
6
   &__content
6
     margin 0 15px
7
     margin 0 15px
22
   .workspace
23
   .workspace
23
     &__header
24
     &__header
24
       &__title
25
       &__title
25
-        margin 0 0 20px 0
26
+        margin 0 0 20px 10px

BIN
src/img/drapeau-en.png View File


BIN
src/img/drapeau-fr.png View File