diff --git a/docs/src/pages/components/Spinner.vue b/docs/src/pages/components/Spinner.vue index c4b6ea3..b37ba63 100644 --- a/docs/src/pages/components/Spinner.vue +++ b/docs/src/pages/components/Spinner.vue @@ -28,6 +28,12 @@ The spinner size. Default 50 + + md-stroke + Number + The line width. Default 3.5 + + md-indeterminate Boolean @@ -48,9 +54,9 @@
Restart - - - + + +
@@ -83,6 +89,10 @@ + + + +
@@ -90,6 +100,10 @@ <md-spinner :md-size="20" md-indeterminate class="md-accent"></md-spinner> <md-spinner :md-size="60" md-indeterminate class="md-warn"></md-spinner> <md-spinner :md-size="150" md-indeterminate></md-spinner> + + <md-spinner :md-size="20" :md-stroke="2" md-indeterminate class="md-accent"></md-spinner> + <md-spinner :md-size="60" :md-stroke="1.5" md-indeterminate class="md-warn"></md-spinner> + <md-spinner :md-size="150" :md-stroke="1" md-indeterminate></md-spinner>
@@ -98,11 +112,11 @@
- cloud_upload - done + cloud_upload + done - +
@@ -110,11 +124,11 @@ <md-theme class="complete-example" md-name="orange"> <md-button class="md-fab" @click.native="restartProgress" :class="{ 'md-primary': done }"> - <md-icon v-show="!done">cloud_upload</md-icon> - <md-icon v-show="done">done</md-icon> + <md-icon v-if="!done">cloud_upload</md-icon> + <md-icon v-if="done">done</md-icon> </md-button> - <md-spinner :md-size="75" :md-progress="progress" v-show="transition && progress < 115"></md-spinner> + <md-spinner :md-size="74" :md-stroke="2.2" :md-progress="progress" v-if="transition && progress < 115"></md-spinner> </md-theme> diff --git a/src/components/mdSpinner/mdSpinner.scss b/src/components/mdSpinner/mdSpinner.scss index bb13818..dce8578 100644 --- a/src/components/mdSpinner/mdSpinner.scss +++ b/src/components/mdSpinner/mdSpinner.scss @@ -20,7 +20,7 @@ &.md-spinner-leave-active { opacity: 0; - transform: scale(.9) translateZ(0); + transform: scale(.8) translateZ(0); transition: $swift-ease-out; } @@ -53,7 +53,6 @@ fill: none; stroke-dashoffset: 0; stroke-miterlimit: 10; - stroke-width: 3.2; transition: $swift-ease-out; } diff --git a/src/components/mdSpinner/mdSpinner.vue b/src/components/mdSpinner/mdSpinner.vue index b37f9a8..8ef1c6d 100644 --- a/src/components/mdSpinner/mdSpinner.vue +++ b/src/components/mdSpinner/mdSpinner.vue @@ -2,7 +2,7 @@
- +
@@ -19,6 +19,10 @@ type: Number, default: 50 }, + mdStroke: { + type: Number, + default: 3.5 + }, mdIndeterminate: Boolean, mdProgress: { type: Number,