ei
/
givin.school
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

added user element class; reset timer bugfix

master
Evgeniy Ierusalimov 2 år sedan
förälder
00a055c546
incheckning
b74e05c20a
6 ändrade filer med 16 tillägg och 10 borttagningar
Unifierad Vy Visa Diff Statistik
  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 Visa fil

3 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
 3 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
4 
     <meta charset="UTF-8">
 4 
     <meta charset="UTF-8">
5 
     <title>Givin.school самостоятельные упражнения</title>
 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 
 </head>
 7 
 </head>
8 
 <body>
 8 
 <body>
9
9
65 
 <h2><a id="bs">Блоки Сидя</a></h2>
 65 
 <h2><a id="bs">Блоки Сидя</a></h2>
66
66
67 
 <ul>
 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 
 </ul>
 70 
 </ul>
71
71
72
72

+ 4
- 0
timer.css Visa fil

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

+ 3
- 1
timer.js Visa fil

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

+ 2
- 2
timer_ulybka.html Visa fil

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

+ 2
- 2
timer_utro.html Visa fil

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

+ 2
- 2
timer_vecher.html Visa fil

5 
     <meta charset="UTF-8">
 5 
     <meta charset="UTF-8">
6 
     <title>Блок сидя (вечер)</title>
 6 
     <title>Блок сидя (вечер)</title>
7 
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
 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 
     <style>
 9 
     <style>
10 
         .element, .current_element {
 10 
         .element, .current_element {
11 
             color: #5b5bf3;
 11 
             color: #5b5bf3;
12 
         }
 12 
         }
13 
     </style>
 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 
 </head>
 15 
 </head>
16 
 <body>
 16 
 <body>
17 
 <h1><a href="./">&laquo;</a> Блок сидя (вечер)</h1>
 17 
 <h1><a href="./">&laquo;</a> Блок сидя (вечер)</h1>

Write Förhandsgranska
Laddar…
Avbryt
Spara