ei
/
givin.school
Volgen 1
Ster 0
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Publicaties 0 Wiki Activiteit
Bladeren bron

added user element class; reset timer bugfix

master
Evgeniy Ierusalimov 2 jaren geleden
bovenliggende
00a055c546
commit
b74e05c20a
6 gewijzigde bestanden met toevoegingen van 16 en 10 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 3
    3
      index.html
  2. 4
    0
      timer.css
  3. 3
    1
      timer.js
  4. 2
    2
      timer_ulybka.html
  5. 2
    2
      timer_utro.html
  6. 2
    2
      timer_vecher.html

+ 3
- 3
index.html Bestand weergeven 

@@ -3,7 +3,7 @@
3 3 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
4 4 
     <meta charset="UTF-8">
5 5 
     <title>Givin.school самостоятельные упражнения</title>
6 
-    <link type="text/css" href="timer.css?v=0.7" rel="stylesheet">
6 
+    <link type="text/css" href="timer.css?v=0.8" rel="stylesheet">
7 7 
 </head>
8 8 
 <body>
9 9 
 
@@ -65,8 +65,8 @@
65 65 
 <h2><a id="bs">Блоки Сидя</a></h2>
66 66
67 67 
 <ul>
68 
-    <li><a href="timer_utro.html">Блок сидя (утро)</a></li>
69 
-    <li><a href="timer_vecher.html">Блок сидя (вечер)</a></li>
68 
+    <li><a href="timer_utro.html"><b>Блок сидя (утро)</b></a></li>
69 
+    <li><a href="timer_vecher.html"><b>Блок сидя (вечер)</b></a></li>
70 70 
 </ul>
71 71
72 72

+ 4
- 0
timer.css Bestand weergeven 

@@ -11,6 +11,10 @@ a {
11 11 
     color: black;
12 12 
 }
13 13
14 
+.used_element {
15 
+    color: gray;
16 
+}
17 
+
14 18 
 #rest_time {
15 19 
     font-size: 1.25em;
16 20 
     color: black;

+ 3
- 1
timer.js Bestand weergeven 

@@ -28,7 +28,9 @@ function startTimerOnElement() {
28 28 
         $('#timer_next_btn').prop('disabled', true);
29 29 
         $('#timer_start_btn').prop('disabled', false);
30 30 
         $('#spent_time').text('0:00');
31 
+        $('#rest_time').text('0:00');
31 32 
         $('#element_title').text('');
33 
+        $('#task_list > .used_element').removeClass('used_element');
32 34 
         return;
33 35 
     }
34 36 
 
@@ -71,7 +73,7 @@ function startNextTimer(currElement) {
71 73 
         return;
72 74 
     }
73 75
74 
-    currElement.removeClass('current_element');
76 
+    currElement.removeClass('current_element').addClass('used_element');
75 77 
     nextElement.addClass('current_element');
76 78
77 79 
     startTimerOnElement();

+ 2
- 2
timer_ulybka.html Bestand weergeven 

@@ -5,13 +5,13 @@
5 5 
     <meta charset="UTF-8">
6 6 
     <title>Улыбка перед зеркалом</title>
7 7 
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
8 
-    <link type="text/css" href="timer.css?v=0.7" rel="stylesheet">
8 
+    <link type="text/css" href="timer.css?v=0.8" rel="stylesheet">
9 9 
     <style>
10 10 
         .element, .current_element {
11 11 
             color: #ef8f00;
12 12 
         }
13 13 
     </style>
14 
-    <script src="timer.js?v=0.7"></script>
14 
+    <script src="timer.js?v=0.8"></script>
15 15 
 </head>
16 16 
 <body>
17 17 
 <h1><a href="./">&laquo;</a> Улыбка перед зеркалом</h1>

+ 2
- 2
timer_utro.html Bestand weergeven 

@@ -5,13 +5,13 @@
5 5 
     <meta charset="UTF-8">
6 6 
     <title>Блок сидя (утро)</title>
7 7 
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
8 
-    <link type="text/css" href="timer.css?v=0.7" rel="stylesheet">
8 
+    <link type="text/css" href="timer.css?v=0.8" rel="stylesheet">
9 9 
     <style>
10 10 
         .element, .current_element {
11 11 
             color: #319300;
12 12 
         }
13 13 
     </style>
14 
-    <script src="timer.js?v=0.7"></script>
14 
+    <script src="timer.js?v=0.8"></script>
15 15 
 </head>
16 16 
 <body>
17 17 
 <h1><a href="./">&laquo;</a> Блок сидя (утро)</h1>

+ 2
- 2
timer_vecher.html Bestand weergeven 

@@ -5,13 +5,13 @@
5 5 
     <meta charset="UTF-8">
6 6 
     <title>Блок сидя (вечер)</title>
7 7 
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
8 
-    <link type="text/css" href="timer.css?v=0.7" rel="stylesheet">
8 
+    <link type="text/css" href="timer.css?v=0.8" rel="stylesheet">
9 9 
     <style>
10 10 
         .element, .current_element {
11 11 
             color: #5b5bf3;
12 12 
         }
13 13 
     </style>
14 
-    <script language="JavaScript" src="timer.js?v=0.7"></script>
14 
+    <script language="JavaScript" src="timer.js?v=0.8"></script>
15 15 
 </head>
16 16 
 <body>
17 17 
 <h1><a href="./">&laquo;</a> Блок сидя (вечер)</h1>

Schrijf Voorbeeld
Laden…
Annuleren
Opslaan