Browse Source

modification on the account page #2

AlexiCauvin 6 years ago
parent
commit
5e0afa96f0
2 changed files with 75 additions and 77 deletions
  1. 60 60
      src/container/AccountPage.jsx
  2. 15 17
      src/css/AccountPage.styl

+ 60 - 60
src/container/AccountPage.jsx View File

69
             <div className='account__userpreference__setting'>
69
             <div className='account__userpreference__setting'>
70
 
70
 
71
               <div className='account__userpreference__setting__personaldata d-none'>
71
               <div className='account__userpreference__setting__personaldata d-none'>
72
-                <div className='account__userpreference__setting__personaldata__title subTitle ml-2 ml-sm-0'>
72
+                <div className='personaldata__title subTitle ml-2 ml-sm-0'>
73
                   Mes informations personnelles
73
                   Mes informations personnelles
74
                 </div>
74
                 </div>
75
 
75
 
76
-                <div className='account__userpreference__setting__personaldata__text ml-2 ml-sm-0'>
76
+                <div className='personaldata__text ml-2 ml-sm-0'>
77
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
77
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
78
                   Ut consectetur dolor et sunt nisi officia ut magna.
78
                   Ut consectetur dolor et sunt nisi officia ut magna.
79
                 </div>
79
                 </div>
80
 
80
 
81
-                <div className='account__userpreference__setting__personaldata__form'>
82
-                  <div className='account__userpreference__setting__personaldata__form__title'>
81
+                <div className='personaldata__form'>
82
+                  <div className='personaldata__form__title'>
83
                     Changer le mot de passe :
83
                     Changer le mot de passe :
84
                   </div>
84
                   </div>
85
-                  <input className='account__userpreference__setting__personaldata__form__txtinput form-control' type='password' placeholder='Ancien mot de passe' />
86
-                  <input className='account__userpreference__setting__personaldata__form__txtinput form-control' type='password' placeholder='Nouveau mot de passe' />
87
-                  <div className='account__userpreference__setting__personaldata__form__button btn btn-primary'>
85
+                  <input className='personaldata__form__txtinput form-control' type='password' placeholder='Ancien mot de passe' />
86
+                  <input className='personaldata__form__txtinput form-control' type='password' placeholder='Nouveau mot de passe' />
87
+                  <div className='personaldata__form__button btn btn-primary'>
88
                     Envoyer
88
                     Envoyer
89
                   </div>
89
                   </div>
90
                 </div>
90
                 </div>
91
 
91
 
92
-                <div className='account__userpreference__setting__personaldata__form'>
93
-                  <div className='account__userpreference__setting__personaldata__form__title'>
92
+                <div className='personaldata__form'>
93
+                  <div className='personaldata__form__title'>
94
                     Changer d'adresse mail :
94
                     Changer d'adresse mail :
95
                   </div>
95
                   </div>
96
-                  <input className='account__userpreference__setting__personaldata__form__txtinput form-control' type='email' placeholder='Ancienne adresse mail' />
97
-                  <input className='account__userpreference__setting__personaldata__form__txtinput form-control' type='email' placeholder='Nouvelle adresse mail' />
98
-                  <div className='account__userpreference__setting__personaldata__form__button btn btn-primary'>
96
+                  <input className='personaldata__form__txtinput form-control' type='email' placeholder='Ancienne adresse mail' />
97
+                  <input className='personaldata__form__txtinput form-control' type='email' placeholder='Nouvelle adresse mail' />
98
+                  <div className='personaldata__form__button btn btn-primary'>
99
                     Envoyer
99
                     Envoyer
100
                   </div>
100
                   </div>
101
                 </div>
101
                 </div>
103
 
103
 
104
               <div className='account__userpreference__setting__calendar d-none'>
104
               <div className='account__userpreference__setting__calendar d-none'>
105
 
105
 
106
-                <div className='account__userpreference__setting__calendar__title subTitle ml-2 ml-sm-0'>
106
+                <div className='calendar__title subTitle ml-2 ml-sm-0'>
107
                   Calendrier
107
                   Calendrier
108
                 </div>
108
                 </div>
109
 
109
 
110
-                <div className='account__userpreference__setting__calendar__text ml-2 ml-sm-0'>
110
+                <div className='calendar__text ml-2 ml-sm-0'>
111
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
111
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
112
                   Ut consectetur dolor et sunt nisi officia ut magna.
