Przeglądaj źródła

rework of the footer and correction of the responsive in progress

AlexiCauvin 5 lat temu
rodzic
commit
dea04ffa8f

+ 2 - 3
src/container/Dashboard.jsx Wyświetl plik

434
                     <form className='dashboard__memberlist__form'>
434
                     <form className='dashboard__memberlist__form'>
435
                       <div
435
                       <div
436
                         className='dashboard__memberlist__form__close d-flex justify-content-end'
436
                         className='dashboard__memberlist__form__close d-flex justify-content-end'
437
-                        onClick={this.handleToggleNewMemberDashboard}
438
                       >
437
                       >
439
-                        <i className='fa fa-times' />
438
+                        <i className='fa fa-times' onClick={this.handleToggleNewMemberDashboard} />
440
                       </div>
439
                       </div>
441
                       <div className='dashboard__memberlist__form__member'>
440
                       <div className='dashboard__memberlist__form__member'>
442
                         <div className='dashboard__memberlist__form__member__name'>
441
                         <div className='dashboard__memberlist__form__member__name'>
521
             </div>
520
             </div>
522
 
521
 
523
             <div className='dashboard__moreinfo'>
522
             <div className='dashboard__moreinfo'>
524
-              <div className='dashboard__moreinfo__webdav genericBtnInfoDashboard mr-5'>
523
+              <div className='dashboard__moreinfo__webdav genericBtnInfoDashboard'>
525
                 <div
524
                 <div
526
                   className='dashboard__moreinfo__webdav__btn genericBtnInfoDashboard__btn'
525
                   className='dashboard__moreinfo__webdav__btn genericBtnInfoDashboard__btn'
527
                   onClick={this.handleToggleWebdavBtn}
526
                   onClick={this.handleToggleWebdavBtn}

+ 9 - 0
src/container/Sidebar.jsx Wyświetl plik

88
               {t('Sidebar.create_new_workspace')}
88
               {t('Sidebar.create_new_workspace')}
89
             </button>
89
             </button>
90
           </div>
90
           </div>
91
+
92
+          <div className='sidebar__footer mb-2'>
93
+            <div className='sidebar__footer__text d-flex align-items-end justify-content-center'>
94
+              Copyright - 2013 - 2018
95
+              <div className='sidebar__footer__text__link'>
96
+                <a href='http://www.tracim.fr/' target='_blank' className='ml-3'>tracim.fr</a>
97
+              </div>
98
+            </div>
99
+          </div>
91
         </div>
100
         </div>
92
       </div>
101
       </div>
93
     )
102
     )

+ 2 - 1
src/container/Tracim.jsx Wyświetl plik

72
           <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
72
           <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
73
           <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
73
           <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
74
 
74
 
75
-          <Footer />
75
+          {/* <Footer /> */}
76
+
76
         </div>
77
         </div>
77
 
78
 
78
       </div>
79
       </div>

+ 1 - 1
src/container/WorkspaceContent.jsx Wyświetl plik

274
             </div>
274
             </div>
275
 
275
 
276
             <DropdownCreateButton
276
             <DropdownCreateButton
277
-              customClass='workspace__content__button mb-5'
277
+              customClass='workspace__content__button'
278
               idFolder={null}
278
               idFolder={null}
279
               onClickCreateContent={this.handleClickCreateContent}
279
               onClickCreateContent={this.handleClickCreateContent}
280
               availableApp={contentType}
280
               availableApp={contentType}

+ 0 - 3
src/css/ContentItem.styl Wyświetl plik

30
     justify-content space-between
30
     justify-content space-between
31
     flex-grow 2
31
     flex-grow 2
32
     flex-shrink 2
32
     flex-shrink 2
33
-    white-space nowrap
34
-    overflow hidden
35
-    text-overflow ellipsis
36
     &__text
33
     &__text
37
       margin-right 10px
34
       margin-right 10px
38
       font-size 17px
35
       font-size 17px

+ 2 - 1
src/css/Dashboard.styl Wyświetl plik

224
       background-color off-white
224
       background-color off-white
225
       &__close
225
       &__close
226
         font-size 20px
226
         font-size 20px
227
-        cursor pointer
227
+        & > i
228
+          cursor pointer
228
       &__member
