merge

jsonserver/static_db.json

@@ -107,7 +107,7 @@
         "id": 1,
         "parent_id": null,
         "workspace_id": 1,
-        "title": "La programmation fonctionnelle",
+        "title": "Design v2",
         "type": "PageHtml",
         "status": "validated"
       },
@@ -123,7 +123,7 @@
         "id": 6,
         "parent_id": null,
         "workspace_id": 1,
-        "title": "Une photo moche",
+        "title": "Une photo",
         "type": "File",
         "status": "current"
       },
@@ -131,7 +131,7 @@
         "id": 10,
         "parent_id": null,
         "workspace_id": 1,
-        "title": "le README.md d'un random repo github",
+        "title": "README.md de tracim_lib",
         "type": "PageMarkdown",
         "status": "current"
       },
@@ -139,7 +139,7 @@
         "id": 7,
         "parent_id": null,
         "workspace_id": 1,
-        "title": "Une liste de truc à faire que je ferai jamais",
+        "title": "Etape d'installation de Tracim",
         "type": "Task",
         "status": "current"
       },
@@ -147,7 +147,7 @@
         "id": 8,
         "parent_id": null,
         "workspace_id": 1,
-        "title": "Ça, ça marche pas. Merci de le fix",
+        "title": "Fixe du fichier css",
         "type": "Issue",
         "status": "current"
       },
@@ -166,7 +166,7 @@
       "id": 4,
       "parent_id": 3,
       "workspace_id": 1,
-      "title": "des trucs de backend",
+      "title": "Backend appli n°578",
       "type": "File",
       "status": "outdated"
     },
@@ -174,7 +174,7 @@
       "id": 5,
       "parent_id": 3,
       "workspace_id": 1,
-      "title": "on s'emmerde",
+      "title": "La programmation fonctionnelle",
       "type": "PageHtml",
       "status": "outdated"
     },
@@ -182,7 +182,7 @@
       "id": 11,
       "parent_id": 3,
       "workspace_id": 1,
-      "title": "Hidden features",
+      "title": "ticket à fixe",
       "type": "folder",
       "content": []
     }
@@ -192,7 +192,7 @@
       "id": 12,
       "parent_id": 11,
       "workspace_id": 1,
-      "title": "flatMap",
+      "title": "ticket à fixe",
       "type": "PageHtml",
       "status": "current"
     },
@@ -200,7 +200,7 @@
       "id": 13,
       "parent_id": 11,
       "workspace_id": 1,
-      "title": "c'est tout pété",
+      "title": "issue n°555",
       "type": "Issue",
       "status": "current"
     }

src/css/AccountPage.styl

@@ -49,6 +49,7 @@ settingText()
       border-radius 10px
       padding 0
       width 20%
+      min-height 600px
       background-color off-white
       &__responsive
         font-size 20px
@@ -79,6 +80,7 @@ settingText()
       border-radius 10px
       padding 20px
       width 80%
+      min-height 600px
       background-color off-white
       .personaldata
         &__text
@@ -126,8 +128,7 @@ settingText()
               background-color blue
               color white
           &__submenu
-            width 203px
-            max-height 300px
+            max-height 265px
             overflow-Y auto
             &__item
               &:hover, &:focus
@@ -264,7 +265,7 @@ settingText()
               text-overflow ellipsis
               white-space nowrap
               overflow hidden
-              width 310px
+              width 175px
               &:focus
                 overflow visible
                 width auto

src/css/FileItem.styl

@@ -1,3 +1,8 @@
+iconrules()
+  display inline-block
+  margin-right 10px
+  font-size 20px
+
 .file
   display flex
   border-bottom 0
@@ -12,17 +17,21 @@
     justify-content space-between
     padding 15px 5px
     &__text
+      margin-right 10px
       font-size 17px
     &__icons
       &__download
-        display inline-block
-        margin-right 10px
+        iconrules()
+        &:hover, &:focus
+          color blue
       &__archive
-        display inline-block
-        margin-right 10px
+        iconrules()
+        &:hover, &:focus
+          color blue
       &__delete
-        display inline-block
-        margin-right 10px
+        iconrules()
+        &:hover, &:focus
+          color blue
   &__status
     font-size 30px
     text-align center

src/css/Folder.styl

@@ -45,7 +45,6 @@ folderopen()
       folderopen()
       & > .file, > .folder
         folderopen()
-
   &__header
     position relative
     display flex
@@ -83,7 +82,7 @@ folderopen()
         font-size 25px
         color darkBlue
       &__text
-        margin auto 15px
+        margin auto 15px auto 5px
         font-size 17px
         color darkBlue
       &__addbtn
@@ -106,6 +105,16 @@ folderopen()
         & > i
           margin-right 15px
 
+@media (min-width: min-sm) and (max-width: max-sm)
+
+  .folder
+    &__header
+      padding 10px
+      &__triangleborder
+        top 59px
+      &__contenttype
+        display none
+
 @media (max-width: max-xs)
   .folder
     &__header

src/css/Generic.styl

@@ -17,7 +17,6 @@
 @media (min-width: min-md) and (max-width: max-md)
   .pageWrapperGeneric
     display block
-    padding-top 87px
     &__header
       margin 95px 0 5px 30px
     &__content
@@ -25,7 +24,6 @@
 @media (min-width: min-sm) and (max-width: max-sm)
   .pageWrapperGeneric
     display block
-    padding-top 87px
     &__header
       margin 95px 0 35px 0
       &__title
@@ -36,7 +34,6 @@
 @media (max-width: max-xs)
   .pageWrapperGeneric
     display block
-    padding-top 87px
     &__header
       display block
       margin-top 60px
@@ -59,8 +56,9 @@
 
 
 .pageContentGeneric
-  margin 10px 0 120px 0
+  margin 10px 0 0 0
   width 100%
+  height 100%
 
 .dropdownCreateBtn
   &__label

src/css/Header.styl

@@ -94,6 +94,8 @@
               box-shadow none
           .profilgroup__setting
             padding 0
+            left inherit
+            right 0
             &__link
               padding 10px 0
 
@@ -133,5 +135,10 @@
         width 418px
         &__itemquestion
           display none
-        &__itemprofil__profilgroup
-          margin-top 20px
+        &__itemprofil
+          &__profilgroup
+            margin-top 20px
+          .profilgroup__setting
+            left 0
+
+

src/css/Sidebar.styl

@@ -48,7 +48,7 @@ leftside()
     color white
     transition all sidebar-animate-speed
   &__btnnewworkspace
-    margin-top 50px
+    margin 50px 0
     overflow hidden
     &__btn
       display block

src/css/Workspace.styl

@@ -1,6 +1,7 @@
 .workspace
   &__header
     display flex
+    flex-wrap wrap
     margin-right 15px
   &__content
     margin 0 15px
@@ -22,4 +23,4 @@
   .workspace
     &__header
       &__title
-        margin 0 0 20px 0
+        margin 0 0 20px 10px