Commit 7dd1a01d8386b489b6197bd84e4a415d3e61415c
1 parent
c470d0dd
Corrigé incohérences CSS
Fix #1 Toujours pas d'animation dans la navbar cependant
Showing
4 changed files
with
17 additions
and
27 deletions
Show diff stats
public/css/style.css
@@ -12,7 +12,7 @@ body { | @@ -12,7 +12,7 @@ body { | ||
12 | 12 | ||
13 | [ng-repeat].ng-enter { | 13 | [ng-repeat].ng-enter { |
14 | -webkit-animation: fadeInRight 0.5s; | 14 | -webkit-animation: fadeInRight 0.5s; |
15 | - animation: fadeInLeft 0.5s; | 15 | + animation: fadeInRight 0.5s; |
16 | } | 16 | } |
17 | 17 | ||
18 | [ng-repeat].ng-leave { | 18 | [ng-repeat].ng-leave { |
@@ -20,14 +20,14 @@ body { | @@ -20,14 +20,14 @@ body { | ||
20 | animation: fadeOutLeft 0.5s; | 20 | animation: fadeOutLeft 0.5s; |
21 | } | 21 | } |
22 | 22 | ||
23 | -[ng-if].ng-enter { | 23 | +[ng-if].ng-enter, [ng-show].ng-enter, [ng-hide].ng-enter { |
24 | -webkit-animation: zoomIn 0.5s; | 24 | -webkit-animation: zoomIn 0.5s; |
25 | - animation: fadeInLeft 0.5s; | 25 | + animation: zoomIn 0.5s; |
26 | } | 26 | } |
27 | 27 | ||
28 | -[ng-if].ng-leave { | 28 | +[ng-if].ng-leave, [ng-show].ng-leave, [ng-hide].ng-leave { |
29 | -webkit-animation: zoomOut 0.5s; | 29 | -webkit-animation: zoomOut 0.5s; |
30 | - animation: fadeOutLeft 0.5s; | 30 | + animation: zoomOut 0.5s; |
31 | } | 31 | } |
32 | 32 | ||
33 | body > .container { | 33 | body > .container { |
@@ -50,16 +50,6 @@ table { | @@ -50,16 +50,6 @@ table { | ||
50 | width: 90%; | 50 | width: 90%; |
51 | } | 51 | } |
52 | 52 | ||
53 | -table .ng-enter { | ||
54 | - -webkit-animation: fadeInLeft 0.5s; | ||
55 | - animation: fadeInLeft 0.5s; | ||
56 | -} | ||
57 | - | ||
58 | -table .ng-leave { | ||
59 | - -webkit-animation: fadeOutLeft 0.5s; | ||
60 | - animation: fadeOutLeft 0.5s; | ||
61 | -} | ||
62 | - | ||
63 | .bureau { | 53 | .bureau { |
64 | color: blue; | 54 | color: blue; |
65 | } | 55 | } |
66 | \ No newline at end of file | 56 | \ No newline at end of file |
public/views/forumConv.html
@@ -8,14 +8,14 @@ | @@ -8,14 +8,14 @@ | ||
8 | <div class="panel panel-default" ng-repeat="mess in messs"> | 8 | <div class="panel panel-default" ng-repeat="mess in messs"> |
9 | <div class="panel-heading"> | 9 | <div class="panel-heading"> |
10 | {{ mess.login }} | 10 | {{ mess.login }} |
11 | - <button ng-if="session.canDelMess" type="button" class="btn btn-danger" ng-click="deleteMess($index)"> | 11 | + <button ng-show="session.canDelMess" type="button" class="btn btn-danger" ng-click="deleteMess($index)"> |
12 | <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer | 12 | <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer |
13 | </button> | 13 | </button> |
14 | </div> | 14 | </div> |
15 | <div class="panel-body" btf-markdown="mess.content"> | 15 | <div class="panel-body" btf-markdown="mess.content"> |
16 | </div> | 16 | </div> |
17 | </div> | 17 | </div> |
18 | - <div class="form-group" ng-if="session.canAddMess"> | 18 | + <div class="form-group" ng-show="session.canAddMess"> |
19 | <div class="panel panel-default"> | 19 | <div class="panel panel-default"> |
20 | <div class="panel-heading"> | 20 | <div class="panel-heading"> |
21 | <h4 class="panel-title"> | 21 | <h4 class="panel-title"> |
public/views/forumDir.html
@@ -16,12 +16,12 @@ | @@ -16,12 +16,12 @@ | ||
16 | </div> | 16 | </div> |
17 | <div class="panel-body"> | 17 | <div class="panel-body"> |
18 | <!-- <strong>Date : </strong>{{ doss.date }}<br/> --> | 18 | <!-- <strong>Date : </strong>{{ doss.date }}<br/> --> |
19 | - <button ng-if="session.canDelDoss" type="button" class="btn btn-danger" ng-click="deleteDoss($index)"> | 19 | + <button ng-show="session.canDelDoss" type="button" class="btn btn-danger" ng-click="deleteDoss($index)"> |
20 | <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer | 20 | <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer |
21 | </button> | 21 | </button> |
22 | </div> | 22 | </div> |
23 | </div> | 23 | </div> |
24 | - <div class="form-group" ng-if="session.canAddDoss"> | 24 | + <div class="form-group" ng-show="session.canAddDoss"> |
25 | <div class="panel panel-default"> | 25 | <div class="panel panel-default"> |
26 | <div class="panel-heading"> | 26 | <div class="panel-heading"> |
27 | <h3 class="panel-title"> | 27 | <h3 class="panel-title"> |
@@ -46,12 +46,12 @@ | @@ -46,12 +46,12 @@ | ||
46 | </div> | 46 | </div> |
47 | <div class="panel-body"> | 47 | <div class="panel-body"> |
48 | <!-- <strong>Date : </strong>{{ conv.date }}<br/> --> | 48 | <!-- <strong>Date : </strong>{{ conv.date }}<br/> --> |
49 | - <button ng-if="session.canDelConv" type="button" class="btn btn-danger" ng-click="deleteConv($index)"> | 49 | + <button ng-show="session.canDelConv" type="button" class="btn btn-danger" ng-click="deleteConv($index)"> |
50 | <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer | 50 | <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Supprimer |
51 | </button> | 51 | </button> |
52 | </div> | 52 | </div> |
53 | </div> | 53 | </div> |
54 | - <div class="form-group" ng-if="session.canAddConv"> | 54 | + <div class="form-group" ng-show="session.canAddConv"> |
55 | <div class="panel panel-default"> | 55 | <div class="panel panel-default"> |
56 | <div class="panel-heading"> | 56 | <div class="panel-heading"> |
57 | <h3 class="panel-title"> | 57 | <h3 class="panel-title"> |
public/views/membres.html
@@ -10,15 +10,15 @@ | @@ -10,15 +10,15 @@ | ||
10 | <th>Nom</th> | 10 | <th>Nom</th> |
11 | <th>Section</th> | 11 | <th>Section</th> |
12 | <th>Rôle</th> | 12 | <th>Rôle</th> |
13 | - <th ng-if="session.canAddMembre || session.canDelMembre">Action</th> | 13 | + <th ng-show="session.canAddMembre || session.canDelMembre">Action</th> |
14 | </tr> | 14 | </tr> |
15 | </thead> | 15 | </thead> |
16 | - <tbody data-as-sortable="dragControlListeners" data-ng-model="membres"> | ||
17 | - <tr data-ng-repeat="membre in membres" data-as-sortable-item ng-class="{bureau: membre.bureau}"> | 16 | + <tbody as-sortable="dragControlListeners" ng-model="membres"> |
17 | + <tr ng-repeat="membre in membres" as-sortable-item ng-class="{bureau: membre.bureau}"> | ||
18 | <td>{{ membre.nom }}</td> | 18 | <td>{{ membre.nom }}</td> |
19 | <td>{{ membre.section }}</td> | 19 | <td>{{ membre.section }}</td> |
20 | <td>{{ membre.role }}</td> | 20 | <td>{{ membre.role }}</td> |
21 | - <td ng-if="session.canDelMembre"> | 21 | + <td ng-show="session.canDelMembre"> |
22 | <button type="button" class="btn btn-default" aria-label="Déplacer" data-as-sortable-item-handle> | 22 | <button type="button" class="btn btn-default" aria-label="Déplacer" data-as-sortable-item-handle> |
23 | <span class="glyphicon glyphicon-resize-vertical" aria-hidden="true"></span> | 23 | <span class="glyphicon glyphicon-resize-vertical" aria-hidden="true"></span> |
24 | </button> | 24 | </button> |
@@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
28 | </td> | 28 | </td> |
29 | </tr> | 29 | </tr> |
30 | </tbody> | 30 | </tbody> |
31 | - <tfoot id="membre-form" ng-if="session.canAddMembre"> | 31 | + <tfoot id="membre-form" ng-show="session.canAddMembre"> |
32 | <tr class="form-group"> | 32 | <tr class="form-group"> |
33 | <td> | 33 | <td> |
34 | <input type="text" class="form-control input-lg" placeholder="Login Polytech" ng-model="formData.login"> | 34 | <input type="text" class="form-control input-lg" placeholder="Login Polytech" ng-model="formData.login"> |
@@ -46,4 +46,4 @@ | @@ -46,4 +46,4 @@ | ||
46 | </tr> | 46 | </tr> |
47 | </tfoot> | 47 | </tfoot> |
48 | </table> | 48 | </table> |
49 | -</div> | ||
50 | \ No newline at end of file | 49 | \ No newline at end of file |
50 | +</div> |