Skip to content

Commit aed2397

Browse files
author
martinmeerAT
committed
feat() renew styles
1 parent 17284e5 commit aed2397

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+207
-231
lines changed

‎docs/ost-1-00022-80.pdf‎

1.94 MB
Binary file not shown.

‎html/classed-size.html‎

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,45 @@
5454
<a class="header-brand " href="../index.html"><b>Ассистент контролера ОТК</b></a>
5555
</li>
5656
<li class="navbar-nav">
57-
<div class="nav-link" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-edit"></i>ОСТ 22</div>
57+
<div class="nav-link" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
58+
<picture>
59+
<source srcset="../img/icons/ost24.webp" type="image/webp">
60+
<img src="../img/icons/ost24.webp" alt="Метрическая резьба" width="24" height="24">
61+
</picture>
62+
</span>ОСТ 22</div>
5863
<div class="dropdown-menu dropdown-menu-arrow">
5964
<a href="../html/ost22.html" class="dropdown-item" title="ОСТ 22">ОСТ 22</a>
6065
</div>
6166
</li>
6267
<li class="navbar-nav">
63-
<div class="nav-link" id="dropdown06" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-edit"></i>Допуски и посадки</div>
68+
<div class="nav-link" id="dropdown06" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
69+
<picture>
70+
<source srcset="../img/icons/classed24.webp" type="image/webp">
71+
<img src="../img/icons/classed24.webp" alt="Метрическая резьба" width="24" height="24">
72+
</picture>
73+
</span>Допуски и посадки</div>
6474
<div class="dropdown-menu dropdown-menu-arrow">
6575
<a href="../html/classed-size.html" class="dropdown-item" title="Допуски и посадки">Допуски и посадки</a>
6676
</div>
6777
</li>
6878
<li class="navbar-nav">
69-
<div class="nav-link" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-check-square"></i>Метрическая резьба</div>
79+
<div class="nav-link" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
80+
<picture>
81+
<source srcset="../img/icons/thread24.webp" type="image/webp">
82+
<img src="../img/icons/thread24.webp" alt="Метрическая резьба" width="24" height="24">
83+
</picture>
84+
</span>Метрическая резьба</div>
7085
<div class="dropdown-menu dropdown-menu-arrow">
7186
<a href="../html/m-thread.html" class="dropdown-item" title="Метрическая резьба">Метрическая резьба</a>
7287
</div>
7388
</li>
7489
<li class="navbar-nav">
75-
<div class="nav-link" id="dropdown07" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-box"></i>Расчет фасок</div>
90+
<div class="nav-link" id="dropdown07" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
91+
<picture>
92+
<source srcset="../img/icons/facets24.webp" type="image/webp">
93+
<img src="../img/icons/facets24.webp" alt="Метрическая резьба" width="24" height="24">
94+
</picture>
95+
</span>Расчет фасок</div>
7696
<div class="dropdown-menu dropdown-menu-arrow">
7797
<a href="../html/facets.html" class="dropdown-item" title="Расчет фасок">Расчет фасок</a>
7898

@@ -149,10 +169,30 @@ <h3>Размеры элементов отверстий и валов</h3>
149169
<div class="col-xl-3 px-3">
150170

