|
|
@@ -59,7 +59,7 @@
|
|
|
@click="pauseTimer"
|
|
|
></button>
|
|
|
</div>
|
|
|
- <el-button type="primary" @click="reset">重置</el-button>
|
|
|
+ <el-button type="primary" @click="reset" class="reset_btn">重置</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -161,12 +161,15 @@ export default {
|
|
|
clearInterval(this.intervalTimer);
|
|
|
this.isPaused = this.isPaused ? false : true;
|
|
|
}
|
|
|
+ console.log(1);
|
|
|
},
|
|
|
reset() {
|
|
|
clearInterval(this.intervalTimer);
|
|
|
this.play = false;
|
|
|
this.isStarted = false;
|
|
|
+ this.isPaused = false;
|
|
|
this.wholeTime = 0;
|
|
|
+ this.timeLeft = null;
|
|
|
this.update(this.wholeTime, this.wholeTime);
|
|
|
this.displayTimeLeft(this.wholeTime);
|
|
|
},
|
|
|
@@ -189,10 +192,10 @@ button[data-setter] {
|
|
|
border: none;
|
|
|
font-family: "Roboto";
|
|
|
font-weight: 300;
|
|
|
- font-size: 18px;
|
|
|
- width: 25px;
|
|
|
- height: 30px;
|
|
|
- color: #f7958e;
|
|
|
+ font-size: 36px;
|
|
|
+ width: 32px;
|
|
|
+ /* height: 30px; */
|
|
|
+ color: #409eff;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
button[data-setter]:hover {
|
|
|
@@ -205,15 +208,19 @@ button[data-setter]:hover {
|
|
|
margin: 0 auto;
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
+ justify-content: center;
|
|
|
}
|
|
|
.setters {
|
|
|
position: absolute;
|
|
|
- left: 85px;
|
|
|
+ /* left: 85px;
|
|
|
+ top: 75px; */
|
|
|
+ left: 78px;
|
|
|
top: 75px;
|
|
|
}
|
|
|
.minutes-set {
|
|
|
float: left;
|
|
|
- margin-right: 28px;
|
|
|
+ /* margin-right: 28px; */
|
|
|
+ margin-right: 20px;
|
|
|
}
|
|
|
.seconds-set {
|
|
|
float: right;
|
|
|
@@ -228,7 +235,7 @@ button[data-setter]:hover {
|
|
|
font-family: "Roboto";
|
|
|
font-weight: 100;
|
|
|
font-size: 65px;
|
|
|
- color: #f7958e;
|
|
|
+ color: #409eff;
|
|
|
}
|
|
|
#pause {
|
|
|
outline: none;
|
|
|
@@ -247,7 +254,7 @@ button[data-setter]:hover {
|
|
|
left: 16px;
|
|
|
border-top: 15px solid transparent;
|
|
|
border-bottom: 15px solid transparent;
|
|
|
- border-left: 22px solid #f7958e;
|
|
|
+ border-left: 22px solid #77a4d3;
|
|
|
}
|
|
|
.pause::after {
|
|
|
content: "";
|
|
|
@@ -258,7 +265,7 @@ button[data-setter]:hover {
|
|
|
height: 30px;
|
|
|
background-color: transparent;
|
|
|
border-radius: 1px;
|
|
|
- border: 5px solid #f7958e;
|
|
|
+ border: 5px solid #77a4d3;
|
|
|
border-top: none;
|
|
|
border-bottom: none;
|
|
|
}
|
|
|
@@ -272,16 +279,23 @@ button[data-setter]:hover {
|
|
|
}
|
|
|
.e-c-progress {
|
|
|
fill: none;
|
|
|
- stroke: #f7958e;
|
|
|
+ stroke: #6eaded;
|
|
|
stroke-width: 4px;
|
|
|
transition: stroke-dashoffset 0.7s;
|
|
|
}
|
|
|
.e-c-pointer {
|
|
|
fill: #fff;
|
|
|
- stroke: #f7958e;
|
|
|
+ stroke: #6eaded;
|
|
|
stroke-width: 2px;
|
|
|
}
|
|
|
#e-pointer {
|
|
|
transition: transform 0.7s;
|
|
|
}
|
|
|
+
|
|
|
+.reset_btn {
|
|
|
+ width: 100px;
|
|
|
+ margin: 15px auto 0px;
|
|
|
+ background: #527aa3;
|
|
|
+ border: none;
|
|
|
+}
|
|
|
</style>
|