112
                   Ut consectetur dolor et sunt nisi officia ut magna.
113
                 </div>
113
                 </div>
114
 
114
 
115
-                <div className='account__userpreference__setting__calendar__title'>
115
+                <div className='calendar__title ml-2 ml-sm-0'>
116
                   Accèder à votre Calendrier personnel
116
                   Accèder à votre Calendrier personnel
117
                 </div>
117
                 </div>
118
-                <div className='account__userpreference__setting__calendar__link'>
118
+                <div className='calendar__link ml-2 ml-sm-0'>
119
                   http://algoo.trac.im/caldav/user/262.ics/
119
                   http://algoo.trac.im/caldav/user/262.ics/
120
                 </div>
120
                 </div>
121
 
121
 
122
-                <div className='account__userpreference__setting__calendar__title'>
122
+                <div className='calendar__title ml-2 ml-sm-0'>
123
                   Changer de Fuseau Horaire :
123
                   Changer de Fuseau Horaire :
124
                 </div>
124
                 </div>
125
 
125
 
126
-                <div className='account__userpreference__setting__calendar__timezone dropdown'>
127
-                  <button className='account__userpreference__setting__calendar__timezone__btn btn dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
126
+                <div className='calendar__timezone ml-2 ml-sm-0 dropdown'>
127
+                  <button className='calendar__timezone__btn btn dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
128
                     Fuseau Horaire
128
                     Fuseau Horaire
129
                   </button>
129
                   </button>
130
-                  <div className='account__userpreference__setting__calendar__timezone__submenu dropdown-menu'>
131
-                    <div className='account__userpreference__setting__calendar__timezone__submenu__item dropdown-item'> Paris GMT +1
130
+                  <div className='calendar__timezone__submenu dropdown-menu'>
131
+                    <div className='calendar__timezone__submenu__item dropdown-item'> Paris GMT +1
132
                     </div>
132
                     </div>
133
-                    <div className='account__userpreference__setting__calendar__timezone__submenu__item dropdown-item dropdown-item'> Londres GMT +0
133
+                    <div className='calendar__timezone__submenu__item dropdown-item dropdown-item'> Londres GMT +0
134
                     </div>
134
                     </div>
135
                   </div>
135
                   </div>
136
                 </div>
136
                 </div>
138
 
138
 
139
               <div className='account__userpreference__setting__notification'>
139
               <div className='account__userpreference__setting__notification'>
140
 
140
 
141
-                <div className='account__userpreference__setting__notification__title subTitle ml-2 ml-sm-0'>
141
+                <div className='notification__title subTitle ml-2 ml-sm-0'>
142
                   Mes Espaces de Travail
142
                   Mes Espaces de Travail
143
                 </div>
143
                 </div>
144
 
144
 
145
-                <div className='account__userpreference__setting__notification__text ml-2 ml-sm-0'>
145
+                <div className='notification__text ml-2 ml-sm-0'>
146
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
146
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
147
                   Ut consectetur dolor et sunt nisi officia ut magna.
147
                   Ut consectetur dolor et sunt nisi officia ut magna.
148
                 </div>
148
                 </div>
149
 
149
 
150
-                <div className='account__userpreference__setting__notification__table'>
150
+                <div className='notification__table'>
151
                   <table className='table'>
151
                   <table className='table'>
152
                     <thead>
152
                     <thead>
153
                       <tr>
153
                       <tr>
159
                     <tbody>
159
                     <tbody>
160
                       <tr>
160
                       <tr>
161
                         <td>
161
                         <td>
162
-                          <div className='account__userpreference__setting__notification__table__wksname'>
162
+                          <div className='notification__table__wksname'>
163
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
163
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
164
                           </div>
164
                           </div>
165
                         </td>
165
                         </td>
166
                         <td>
166
                         <td>
167
-                          <div className='account__userpreference__setting__notification__table__role'>
168
-                            <div className='account__userpreference__setting__notification__table__role__icon'>
167
+                          <div className='notification__table__role'>
168
+                            <div className='notification__table__role__icon'>
169
                               <i className='fa fa-graduation-cap' />
169
                               <i className='fa fa-graduation-cap' />
170
                             </div>
170
                             </div>