229
       &__member
229
         &__name
230
         &__name
230
           .name__label
231
           .name__label

+ 11 - 0
src/css/ExtandedAction.styl Wyświetl plik

6
     .subdropdown
6
     .subdropdown
7
       &__item
7
       &__item
8
         padding 10px
8
         padding 10px
9
+
10
+
11
+@media (min-width: min-sm) and (max-width: max-md)
12
+
13
+  .extandedaction
14
+    display none
15
+
16
+@media (max-width: max-xs)
17
+
18
+  .extandedaction
19
+    display none

+ 57 - 57
src/css/File.styl Wyświetl plik

202
                 &__icon
202
                 &__icon
203
                   margin-left 15px
203
                   margin-left 15px
204
 
204
 
205
-/**** MEDIA 992px & 1199px ****/
205
+// /**** MEDIA 992px & 1199px ****/
206
 
206
 
207
-@media (min-width: min-lg) and (max-width: max-lg)
207
+// @media (min-width: min-lg) and (max-width: max-lg)
208
 
208
 
209
-  .wsFileFile
210
-    width 900px
211
-    overflow-Y auto
209
+//   .wsFileFile
210
+//     width 900px
211
+//     overflow-Y auto
212
 
212
 
213
-/******************************/
213
+// /******************************/
214
 
214
 
215
-/**** MEDIA 768px & 991px ****/
215
+// /**** MEDIA 768px & 991px ****/
216
 
216
 
217
-@media (min-width: min-md) and (max-width: max-md)
217
+// @media (min-width: min-md) and (max-width: max-md)
218
 
218
 
219
-  .wsFileFile
220
-    width 100%
219
+//   .wsFileFile
220
+//     width 100%
221
 
221
 
222
-/******************************/
222
+// /******************************/
223
 
223
 
224
-/**** MEDIA 576px & 767px ****/
224
+// /**** MEDIA 576px & 767px ****/
225
 
225
 
226
-@media (min-width: min-sm) and (max-width: max-sm)
226
+// @media (min-width: min-sm) and (max-width: max-sm)
227
 
227
 
228
-  .wsFileFile
229
-    top 69px
230
-    width 100%
231
-    height calc(100% - 69px) // 69px => top rules
232
-    overflow-Y scroll
228
+//   .wsFileFile
229
+//     top 69px
230
+//     width 100%
231
+//     height calc(100% - 69px) // 69px => top rules
232
+//     overflow-Y scroll
233
 
233
 
234
-/******************************/
234
+// /******************************/
235
 
235
 
236
-/**** MEDIA 575px ****/
236
+// /**** MEDIA 575px ****/
237
 
237
 
238
-@media (max-width: max-xs)
238
+// @media (max-width: max-xs)
239
 
239
 
240
-  .activesidebar
241
-    .wsFileFile__contentpage__preview
242
-      &__sidebar
243
-        &__property
244
-          width 300px
240
+//   .activesidebar
241
+//     .wsFileFile__contentpage__preview
242
+//       &__sidebar
243
+//         &__property
244
+//           width 300px
245
 
245
 
246
-  .wsFileFile
247
-    top 69px
248
-    width 100%
249
-    height calc(100% - 69px) // 69px => top rules
250
-    overflow-Y scroll
251
-    &__option__menu__addversion
252
-        padding 8px 5px
253
-        & > i
254
-          display none
255
-    &__contentpage
256
-      display block
257
-      &__preview
258
-        display flex
259
-        flex-direction column
260
-        width calc(100% - 30px) // 30px => margin
261
-      &__wrapper
262
-        width calc(100% - 30px) // 30px => margin
263
-        .timeline
264
-          &__texteditor
265
-            &__simpletext
266
-              display inline-flex
267
-              width 60%
268
-              margin-right 0
269
-            &__submit
270
-              display inline-flex
271
-              margin 10px 0
272
-              &__btn
273
-                display flex
274
-                margin-left 10px
275
-                &__icon
276
-                  margin-left 15px
246
+//   .wsFileFile
247
+//     top 69px
248
+//     width 100%
249
+//     height calc(100% - 69px) // 69px => top rules
250
+//     overflow-Y scroll
251
+//     &__option__menu__addversion
252
+//         padding 8px 5px
253
+//         & > i
254
+//           display none
255
+//     &__contentpage
256
+//       display block
257
+//       &__preview
258
+//         display flex
259
+//         flex-direction column
260
+//         width calc(100% - 30px) // 30px => margin
261
+//       &__wrapper
262
+//         width calc(100% - 30px) // 30px => margin
263
+//         .timeline
264
+//           &__texteditor
265
+//             &__simpletext
266
+//               display inline-flex
267
+//               width 60%
268
+//               margin-right 0
269
+//             &__submit
270
+//               display inline-flex
271
+//               margin 10px 0
272
+//               &__btn
273
+//                 display flex
274
+//                 margin-left 10px
275
+//                 &__icon
276
+//                   margin-left 15px

