jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-24 07:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47 from resin-io/jviotti/feature/finished-state

Browse Source 
Add finished state before done
This commit is contained in:
Juan Cruz Viotti 2015-11-24 01:00:30 -04:00
commit 0c76a882e6
4 changed files with 489 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

834
build/browser/app.js
View File

File diff suppressed because it is too large Load Diff

11
build/css/main.css
View File

@ -2891,7 +2891,7 @@ fieldset[disabled] a.btn {
.btn-primary {
color: #fff;
background-color: #5793db;
border-color: #4285d6; }
border-color: #4286d7; }
.btn-primary:focus, .btn-primary.focus {
color: #fff;
background-color: #2d78d2;
@ -2923,7 +2923,7 @@ fieldset[disabled] a.btn {
fieldset[disabled] .btn-primary:active,
fieldset[disabled] .btn-primary.active {
background-color: #5793db;
border-color: #4285d6; }
border-color: #4286d7; }
.btn-primary .badge {
color: #5793db;
background-color: #fff; }
@ -5956,11 +5956,14 @@ hero-button .btn[disabled] {
background-color: #36383e; }
hero-progress-button .bar {
background: #6ca0df; }
background: #6ca1e0; }
hero-progress-button[percentage="100"] .bar {
hero-progress-button[percentage="100"][active="false"] .bar {
background-color: #5cb85c; }
hero-progress-button[percentage="100"][active="true"] .bar {
background-color: #f0ad4e; }
hero-icon[disabled] path {
fill: #787c7f; }

5
lib/index.html
View File

@ -84,10 +84,11 @@
<hero-badge class="block space-vertical-medium" ng-disabled="!app.selection.hasImage() || !app.selection.hasDrive()">3</hero-badge>
<div class="space-vertical-large">
<hero-progress-button percentage="{{ app.writer.progress }}"
<hero-progress-button percentage="{{ app.writer.progress }}" active="{{ app.writer.isBurning() }}"
ng-click="app.burn(app.selection.getImage(), app.selection.getDrive())"
ng-disabled="!app.selection.hasImage() || !app.selection.hasDrive()">
<span ng-show="app.writer.progress == 100">Done</span>
<span ng-show="app.writer.progress == 100 && !app.writer.isBurning()">Done</span>
<span ng-show="app.writer.progress == 100 && app.writer.isBurning()">Finishing...</span>
<span ng-show="app.writer.progress == 0 && !app.writer.isBurning()">Burn!</span>
<span ng-show="app.writer.progress == 0 && app.writer.isBurning()">Starting...</span>
<span ng-show="app.writer.progress != 0 && app.writer.progress != 100">{{ app.writer.progress }}%</span>

6
lib/scss/main.scss
View File

@ -65,10 +65,14 @@ hero-progress-button .bar {
background: lighten($brand-primary, 5);
}
hero-progress-button[percentage="100"] .bar {
hero-progress-button[percentage="100"][active="false"] .bar {
background-color: $brand-success;
}
hero-progress-button[percentage="100"][active="true"] .bar {
background-color: $brand-warning;
}
hero-icon[disabled] path {
fill: $color-disabled;
}