171
-                            <div className='account__userpreference__setting__notification__table__role__text'>
171
+                            <div className='notification__table__role__text d-none d-sm-flex'>
172
                               Gestionnaire de Contenu
172
                               Gestionnaire de Contenu
173
                             </div>
173
                             </div>
174
                           </div>
174
                           </div>
175
                         </td>
175
                         </td>
176
                         <td>
176
                         <td>
177
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
177
+                          <div className='notification__table__btnswitch'>
178
                             <BtnSwitch />
178
                             <BtnSwitch />
179
                           </div>
179
                           </div>
180
                         </td>
180
                         </td>
181
                       </tr>
181
                       </tr>
182
                       <tr>
182
                       <tr>
183
                         <td>
183
                         <td>
184
-                          <div className='account__userpreference__setting__notification__table__wksname'>
184
+                          <div className='notification__table__wksname'>
185
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
185
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
186
                           </div>
186
                           </div>
187
                         </td>
187
                         </td>
188
                         <td>
188
                         <td>
189
-                          <div className='account__userpreference__setting__notification__table__role'>
190
-                            <div className='account__userpreference__setting__notification__table__role__icon'>
189
+                          <div className='notification__table__role'>
190
+                            <div className='notification__table__role__icon'>
191
                               <i className='fa fa-eye' />
191
                               <i className='fa fa-eye' />
192
                             </div>
192
                             </div>
193
-                            <div className='account__userpreference__setting__notification__table__role__text'>
193
+                            <div className='notification__table__role__text d-none d-sm-flex'>
194
                               Lecteur
194
                               Lecteur
195
                             </div>
195
                             </div>
196
                           </div>
196
                           </div>
197
                         </td>
197
                         </td>
198
                         <td>
198
                         <td>
199
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
199
+                          <div className='notification__table__btnswitch'>
200
                             <BtnSwitch />
200
                             <BtnSwitch />
201
                           </div>
201
                           </div>
202
                         </td>
202
                         </td>
203
                       </tr>
203
                       </tr>
204
                       <tr>
204
                       <tr>
205
                         <td>
205
                         <td>
206
-                          <div className='account__userpreference__setting__notification__table__wksname'>
206
+                          <div className='notification__table__wksname'>
207
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
207
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
208
                           </div>
208
                           </div>
209
                         </td>
209
                         </td>
210
                         <td>
210
                         <td>
211
-                          <div className='account__userpreference__setting__notification__table__role'>
212
-                            <div className='account__userpreference__setting__notification__table__role__icon'>
211
+                          <div className='notification__table__role'>
212
+                            <div className='notification__table__role__icon'>
213
                               <i className='fa fa-pencil' />
213
                               <i className='fa fa-pencil' />
214
                             </div>
214
                             </div>
215
-                            <div className='account__userpreference__setting__notification__table__role__text'>
215
+                            <div className='notification__table__role__text d-none d-sm-flex'>
216
                               Contributeur
216
                               Contributeur
217
                             </div>
217
                             </div>
218
                           </div>
218
                           </div>
219
                         </td>
219
                         </td>
220
                         <td>
220
                         <td>
221
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
221
+                          <div className='notification__table__btnswitch'>
222
                             <BtnSwitch />
222
                             <BtnSwitch />
223
                           </div>
223
                           </div>
224
                         </td>
224
                         </td>
225
                       </tr>
225
                       </tr>
226
                       <tr>
226
                       <tr>
227
                         <td>
227
                         <td>
228
-                          <div className='account__userpreference__setting__notification__table__wksname'>
228
+                          <div className='notification__table__wksname'>
229
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
229
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
230
                           </div>
230
                           </div>
231
                         </td>
231
                         </td>
232
                         <td>
232
                         <td>
233
-                          <div className='account__userpreference__setting__notification__table__role'>
234
-                            <div className='account__userpreference__setting__notification__table__role__icon'>
233
+                          <div className='notification__table__role'>
234
+                            <div className='notification__table__role__icon'>
235
                               <i className='fa fa-gavel' />
235
                               <i className='fa fa-gavel' />
236
                             </div>
236
                             </div>
237
-                            <div className='account__userpreference__setting__notification__table__role__text'>
237
+                            <div className='notification__table__role__text d-none d-sm-flex'>
238
                               Responsable
238
                               Responsable
239
                             </div>