151171
<div class="list-group list-group-transparent mt-2 mb-2">
152-
<a href="../html/ost22.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-book-open"></i></span>ОСТ 22</a>
153-
<a href="../html/classed-size.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Допуски и посадки</a>
154-
<a href="../html/m-thread.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Метрическая резьба</a>
155-
<a href="../html/facets.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Расчет фасок</a>
172+
<a href="../html/ost22.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
173+
<picture>
174+
<source srcset="../img/icons/ost24.webp" type="image/webp">
175+
<img src="../img/icons/ost24.webp" alt="Метрическая резьба" width="24" height="24">
176+
</picture>
177+
</span>ОСТ 22</a>
178+
<a href="../html/classed-size.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
179+
<picture>
180+
<source srcset="../img/icons/classed24.webp" type="image/webp">
181+
<img src="../img/icons/classed24.webp" alt="Метрическая резьба" width="24" height="24">
182+
</picture>
183+
</span>Допуски и посадки</a>
184+
<a href="../html/m-thread.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
185+
<picture>
186+
<source srcset="../img/icons/thread24.webp" type="image/webp">
187+
<img src="../img/icons/thread24.webp" alt="Метрическая резьба" width="24" height="24">
188+
</picture>
189+
</span>Метрическая резьба</a>
190+
<a href="../html/facets.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
191+
<picture>
192+
<source srcset="../img/icons/facets24.webp" type="image/webp">
193+
<img src="../img/icons/facets24.webp" alt="Метрическая резьба" width="24" height="24">
194+
</picture>
195+
</span>Расчет фасок</a>
156196

157197
</div>
158198

@@ -225,7 +265,7 @@ <h3>Размеры элементов отверстий и валов</h3>
225265
</div>
226266
</footer>
227267

228-
<script type="module" src="../js/ost22/calculations.js"></script>
268+
<script type="module" src="../js/pages/classed-size.js"></script>
229269

230270

231271
</body>

‎html/facets.html‎

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,48 @@
5454
<a class="header-brand " href="../index.html"><b>Ассистент контролера ОТК</b></a>
5555
</li>
5656
<li class="navbar-nav">
57-
<div class="nav-link" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-edit"></i>ОСТ 22</div>
57+
<div class="nav-link" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
58+
<picture>
59+
<source srcset="../img/icons/ost24.webp" type="image/webp">
60+
<img src="../img/icons/ost24.webp" alt="Метрическая резьба" width="24" height="24">
61+
</picture>
62+
</span>ОСТ 22</div>
5863
<div class="dropdown-menu dropdown-menu-arrow">
5964
<a href="../html/ost22.html" class="dropdown-item" title="ОСТ 22">ОСТ 22</a>
6065
</div>
6166
</li>
6267
<li class="navbar-nav">
63-
<div class="nav-link" id="dropdown06" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-edit"></i>Допуски и посадки</div>
68+
<div class="nav-link" id="dropdown06" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
69+
<picture>
70+
<source srcset="../img/icons/classed24.webp" type="image/webp">
71+
<img src="../img/icons/classed24.webp" alt="Метрическая резьба" width="24" height="24">
72+
</picture>
73+
</span>Допуски и посадки</div>
6474
<div class="dropdown-menu dropdown-menu-arrow">
6575
<a href="../html/classed-size.html" class="dropdown-item" title="Допуски и посадки">Допуски и посадки</a>
6676
</div>
6777
</li>
6878
<li class="navbar-nav">
69-
<div class="nav-link" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-check-square"></i>Метрическая резьба</div>
79+
<div class="nav-link" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
80+
<picture>
81+
<source srcset="../img/icons/thread24.webp" type="image/webp">
82+
<img src="../img/icons/thread24.webp" alt="Метрическая резьба" width="24" height="24">
83+
</picture>
84+
</span>Метрическая резьба</div>
7085
<div class="dropdown-menu dropdown-menu-arrow">
7186
<a href="../html/m-thread.html" class="dropdown-item" title="Метрическая резьба">Метрическая резьба</a>
7287
</div>
7388
</li>
7489
<li class="navbar-nav">
75-
<div class="nav-link" id="dropdown07" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-box"></i>Расчет фасок</div>
90+
<div class="nav-link" id="dropdown07" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
91+
<picture>
92+
<source srcset="../img/icons/facets24.webp" type="image/webp">
93+
<img src="../img/icons/facets24.webp" alt="Метрическая резьба" width="24" height="24">
94+
</picture>
95+
</span>Расчет фасок</div>
7696
<div class="dropdown-menu dropdown-menu-arrow">
7797
<a href="../html/facets.html" class="dropdown-item" title="Расчет фасок">Расчет фасок</a>
98+
7899
</div>
79100
</li>
80101

