Skip to content

Commit fba4e4a

Browse files
jrichter1dgolovin
authored andcommitted
Display the detection indication over the form rather than in it
1 parent 3f80db5 commit fba4e4a

2 files changed

Lines changed: 19 additions & 16 deletions

File tree

browser/app.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@ footer {
248248
transition: opacity 0.25s, width 0.25s;
249249
}
250250

251-
.spinner.spinner-bgcolour{
251+
.spinner.spinner-bgcolour {
252252
animation: rotation 600ms infinite linear;
253253
border-bottom: 4px solid rgba(3, 3, 3, 0.25);
254254
border-left: 4px solid rgba(3, 3, 3, 0.25);
255255
border-right: 4px solid rgba(3, 3, 3, 0.25);
256256
border-radius: 100%;
257-
border-top: 4px solid #00659c;
257+
border-top: 4px solid #00a8e1;
258258
margin: 0 auto;
259259
position: relative;
260260
}

browser/pages/confirm/confirm.html

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,17 @@
44
</header>
55

66
<main class="col-sm-12 bottom-spacer" >
7+
<p class="installation-note has-spinner" ng-show="!confCtrl.isDisabled">
8+
<span class="pficon-info" ng-show="confCtrl.numberOfExistingInstallations>0"></span>
9+
{{confCtrl.installedSearchNote}}
10+
<br ng-show="confCtrl.numberOfExistingInstallations>0">
11+
<span id="instructions" class="installation-instruction">
12+
Select the components to install
13+
</span>
14+
</p>
715

816
<form name="confirmForm" id="confirmForm" class="form-horizontal" ng-submit="confCtrl.install()" ng-class="{'is-disabled':confCtrl.isDisabled}">
917

10-
<div class="centered has-spinner" ng-class="{'active':confCtrl.isDisabled}">
11-
<span class="spinner spinner-lg spinner-inline spinner-bgcolour"><i class="icon-spin icon-refresh"></i></span>
12-
</div>
13-
<p id="detection-info" class="installation-note has-spinner" ng-class="{'active':confCtrl.isDisabled}">
14-
<div class="detection-msg">
15-
<span class="pficon-info" ng-show="!confCtrl.isDisabled && confCtrl.numberOfExistingInstallations>0"></span>
16-
<h2><strong>{{confCtrl.installedSearchNote}}</strong></h2>
17-
</div>
18-
<br ng-show="!confCtrl.isDisabled && confCtrl.numberOfExistingInstallations>0">
19-
<span id="instructions" class="installation-instruction" ng-show="!confCtrl.isDisabled">
20-
Select the components to install
21-
</span>
22-
</p>
23-
2418
<!-- devstudio -->
2519
<div id="devstudio-panel" class="panel panel-default panel2pxborder" ng-hide="checkboxModel.devstudio === undefined" ng-class="{'zero-border':checkboxModel.devstudio.hasOption('detected')}">
2620
<div id="devstudio-panel-heading" class="panel-heading panel-normal"
@@ -499,6 +493,15 @@ <h2><strong>{{confCtrl.installedSearchNote}}</strong></h2>
499493
</div>
500494
</div>
501495
</form>
496+
497+
<div id="detection-info" class="centered has-spinner" ng-show="confCtrl.isDisabled" ng-class="{'active':confCtrl.isDisabled}">
498+
<span class="spinner spinner-lg spinner-bgcolour spinner-inline"><i class="icon-spin icon-refresh"></i></span>
499+
<p class="installation-note">
500+
<div class="detection-msg">
501+
<h2>{{confCtrl.installedSearchNote}}</h2>
502+
</div>
503+
</p>
504+
</div>
502505
</main>
503506

504507
<footer id="footer-navigation" class="no-background-color">

0 commit comments

Comments
 (0)