use clearfix feature from bootstrap

This commit is contained in:
nemunaire 2018-12-05 07:42:57 +01:00
parent c877da1161
commit c02b30409b
4 changed files with 7 additions and 9 deletions

View File

@ -1,5 +1,5 @@
<form ng-submit="saveScenes()" class="form-horizontal">
<h2>
<h2 class="clearfix">
Interface publique
<select class="custom-select" style="width: auto" id="screenid" ng-model="screenid" ng-options="k as 'Écran ' + v for (k, v) in screens" ng-change="chScreen()"></select>
<div class="float-right dropdown">
@ -22,8 +22,6 @@
<button type="submit" class="float-right btn btn-success mr-sm-2"><span class="glyphicon glyphicon-save" aria-hidden="true"></span> Publier cette scène</button>
</h2>
<div style="clear:both"></div>
<div class="alert alert-info" ng-if="!scenes.length">
<strong ng-if="!someUpdt">Aucun contenu n'est actuellement affiché.</strong>
<strong ng-if="someUpdt">Aucun contenu à afficher.</strong>

View File

@ -18,11 +18,11 @@
<div class="card niceborder excard" ng-repeat="(k,theme) in themes">
<div class="card-img-top theme-card" ng-show="theme.image" style="background-image: url({{ theme.image }})"></div>
<div class="card-body">
<h5 class="card-title">
<h5 class="card-title clearfix">
<a ng-href="/{{ theme.urlid }}">{{ theme.name }}</a>
<a ng-href="/tags/{{tag}}" class="badge badge-pill badge-secondary ml-1 float-right">#tag</a>
</h5>
<p style="clear: both" class="card-text text-justify" ng-bind-html="theme.headline"></p>
<p class="card-text text-justify" ng-bind-html="theme.headline"></p>
</div>
</div>
</div>

View File

@ -2,12 +2,12 @@
<div class="card niceborder excard" ng-repeat="ex in exercices">
<div class="card-img-top theme-card" ng-show="ex.theme.image" style="background-image: url({{ ex.theme.image }})"></div>
<div class="card-body">
<h6 class="card-title">
<h6 class="card-title clearfix">
<a ng-href="/{{ex.theme.urlid}}">{{ex.theme.name}}</a> &gt;
<a ng-href="/{{ex.theme.urlid}}/{{ex.exercice.urlid}}">{{ex.exercice.title}}</a>
<a ng-href="/tags/{{tag}}" class="badge badge-pill badge-secondary mr-2 float-right" ng-repeat="tag in themes[ex.tid].exercices[ex.eid].tags">#{{ tag }}</a>
</h6>
<p style="clear: both" class="card-text text-justify" ng-bind-html="ex.exercice.headline"></p>
<p class="card-text text-justify" ng-bind-html="ex.exercice.headline"></p>
</div>
</div>
</div>

View File

@ -6,7 +6,7 @@
<div class="card-group mb-5">
<div class="card niceborder" ng-repeat="(k,exercice) in themes[current_theme].exercices">
<div class="card-body">
<h5 class="card-title">
<h5 class="card-title clearfix">
<a ng-href="/{{ themes[current_theme].urlid }}/{{ themes[current_theme].exercices[k].urlid }}" ng-if="my.exercices[k]">
{{ exercice.title }}
</a>
@ -18,6 +18,6 @@
<span class="glyphicon glyphicon-ok" aria-hidden="true" ng-if="(my.team_id && my.exercices[k].solved)"></span>
<span class="glyphicon glyphicon-gift" aria-hidden="true" ng-if="themes[current_theme].exercices[k].curcoeff > 1.0" title="Un bonus est actuellement appliqué lors de la résolution de ce défi"></span>
</h5>
<p style="clear: both" class="card-text text-justify" ng-bind-html="exercice.headline"></p>
<p class="card-text text-justify" ng-bind-html="exercice.headline"></p>
</div>
</div>