@@ -150,13 +171,34 @@
150171
<div class="col-xl-3 px-3">
151172

152173
<div class="list-group list-group-transparent mt-2 mb-2">
153-
<a href="../html/ost22.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-book-open"></i></span>ОСТ 22</a>
154-
<a href="../html/classed-size.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Допуски и посадки</a>
155-
<a href="../html/m-thread.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Метрическая резьба</a>
156-
<a href="../html/facets.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Расчет фасок</a>
174+
<a href="../html/ost22.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
175+
<picture>
176+
<source srcset="../img/icons/ost24.webp" type="image/webp">
177+
<img src="../img/icons/ost24.webp" alt="Метрическая резьба" width="24" height="24">
178+
</picture>
179+
</span>ОСТ 22</a>
180+
<a href="../html/classed-size.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
181+
<picture>
182+
<source srcset="../img/icons/classed24.webp" type="image/webp">
183+
<img src="../img/icons/classed24.webp" alt="Метрическая резьба" width="24" height="24">
184+
</picture>
185+
</span>Допуски и посадки</a>
186+
<a href="../html/m-thread.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
187+
<picture>
188+
<source srcset="../img/icons/thread24.webp" type="image/webp">
189+
<img src="../img/icons/thread24.webp" alt="Метрическая резьба" width="24" height="24">
190+
</picture>
191+
</span>Метрическая резьба</a>
192+
<a href="../html/facets.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
193+
<picture>
194+
<source srcset="../img/icons/facets24.webp" type="image/webp">
195+
<img src="../img/icons/facets24.webp" alt="Метрическая резьба" width="24" height="24">
196+
</picture>
197+
</span>Расчет фасок</a>
157198

158199
</div>
159200

201+
160202
<div class="sticky-top pt-4 pb-5 d-none d-xl-block">
161203

162204

@@ -226,7 +268,7 @@
226268
</div>
227269
</footer>
228270

229-
<script type="module" src="../js/facets/calculations.js"></script>
271+
<script type="module" src="../js/pages/facets.js"></script>
230272

231273

232274
</body>

‎html/facetsOLD.html‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎html/m-thread.html‎

Lines changed: 52 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,45 @@
5454
<a class="header-brand " href="../index.html"><b>Ассистент контролера ОТК</b></a>
5555
</li>
5656
<li class="navbar-nav">
57-
<div class="nav-link" id="dropdown06" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-edit"></i>ОСТ 22</div>
57+
<div class="nav-link" id="dropdown05" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
58+
<picture>
59+
<source srcset="../img/icons/ost24.webp" type="image/webp">
60+
<img src="../img/icons/ost24.webp" alt="Метрическая резьба" width="24" height="24">
61+
</picture>
62+
</span>ОСТ 22</div>
5863
<div class="dropdown-menu dropdown-menu-arrow">
5964
<a href="../html/ost22.html" class="dropdown-item" title="ОСТ 22">ОСТ 22</a>
6065
</div>
6166
</li>
62-
<li class="navbar-nav">
63-
<div class="nav-link" id="dropdown06" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-edit"></i>Допуски и посадки</div>
67+
<li class="navbar-nav">
68+
<div class="nav-link" id="dropdown06" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
69+
<picture>
70+
<source srcset="../img/icons/classed24.webp" type="image/webp">
71+
<img src="../img/icons/classed24.webp" alt="Метрическая резьба" width="24" height="24">
72+
</picture>
73+
</span>Допуски и посадки</div>
6474
<div class="dropdown-menu dropdown-menu-arrow">
6575
<a href="../html/classed-size.html" class="dropdown-item" title="Допуски и посадки">Допуски и посадки</a>
6676
</div>
6777
</li>
68-
6978
<li class="navbar-nav">
70-
<div class="nav-link" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-check-square"></i>Метрическая резьба</div>
79+
<div class="nav-link" id="dropdown08" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
80+
<picture>
81+
<source srcset="../img/icons/thread24.webp" type="image/webp">
82+
<img src="../img/icons/thread24.webp" alt="Метрическая резьба" width="24" height="24">
83+
</picture>
84+
</span>Метрическая резьба</div>
7185
<div class="dropdown-menu dropdown-menu-arrow">
7286
<a href="../html/m-thread.html" class="dropdown-item" title="Метрическая резьба">Метрическая резьба</a>
73-
7487
</div>
7588
</li>
76-
<li class="navbar-nav">
77-
<div class="nav-link" id="dropdown07" data-bs-toggle="dropdown" aria-expanded="false"><i class="fe fe-box"></i>Расчет фасок</div>
89+
<li class="navbar-nav">
90+
<div class="nav-link" id="dropdown07" data-bs-toggle="dropdown" aria-expanded="false"><span class="icon mr-3">
91+
<picture>
92+
<source srcset="../img/icons/facets24.webp" type="image/webp">
93+
<img src="../img/icons/facets24.webp" alt="Метрическая резьба" width="24" height="24">
94+
</picture>
95+
</span>Расчет фасок</div>
7896
<div class="dropdown-menu dropdown-menu-arrow">
7997
<a href="../html/facets.html" class="dropdown-item" title="Расчет фасок">Расчет фасок</a>
8098