+ 7 - 1
src/css/Folder.styl Wyświetl plik

91
       white-space nowrap
91
       white-space nowrap
92
       text-overflow ellipsis
92
       text-overflow ellipsis
93
       overflow hidden
93
       overflow hidden
94
-      width 400px
95
       font-size 17px
94
       font-size 17px
96
       color darkGrey
95
       color darkGrey
97
     &__button
96
     &__button
128
         & > i
127
         & > i
129
           margin-right 3px
128
           margin-right 3px
130
 
129
 
130
+@media (min-width: min-sm) and (max-width: max-md)
131
+
132
+  .folder__header__button
133
+    display none
134
+
131
 @media (max-width: max-xs)
135
 @media (max-width: max-xs)
132
   .folder
136
   .folder
133
     &__header
137
     &__header
137
           font-size 20px
141
           font-size 20px
138
         &__text
142
         &__text
139
           font-size 15px
143
           font-size 15px
144
+      &__button
145
+        display none
140
 
146
 

+ 1 - 1
src/css/Generic.styl Wyświetl plik

61
 .sidebarpagecontainer
61
 .sidebarpagecontainer
62
   display flex
62
   display flex
63
   padding-top 88px
63
   padding-top 88px
64
-  min-height calc(100% - 50px)
64
+  min-height 100%
65
 
65
 
66
 .pageWrapperGeneric
66
 .pageWrapperGeneric
67
   width 100%
67
   width 100%

+ 18 - 3
src/css/Sidebar.styl Wyświetl plik

6
   border-top-width 2px
6
   border-top-width 2px
7
   padding 11px 15px
7
   padding 11px 15px
8
   background-color blue
8
   background-color blue
9
-  z-index 2
9
+  z-index 5
10
   &__icon
10
   &__icon
11
     font-size 18px
11
     font-size 18px
12
     text-align center
12
     text-align center
27
 .sidebarSticky
27
 .sidebarSticky
28
   position sticky
28
   position sticky
29
   top 87px
29
   top 87px
30
+  display flex
31
+  flex-direction column
32
+  justify-content space-between
33
+  height 100%
30
 
34
 
31
 leftside()
35
 leftside()
32
   height 100%
36
   height 100%
37
   position relative
41
   position relative
38
   transition all sidebar-animate-speed
42
   transition all sidebar-animate-speed
39
   width sidebar-width
43
   width sidebar-width
40
-  z-index 4
44
+  z-index 5
41
   &.sidebarclose
45
   &.sidebarclose
42
     width 0
46
     width 0
43
   &__expand
47
   &__expand
44
     position absolute
48
     position absolute
45
     top 0
49
     top 0
46
-    right -43px
50
+    right -42px
47
     display flex
51
     display flex
48
     justify-content center
52
     justify-content center
49
     align-items center
53
     align-items center
131
             &.activeFilter
135
             &.activeFilter
132
               .dropdown__icon
136
               .dropdown__icon
133
                 background-color rgba(253, 253, 253, 0.8)
137
                 background-color rgba(253, 253, 253, 0.8)
138
+  &__footer
139
+    &__text
140
+      color off-white
141
+      font-size 14px
142
+      &__link
143
+        & > a
144
+          color off-white
145
+          font-size 14px
146
+          &:hover
147
+            text-decoration underline
148
+            color fourthColor
134
 
149
 
135
 /***** MEDIA 992px and 1199px ******/
150
 /***** MEDIA 992px and 1199px ******/
136
 
151