239
                             </div>
240
                           </div>
240
                           </div>
241
                         </td>
241
                         </td>
242
                         <td>
242
                         <td>
243
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
243
+                          <div className='notification__table__btnswitch'>
244
                             <BtnSwitch />
244
                             <BtnSwitch />
245
                           </div>
245
                           </div>
246
                         </td>
246
                         </td>
247
                       </tr>
247
                       </tr>
248
                       <tr>
248
                       <tr>
249
                         <td>
249
                         <td>
250
-                          <div className='account__userpreference__setting__notification__table__wksname'>
250
+                          <div className='notification__table__wksname'>
251
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
251
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
252
                           </div>
252
                           </div>
253
                         </td>
253
                         </td>
254
                         <td>
254
                         <td>
255
-                          <div className='account__userpreference__setting__notification__table__role'>
256
-                            <div className='account__userpreference__setting__notification__table__role__icon'>
255
+                          <div className='notification__table__role'>
256
+                            <div className='notification__table__role__icon'>
257
                               <i className='fa fa-graduation-cap' />
257
                               <i className='fa fa-graduation-cap' />
258
                             </div>
258
                             </div>
259
-                            <div className='account__userpreference__setting__notification__table__role__text'>
259
+                            <div className='notification__table__role__text d-none d-sm-flex'>
260
                               Gestionnaire de Contenu
260
                               Gestionnaire de Contenu
261
                             </div>
261
                             </div>
262
                           </div>
262
                           </div>
263
                         </td>
263
                         </td>
264
                         <td>
264
                         <td>
265
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
265
+                          <div className='notification__table__btnswitch'>
266
                             <BtnSwitch />
266
                             <BtnSwitch />
267
                           </div>
267
                           </div>
268
                         </td>
268
                         </td>
269
                       </tr>
269
                       </tr>
270
                       <tr>
270
                       <tr>
271
                         <td>
271
                         <td>
272
-                          <div className='account__userpreference__setting__notification__table__wksname'>
272
+                          <div className='notification__table__wksname'>
273
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
273
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
274
                           </div>
274
                           </div>
275
                         </td>
275
                         </td>
276
                         <td>
276
                         <td>
277
-                          <div className='account__userpreference__setting__notification__table__role'>
278
-                            <div className='account__userpreference__setting__notification__table__role__icon'>
277
+                          <div className='notification__table__role'>
278
+                            <div className='notification__table__role__icon'>
279
                               <i className='fa fa-graduation-cap' />
279
                               <i className='fa fa-graduation-cap' />
280
                             </div>
280
                             </div>
281
-                            <div className='account__userpreference__setting__notification__table__role__text'>
281
+                            <div className='notification__table__role__text d-none d-sm-flex'>
282
                               Gestionnaire de Contenu
282
                               Gestionnaire de Contenu
283
                             </div>
283
                             </div>
284
                           </div>
284
                           </div>
285
                         </td>
285
                         </td>
286
                         <td>
286
                         <td>
287
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
287
+                          <div className='notification__table__btnswitch'>
288
                             <BtnSwitch />
288
                             <BtnSwitch />
289
                           </div>
289
                           </div>
290
                         </td>
290
                         </td>
291
                       </tr>
291
                       </tr>
292
                       <tr>
292
                       <tr>
293
                         <td>
293
                         <td>
294
-                          <div className='account__userpreference__setting__notification__table__wksname'>
294
+                          <div className='notification__table__wksname'>
295
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
295
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
296
                           </div>
296
                           </div>
297
                         </td>
297
                         </td>
298
                         <td>
298
                         <td>
299
-                          <div className='account__userpreference__setting__notification__table__role'>
300
-                            <div className='account__userpreference__setting__notification__table__role__icon'>
299
+                          <div className='notification__table__role'>
300
+                            <div className='notification__table__role__icon'>
301
                               <i className='fa fa-graduation-cap' />
301
                               <i className='fa fa-graduation-cap' />
302
                             </div>
302
                             </div>
303
-                            <div className='account__userpreference__setting__notification__table__role__text'>
303
+                            <div className='notification__table__role__text d-none d-sm-flex'>
304
                               Gestionnaire de Contenu
304
                               Gestionnaire de Contenu
305
                             </div>
305
                             </div>
306
                           </div>
306
                           </div>
