ei
/
givin.school
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

UI layout changes

master
Evgeniy Ierusalimov 2 years ago
parent
1feb2a551b
commit
040a7a20b0
3 changed files with 42 additions and 19 deletions
Split View Show Diff Stats
  1. 4
    3
      timer.css
  2. 19
    8
      timer_utro.html
  3. 19
    8
      timer_vecher.html

+ 4
- 3
timer.css View File 

@@ -15,11 +15,12 @@ body {
15 15 
 }
16 16
17 17 
 input {
18 
-    font-size: 1.25em;
19 
-    /*background-color: white;*/
18 
+    font-size: 1.1em;
20 19 
     border-radius: .5em;
20 
+    border: 1px dotted;
21 
+    width: 6em;
21 22 
 }
22 23
23 24 
 #element_title {
24 25 
     font-weight: bold;
25 
-}
26 
+}

+ 19
- 8
timer_utro.html View File 

@@ -5,13 +5,13 @@
5 5 
     <meta charset="UTF-8">
6 6 
     <title>Givin.school timer</title>
7 7 
     <script src="https://givin.school/pl/nassets/b0833351/jquery.min.js?v=1685613221"></script>
8 
-    <link type="text/css" href="timer.css?v=0.3" rel="stylesheet">
8 
+    <link type="text/css" href="timer.css?v=0.4" rel="stylesheet">
9 9 
     <style>
10 10 
         .element, .current_element {
11 
-            color: darkorange;
11 
+            color: #319300;
12 12 
         }
13 13 
     </style>
14 
-    <script src="timer.js?v=0.3"></script>
14 
+    <script src="timer.js?v=0.4"></script>
15 15 
 </head>
16 16 
 <body>
17 17 
 <h1>Блок сидя (утро)</h1>
 
@@ -22,14 +22,25 @@
22 22 
     <div>
23 23 
         <input type="button" value="Старт" id="timer_start_btn">
24 24 
     </div>
25 
+
25 26 
     <br>
26 27
27 
-    <div>Элемент <span class=element id="element_title"></span></div>
28 
-    <div>Время элемента <span id="rest_time">0:00</span> &rarr; <span id=spent_time>0:00</span></div>
29 
-    <div>
30 
-        <input type="button" value="Заново" id="timer_reset_btn" disabled>
31 
-    </div>
28 
+    <table>
29 
+        <tr>
30 
+            <td>Элемент</td>
31 
+            <td><span class=element id="element_title"></span></td>
32 
+        </tr>
33 
+        <tr>
34 
+            <td>Время</td>
35 
+            <td><span id="rest_time">0:00</span> &rarr; <span id=spent_time>0:00</span></td>
36 
+        </tr>
37 
+        <tr>
38 
+            <td colspan="2"><input type="button" value="Заново" id="timer_reset_btn" disabled></td>
39 
+        </tr>
40 
+    </table>
41 
+
32 42 
     <br>
43 
+
33 44 
     <ol id=task_list>
34 45 
         <li data-ttl="30">«<b>Правильное положение тела</b>», настрой на занятие — 0,5 мин;</li>
35 46 
         <li data-ttl="120">«<b>Тишина</b>» −2 мин;</li>

+ 19
- 8
timer_vecher.html View File 

@@ -5,13 +5,13 @@
5 5 
     <meta charset="UTF-8">
6 6 
     <title>Givin.school timer</title>
7 7 
     <script src="https://givin.school/pl/nassets/b0833351/jquery.min.js?v=1685613221"></script>
8 
-    <link type="text/css" href="timer.css?v=0.3" rel="stylesheet">
8 
+    <link type="text/css" href="timer.css?v=0.4" rel="stylesheet">
9 9 
     <style>
10 10 
         .element, .current_element {
11 
-            color: #4f4fff;
11 
+            color: #5b5bf3;
12 12 
         }
13 13 
     </style>
14 
-    <script language="JavaScript" src="timer.js?v=0.3"></script>
14 
+    <script language="JavaScript" src="timer.js?v=0.4"></script>
15 15 
 </head>
16 16 
 <body>
17 17 
 <h1>Блок сидя (вечер)</h1>
 
@@ -22,14 +22,25 @@
22 22 
     <div>
23 23 
         <input type="button" value="Старт" id="timer_start_btn">
24 24 
     </div>
25 
+
25 26 
     <br>
26 27
27 
-    <div>Элемент <span class=element id="element_title"></span></div>
28 
-    <div>Время элемента <span id="rest_time">0:00</span> &rarr; <span id=spent_time>0:00</span></div>
29 
-    <div>
30 
-        <input type="button" value="Заново" id="timer_reset_btn" disabled>
31 
-    </div>
28 
+    <table>
29 
+        <tr>
30 
+            <td>Элемент</td>
31 
+            <td><span class=element id="element_title"></span></td>
32 
+        </tr>
33 
+        <tr>
34 
+            <td>Время</td>
35 
+            <td><span id="rest_time">0:00</span> &rarr; <span id=spent_time>0:00</span></td>
36 
+        </tr>
37 
+        <tr>
38 
+            <td colspan="2"><input type="button" value="Заново" id="timer_reset_btn" disabled></td>
39 
+        </tr>
40 
+    </table>
41 
+
32 42 
     <br>
43 
+
33 44 
     <ol id=task_list>
34 45 
         <li data-ttl="30">«<b>Правильное положение тела</b>», настрой на занятие — 0,5 мин;</li>
35 46 
         <li data-ttl="30">«<b>Тишина</b>» −0,5 мин;</li>

Write Preview
Loading…
Cancel
Save