瀏覽代碼

modification on the account page #2

AlexiCauvin 6 年之前
父節點
當前提交
5e0afa96f0
共有 2 個文件被更改,包括 75 次插入77 次删除
  1. 60 60
      src/container/AccountPage.jsx
  2. 15 17
      src/css/AccountPage.styl

+ 60 - 60
src/container/AccountPage.jsx 查看文件

@@ -69,33 +69,33 @@ class AccountPage extends Component {
69 69
             <div className='account__userpreference__setting'>
70 70
 
71 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 73
                   Mes informations personnelles
74 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 77
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
78 78
                   Ut consectetur dolor et sunt nisi officia ut magna.
79 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 83
                     Changer le mot de passe :
84 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 88
                     Envoyer
89 89
                   </div>
90 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 94
                     Changer d'adresse mail :
95 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 99
                     Envoyer
100 100
                   </div>
101 101
                 </div>
@@ -103,34 +103,34 @@ class AccountPage extends Component {
103 103
 
104 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 107
                   Calendrier
108 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 111
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
112 112
                   Ut consectetur dolor et sunt nisi officia ut magna.
113 113
                 </div>
114 114
 
115
-                <div className='account__userpreference__setting__calendar__title'>
115
+                <div className='calendar__title ml-2 ml-sm-0'>
116 116
                   Accèder à votre Calendrier personnel
117 117
                 </div>
118
-                <div className='account__userpreference__setting__calendar__link'>
118
+                <div className='calendar__link ml-2 ml-sm-0'>
119 119
                   http://algoo.trac.im/caldav/user/262.ics/
120 120
                 </div>
121 121
 
122
-                <div className='account__userpreference__setting__calendar__title'>
122
+                <div className='calendar__title ml-2 ml-sm-0'>
123 123
                   Changer de Fuseau Horaire :
124 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 128
                     Fuseau Horaire
129 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 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 134
                     </div>
135 135
                   </div>
136 136
                 </div>
@@ -138,16 +138,16 @@ class AccountPage extends Component {
138 138
 
139 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 142
                   Mes Espaces de Travail
143 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 146
                   Ut consectetur dolor et sunt nisi officia ut magna. Ut consectetur dolor et sunt nisi officia ut magna.
147 147
                   Ut consectetur dolor et sunt nisi officia ut magna.
148 148
                 </div>
149 149
 
150
-                <div className='account__userpreference__setting__notification__table'>
150
+                <div className='notification__table'>
151 151
                   <table className='table'>
152 152
                     <thead>
153 153
                       <tr>
@@ -159,154 +159,154 @@ class AccountPage extends Component {
159 159
                     <tbody>
160 160
                       <tr>
161 161
                         <td>
162
-                          <div className='account__userpreference__setting__notification__table__wksname'>
162
+                          <div className='notification__table__wksname'>
163 163
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
164 164
                           </div>
165 165
                         </td>
166 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 169
                               <i className='fa fa-graduation-cap' />
170 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 172
                               Gestionnaire de Contenu
173 173
                             </div>
174 174
                           </div>
175 175
                         </td>
176 176
                         <td>
177
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
177
+                          <div className='notification__table__btnswitch'>
178 178
                             <BtnSwitch />
179 179
                           </div>
180 180
                         </td>
181 181
                       </tr>
182 182
                       <tr>
183 183
                         <td>
184
-                          <div className='account__userpreference__setting__notification__table__wksname'>
184
+                          <div className='notification__table__wksname'>
185 185
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
186 186
                           </div>
187 187
                         </td>
188 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 191
                               <i className='fa fa-eye' />
192 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 194
                               Lecteur
195 195
                             </div>
196 196
                           </div>
197 197
                         </td>
198 198
                         <td>
199
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
199
+                          <div className='notification__table__btnswitch'>
200 200
                             <BtnSwitch />
201 201
                           </div>
202 202
                         </td>
203 203
                       </tr>
204 204
                       <tr>
205 205
                         <td>
206
-                          <div className='account__userpreference__setting__notification__table__wksname'>
206
+                          <div className='notification__table__wksname'>
207 207
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
208 208
                           </div>
209 209
                         </td>
210 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 213
                               <i className='fa fa-pencil' />
214 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 216
                               Contributeur
217 217
                             </div>
218 218
                           </div>
219 219
                         </td>
220 220
                         <td>
221
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
221
+                          <div className='notification__table__btnswitch'>
222 222
                             <BtnSwitch />
223 223
                           </div>
224 224
                         </td>
225 225
                       </tr>
226 226
                       <tr>
227 227
                         <td>
228
-                          <div className='account__userpreference__setting__notification__table__wksname'>
228
+                          <div className='notification__table__wksname'>
229 229
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
230 230
                           </div>
231 231
                         </td>
232 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 235
                               <i className='fa fa-gavel' />
236 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 238
                               Responsable
239 239
                             </div>
240 240
                           </div>
241 241
                         </td>
242 242
                         <td>
243
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
243
+                          <div className='notification__table__btnswitch'>
244 244
                             <BtnSwitch />
245 245
                           </div>
246 246
                         </td>
247 247
                       </tr>
248 248
                       <tr>
249 249
                         <td>
250
-                          <div className='account__userpreference__setting__notification__table__wksname'>
250
+                          <div className='notification__table__wksname'>
251 251
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
252 252
                           </div>
253 253
                         </td>
254 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 257
                               <i className='fa fa-graduation-cap' />
258 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 260
                               Gestionnaire de Contenu
261 261
                             </div>
262 262
                           </div>
263 263
                         </td>
264 264
                         <td>
265
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
265
+                          <div className='notification__table__btnswitch'>
266 266
                             <BtnSwitch />
267 267
                           </div>
268 268
                         </td>
269 269
                       </tr>
270 270
                       <tr>
271 271
                         <td>
272
-                          <div className='account__userpreference__setting__notification__table__wksname'>
272
+                          <div className='notification__table__wksname'>
273 273
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
274 274
                           </div>
275 275
                         </td>
276 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 279
                               <i className='fa fa-graduation-cap' />
280 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 282
                               Gestionnaire de Contenu
283 283
                             </div>
284 284
                           </div>
285 285
                         </td>
286 286
                         <td>
287
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
287
+                          <div className='notification__table__btnswitch'>
288 288
                             <BtnSwitch />
289 289
                           </div>
290 290
                         </td>
291 291
                       </tr>
292 292
                       <tr>
293 293
                         <td>
294
-                          <div className='account__userpreference__setting__notification__table__wksname'>
294
+                          <div className='notification__table__wksname'>
295 295
                             Nouvelle ligne directrice du nouveau design de Tracim v2 en date du 10 Octobre 2017
296 296
                           </div>
297 297
                         </td>
298 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 301
                               <i className='fa fa-graduation-cap' />
302 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 304
                               Gestionnaire de Contenu
305 305
                             </div>
306 306
                           </div>
307 307
                         </td>
308 308
                         <td>
309
-                          <div className='account__userpreference__setting__notification__table__btnswitch'>
309
+                          <div className='notification__table__btnswitch'>
310 310
                             <BtnSwitch />
311 311
                           </div>
312 312
                         </td>

+ 15 - 17
src/css/AccountPage.styl 查看文件

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