@@ -164,13 +182,34 @@ <h4>Данные для измерения номинального диамет
164182
<div class="col-xl-3 px-3">
165183

166184
<div class="list-group list-group-transparent mt-2 mb-2">
167-
<a href="../html/ost22.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-book-open"></i></span>ОСТ 22</a>
168-
<a href="../html/classed-size.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Допуски и посадки</a>
169-
<a href="../html/m-thread.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Метрическая резьба</a>
170-
<a href="../html/facets.html" class="list-group-item list-group-item-action"><span class="icon mr-3"><i class="fe fe-grid"></i></span>Расчет фасок</a>
185+
<a href="../html/ost22.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
186+
<picture>
187+
<source srcset="../img/icons/ost24.webp" type="image/webp">
188+
<img src="../img/icons/ost24.webp" alt="Метрическая резьба" width="24" height="24">
189+
</picture>
190+
</span>ОСТ 22</a>
191+
<a href="../html/classed-size.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
192+
<picture>
193+
<source srcset="../img/icons/classed24.webp" type="image/webp">
194+
<img src="../img/icons/classed24.webp" alt="Метрическая резьба" width="24" height="24">
195+
</picture>
196+
</span>Допуски и посадки</a>
197+
<a href="../html/m-thread.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
198+
<picture>
199+
<source srcset="../img/icons/thread24.webp" type="image/webp">
200+
<img src="../img/icons/thread24.webp" alt="Метрическая резьба" width="24" height="24">
201+
</picture>
202+
</span>Метрическая резьба</a>
203+
<a href="../html/facets.html" class="list-group-item list-group-item-action"><span class="icon mr-3">
204+
<picture>
205+
<source srcset="../img/icons/facets24.webp" type="image/webp">
206+
<img src="../img/icons/facets24.webp" alt="Метрическая резьба" width="24" height="24">
207+
</picture>
208+
</span>Расчет фасок</a>
171209

172210
</div>
173211

212+
174213
<div class="sticky-top pt-4 pb-5 d-none d-xl-block">
175214

176215

@@ -240,7 +279,7 @@ <h4>Данные для измерения номинального диамет
240279
</div>
241280
</footer>
242281

243-
<script type="module" src="../js/ost22/calculations.js"></script>
282+
<script type="module" src="../js/pages/mthread.js"></script>
244283

245284

246285
</body>

0 commit comments

Comments
 (0)