307
                         </td>
307
                         </td>
308
                         <td>
308
                         <td>
309
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
309
+                          <div className='notification__table__btnswitch'>
310
                             <BtnSwitch />
310
                             <BtnSwitch />
311
                           </div>
311
                           </div>
312
                         </td>
312
                         </td>

+ 15 - 17
src/css/AccountPage.styl View File

12
   background-color grey-hover
12
   background-color grey-hover
13
 
13
 
14
 .account
14
 .account
15
+  width 100%
15
   &__userinformation
16
   &__userinformation
16
     display flex
17
     display flex
17
     justify-content center
18
     justify-content center
62
           font-size 20px
63
           font-size 20px
63
           cursor pointer
64
           cursor pointer
64
         &__disabled
65
         &__disabled
65
-          padding 25px 20px 20px 20px
66
+          padding 25px 20px 20px 16px
66
           color grey
67
           color grey
67
           font-size 18px
68
           font-size 18px
68
         &__item
69
         &__item
69
           margin-top 10px
70
           margin-top 10px
70
-          padding-left 5px
71
           font-weight 500
71
           font-weight 500
72
           font-size 18px
72
           font-size 18px
73
           cursor pointer
73
           cursor pointer
79
       padding 20px
79
       padding 20px
80
       width 80%
80
       width 80%
81
       background-color off-white
81
       background-color off-white
82
-      &__personaldata
82
+      .personaldata
83
         &__text
83
         &__text
84
           settingText()
84
           settingText()
85
         &__form
85
         &__form
92
             width auto
92
             width auto
93
             margin 0 15px 15px 0
93
             margin 0 15px 15px 0
94
             border 1px solid blue
94
             border 1px solid blue
95
-            border-radius 10px
95
+            border-radius 5px
96
             padding 8px 15px
96
             padding 8px 15px
97
           &__button
97
           &__button
98
             vertical-align top
98
             vertical-align top
99
             border 1px solid blue
99
             border 1px solid blue
100
-            border-radius 10px
100
+            border-radius 5px
101
             padding 8px 25px
101
             padding 8px 25px
102
-            background-color transparent
103
-            color blue
104
             cursor pointer
102
             cursor pointer
105
-            &:hover, &:focus
106
-              background-color blue
107
-              color white
108
-      &__calendar
103
+      .calendar
109
         &__text
104
         &__text
110
           settingText()
105
           settingText()
111
         &__title
106
         &__title
114
         &__link
109
         &__link
115
           display inline-block
110
           display inline-block
116
           border 1px solid grey
111
           border 1px solid grey
117
-          border-radius 10px
112
+          border-radius 5px
118
           padding 10px 25px
113
           padding 10px 25px
119
         &__timezone
114
         &__timezone
120
           margin 15px 0 30px 0
115
           margin 15px 0 30px 0
121
           &__btn
116
           &__btn
122
             border 1px solid blue
117
             border 1px solid blue
123
-            border-radius 10px
118
+            border-radius 5px
124
             padding 10px 35px
119
             padding 10px 35px
125
             color blue
120
             color blue
126
             background-color transparent
121
             background-color transparent
137
               &:hover, &:focus
132
               &:hover, &:focus
138
                 background-color blue
133
                 background-color blue
139
                 color white
134
                 color white
140
-      &__notification
135
+      .notification
141
         &__text
136
         &__text
142
           settingText()
137
           settingText()
143
           margin-bottom 30px
138
           margin-bottom 30px
256
         border-radius 0
251
         border-radius 0
257
         padding 10px 0
252
         padding 10px 0
258
         width 100%
253
         width 100%
259
-        &__calendar
254
+        .personaldata
255
+          &__form
256
+            margin-left 10px
257
+        .calendar
260
           &__link
258
           &__link
261
             padding 10px 15px
259
             padding 10px 15px
262
-        &__notification
260
+        .notification
263
           &__table
261
           &__table
264
             &__wksname
262
             &__wksname
265
               text-overflow ellipsis
263
               text-overflow ellipsis
266
               white-space nowrap
264
               white-space nowrap
267
               overflow hidden
265
               overflow hidden
268
-              width 100px
266
+              width 310px
269
               &:focus
267
               &:focus
270
                 overflow visible
268
                 overflow visible
271
                 width auto
269
                 width auto