Skip to content

Commit

Permalink
Replace pull-* with float-* classes used by bootstrap 4
Browse files Browse the repository at this point in the history
  • Loading branch information
llienher committed Aug 27, 2020
1 parent 31adf1e commit 5e7bafe
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ng-strict-di="true"
<header class="navbar navbar-default navbar-expand fixed-top" role="navigation" ng-show="::!mainCtrl.embedded">

<div class="navbar-inner">
<div class="pull-left brand">
<div class="float-left brand">
<img src="<%=require("../../images/gov-light.png")%>" alt="Gouvernement du Grand-Duché de Luxembourg">
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<li><p>{{ctrl.getUsername()}}</p></li>
<li><p>{{ctrl.getEmail()}}</p></li>
</ul>
<div class="pull-right">
<div class="float-right">
<a target="_blank" href="https://myaccount.geoportail.lu?lang={{ctrl.lang}}" class="btn btn-link" translate>My account</a>
<button class="btn btn-default" ng-click="ctrl.logout()" translate>Logout</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
</div>

<div class="feature-popup-footer hidden-3d">
<ul class="nav navbar-nav pull-left">
<ul class="nav navbar-nav float-left">
<li ng-show="ctrl.isEditable() && !ctrl.feature.get('__editable__')" ng-click="ctrl.modifySelectedFeature()"><button class="btn btn-primary" translate>Editer l'objet</button></li>
<li ng-show="ctrl.isEditable() && ctrl.feature.get('__editable__')" ng-click="ctrl.endModifySelectedFeature()"><button class="btn btn-primary" translate>Terminer édition</button></li>
</ul>
<ul class="nav navbar-nav pull-right">
<ul class="nav navbar-nav float-right">
<li>
<a href ng-click="ctrl.fitFeature()">
<span class="fa fa-search"></span>
Expand Down Expand Up @@ -94,7 +94,7 @@
</div>
</div>
</div>
<div class="feature-popup-footer pull-right">
<div class="feature-popup-footer float-right">
<button href class="btn btn-default" ng-click="ctrl.editingAttributes = false" translate>
Cancel
</button>
Expand All @@ -114,7 +114,7 @@
<div class="feature-popup-body">
<span translate>Êtes-vous certain de vouloir effacer cet élément de la carte ?</span>
</div>
<div class="feature-popup-footer pull-right">
<div class="feature-popup-footer float-right">
<button href class="btn btn-primary" ng-click="ctrl.deletingFeature = false" translate>
Annuler
</button>
Expand All @@ -134,7 +134,7 @@
</div>
</div>
</div>
<div class="feature-popup-footer pull-right">
<div class="feature-popup-footer float-right">
<button href class="btn btn-primary" ng-click="ctrl.askRadius = false" translate>
Annuler
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
</div>
</div>
</div>
<div class="feature-popup-footer pull-right">
<div class="feature-popup-footer float-right">
<button href class="btn btn-default" ng-click="ctrl.close()" translate>
Annuler
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</div>
</div>
<br>
<div class="feature-popup-footer pull-right">
<div class="feature-popup-footer float-right">
<span ng-show="ctrl.isAuthenticated() && ctrl.tab == 'us'" class="btn btn-default btn-file">
{{'Importer un symbole'|translate}}<input type="file" accept="image/*" name="file" app-symbolupload app-imgupload="ctrl.newSymbol"/>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ <h3 translate>Report a map content problem:</h3>
<p translate>The following <a ng-href="{{ctrl.url}}" target="_blank">map link</a> will be sent to our support team.</p>
<p translate>You can also use the <a href ng-click="ctrl.activateDrawingTools()">Drawing Tools</a> to annotate the map send to the support team.<p></p>
</div>
<button type="submit" class="pull-right btn btn-default" translate>Send feedback to support team</button>
<button type="submit" class="float-right btn btn-default" translate>Send feedback to support team</button>
</form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ <h3 translate>Proposition de modification de limite ou signalisation d'un probl
<p translate>Vous pouvez aussi activer les <a href="#" ng-click="ctrl.activateDrawingTools()">outils de dessin</a> pour annoter la carte.</p>
<p translate><a href="https://youtu.be/kK8qoE6Y1dY" target="_blank">Cliquez ici pour voir une vidéo expliquant comment donner votre feedback</a></p>
</div>
<button type="submit" class="pull-right btn btn-default" translate id="submitagefeedback">Envoyer un feedback à l'AGE</button>
<button type="submit" class="float-right btn btn-default" translate id="submitagefeedback">Envoyer un feedback à l'AGE</button>
</form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ <h3 translate>Proposition de modification de limite ou signalisation d'un probl
<p translate>Vous pouvez aussi activer les <a href ng-click="ctrl.activateDrawingTools()">outils de dessin</a> pour annoter la carte.</p>
<p translate><a href="https://youtu.be/oGuhqVg21wQ" target="_blank">Cliquez ici pour voir une vidéo expliquant comment donner votre feedback</a></p>
</div>
<button type="submit" class="pull-right btn btn-default" translate id="submitanffeedback">Envoyer un feedback à l'ANF</button>
<button type="submit" class="float-right btn btn-default" translate id="submitanffeedback">Envoyer un feedback à l'ANF</button>
</form>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ <h3 translate>Proposition de modification de limite ou signalisation d'un probl
<p translate><a href="https://eau.public.lu/actualites/2019/07---Juillet/DIV_Manual_Starkregenatlas_CME_190625_0_5.pdf" target="_blank">Cliquez ici pour visualiser le pdf expliquant comment donner votre feedback</a></p>
<p translate><a href="https://youtu.be/u_qlar6T-78" target="_blank">Cliquez ici pour voir une vidéo expliquant comment donner votre feedback sur les crues</a></p>
</div>
<button type="submit" class="pull-right btn btn-default" translate id="submitcruesfeedback">Envoyer un feedback à l'AGE</button>
<button type="submit" class="float-right btn btn-default" translate id="submitcruesfeedback">Envoyer un feedback à l'AGE</button>
</form>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<button class="close-panel pull-right" ng-click="ctrl.mobileActive = false" ng-show="ctrl.mobileActive">
<button class="close-panel float-right" ng-click="ctrl.mobileActive = false" ng-show="ctrl.mobileActive">
&#10005;
</button>

Expand Down

0 comments on commit 5e7bafe

Please sign in to comment.