Skip to content

Commit bce807b

Browse files
giladgdgiladgd
committed
Merge remote-tracking branch 'origin/master' into fixDocumentTitle
# Conflicts: # style/app.css
2 parents 8ffbd70 + 6570e67 commit bce807b

File tree

4 files changed

+632
-17
lines changed

4 files changed

+632
-17
lines changed

‎index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@
3434
TypeORM - Amazing ORM for TypeScript and JavaScript (ES7, ES6, ES5). Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, WebSQL databases. Works in NodeJS, Browser, Ionic, Cordova and Electron platforms.
3535
</title>
3636

37-
</head>
3837
</head>
3938
<body>
4039

41-
<div class="container" id="app">
40+
<div id="app">
4241
<main-page></main-page>
4342
</div>
4443

‎script/component/MainPage.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const MainPage = {
22
template: `<div>
3-
<nav class="navbar navbar-expand navbar-light bg-light">
3+
<nav class="navbar navbar-expand navbar-light">
44
<!--<img src="image/logo-large.png" width="10%" height="10%">-->
5-
<a class="navbar-brand" href="/"><span style="color: #E83524">Type</span><span style="color: #000">ORM</span></a>
5+
<a class="navbar-brand" href="/"><span class="brand-type">Type</span><span class="brand-orm">ORM</span></a>
66
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
77
<span class="navbar-toggler-icon"></span>
88
</button>
@@ -38,17 +38,17 @@ const MainPage = {
3838
</li>
3939
<li class="nav-item">
4040
<a class="nav-link" href="https://github.com/typeorm/typeorm" title="GitHub">
41-
<svg aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="#181717">
41+
<svg class="svgIcon" aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="18" height="18">
4242
<title id="simpleicons-github-icon">GitHub</title>
4343
<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/>
4444
</svg>
4545
</a>
4646
</li>
4747
<li class="nav-item dropdown language">
4848
<a class="nav-link" href="#" title="Language" id="lang-choose" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
49-
<svg aria-labelledby="simpleicons-language-icon" role="img" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="18" height="18">
49+
<svg class="svgIcon" aria-labelledby="simpleicons-language-icon" role="img" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="18" height="18">
5050
<title id="simpleicons-language-icon">Language</title>
51-
<path d="M1024 512c0-281.6-230.4-512-512-512S0 230.4 0 512c0 262.4 198.4 473.6 448 505.6 12.8 0 32 6.4 51.2 6.4h19.2c281.6-6.4 505.6-230.4 505.6-512z m-70.4 6.4c0-25.6-6.4-51.2-12.8-76.8v-25.6c6.4 32 12.8 57.6 12.8 89.6v12.8zM70.4 512c0-32 6.4-64 6.4-89.6 19.2 19.2 64 19.2 76.8-12.8 19.2 12.8 44.8 12.8 44.8 38.4 0 76.8 0 160 70.4 160 0 0 38.4 12.8 57.6 57.6 6.4 12.8 32 0 57.6 0 12.8 0 0 19.2 0 70.4 0 44.8 102.4 121.6 102.4 121.6 0 32 0 57.6 6.4 76.8-25.6 0-44.8 0-57.6 6.4-204.8-32-364.8-211.2-364.8-428.8z m550.4 422.4c0-12.8-12.8-19.2-32-12.8 12.8-64 19.2-96 51.2-121.6 44.8-38.4 6.4-83.2-25.6-76.8-25.6 6.4-12.8-32-32-32-25.6 0-51.2-51.2-89.6-64-19.2-6.4-38.4-32-64-32s-57.6 19.2-57.6 6.4c0-51.2-6.4-89.6-6.4-108.8 0-12.8-6.4-6.4 25.6-6.4 19.2 0 6.4-38.4 25.6-38.4 19.2 0 57.6 19.2 70.4 6.4 12.8-6.4 70.4 166.4 70.4 25.6 0-19.2-6.4-44.8 0-57.6 32-57.6 64-108.8 64-115.2 0-6.4-32-6.4-57.6 0-6.4 0 0 19.2-12.8 19.2-44.8 12.8-89.6-12.8-76.8-32 12.8-25.6 70.4-12.8 70.4-57.6 0-25.6 6.4-57.6 6.4-76.8 64 12.8 57.6-83.2-38.4-89.6 192 0 352 121.6 409.6 294.4 0 0-6.4-6.4-12.8-6.4-25.6-70.4-96-19.2-76.8 44.8-128 96-96 166.4-51.2 204.8 19.2 19.2 44.8 51.2 57.6 70.4-12.8 44.8 51.2 25.6 89.6-44.8-38.4 147.2-160 262.4-307.2 300.8z" fill="#2c2c2c" p-id="1930"></path>
51+
<path d="M1024 512c0-281.6-230.4-512-512-512S0 230.4 0 512c0 262.4 198.4 473.6 448 505.6 12.8 0 32 6.4 51.2 6.4h19.2c281.6-6.4 505.6-230.4 505.6-512z m-70.4 6.4c0-25.6-6.4-51.2-12.8-76.8v-25.6c6.4 32 12.8 57.6 12.8 89.6v12.8zM70.4 512c0-32 6.4-64 6.4-89.6 19.2 19.2 64 19.2 76.8-12.8 19.2 12.8 44.8 12.8 44.8 38.4 0 76.8 0 160 70.4 160 0 0 38.4 12.8 57.6 57.6 6.4 12.8 32 0 57.6 0 12.8 0 0 19.2 0 70.4 0 44.8 102.4 121.6 102.4 121.6 0 32 0 57.6 6.4 76.8-25.6 0-44.8 0-57.6 6.4-204.8-32-364.8-211.2-364.8-428.8z m550.4 422.4c0-12.8-12.8-19.2-32-12.8 12.8-64 19.2-96 51.2-121.6 44.8-38.4 6.4-83.2-25.6-76.8-25.6 6.4-12.8-32-32-32-25.6 0-51.2-51.2-89.6-64-19.2-6.4-38.4-32-64-32s-57.6 19.2-57.6 6.4c0-51.2-6.4-89.6-6.4-108.8 0-12.8-6.4-6.4 25.6-6.4 19.2 0 6.4-38.4 25.6-38.4 19.2 0 57.6 19.2 70.4 6.4 12.8-6.4 70.4 166.4 70.4 25.6 0-19.2-6.4-44.8 0-57.6 32-57.6 64-108.8 64-115.2 0-6.4-32-6.4-57.6 0-6.4 0 0 19.2-12.8 19.2-44.8 12.8-89.6-12.8-76.8-32 12.8-25.6 70.4-12.8 70.4-57.6 0-25.6 6.4-57.6 6.4-76.8 64 12.8 57.6-83.2-38.4-89.6 192 0 352 121.6 409.6 294.4 0 0-6.4-6.4-12.8-6.4-25.6-70.4-96-19.2-76.8 44.8-128 96-96 166.4-51.2 204.8 19.2 19.2 44.8 51.2 57.6 70.4-12.8 44.8 51.2 25.6 89.6-44.8-38.4 147.2-160 262.4-307.2 300.8z" p-id="1930"></path>
5252
</svg>
5353
</a>
5454
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="lang-choose">
@@ -62,8 +62,8 @@ const MainPage = {
6262
</form>-->
6363
</div>
6464
</nav>
65-
<div class="row">
66-
<div class="col-12 col-sm-5 col-md-4 left-panel">
65+
<div class="panels">
66+
<div class="left-panel">
6767
<ul>
6868
<li v-for="link in links">
6969
<div v-if="link.links">
@@ -85,7 +85,7 @@ const MainPage = {
8585
</ul>
8686
<div class="carbon-container" ref="carbon"></div>
8787
</div>
88-
<div class="col-12 col-sm-7 col-md-8">
88+
<div class="right-panel">
8989
<router-view></router-view>
9090
</div>
9191
</div>

‎style/app.css

Lines changed: 198 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
html {
2+
scroll-padding-top: 80px;
3+
}
14
body {
25
padding-bottom: 20px;
36
}
@@ -33,6 +36,35 @@ h2, h3 {
3336
}
3437
.navbar {
3538
margin-bottom: 30px;
39+
position: sticky;
40+
top: 0px;
41+
z-index: 1;
42+
background-color: rgba(255, 255, 255, 1);
43+
border-bottom: 1px solid #EEE;
44+
height: 60px;
45+
}
46+
.brand-type {
47+
color: #E83524;
48+
}
49+
.brand-orm {
50+
color: #000;
51+
}
52+
.svgIcon {
53+
fill: #2c2c2c;
54+
}
55+
@supports (-webkit-backdrop-filter: blur(6px)) or (backdrop-filter: blur(6px)) {
56+
.navbar {
57+
background-color: rgba(255, 255, 255, 0.6);
58+
-webkit-backdrop-filter: blur(6px);
59+
backdrop-filter: blur(6px);
60+
}
61+
62+
@media (prefers-color-scheme: dark) {
63+
.navbar {
64+
background-color: rgba(36, 37, 38, 0.6);
65+
border-bottom: 1px solid #1b1b1b;
66+
}
67+
}
3668
}
3769
.document h1+ul, .document h1+ul ul {
3870
list-style: none;
@@ -55,9 +87,30 @@ h1 code, h2 code, h3 code {
5587
color: #333;
5688
}
5789

58-
.bg-light {
59-
background-color: transparent !important;
60-
border-bottom: 1px solid #EEE;
90+
.panels {
91+
display: flex;
92+
flex-direction: row;;
93+
flex-wrap: wrap;
94+
}
95+
96+
.left-panel {
97+
max-width: 340px;
98+
min-width: 240px;
99+
padding-right: 16px;
100+
flex: 1;
101+
}
102+
103+
@media only screen and (max-width: 579px) {
104+
.left-panel {
105+
max-width: 579px;
106+
}
107+
}
108+
109+
.right-panel {
110+
flex: 2;
111+
width: 0px;
112+
min-width: 340px;
113+
padding: 0px 16px;
61114
}
62115

63116
.left-panel ul {
@@ -116,14 +169,14 @@ ol {
116169
cursor: pointer;
117170
}
118171

119-
.language .dropdown-item:hover,
172+
.language .dropdown-item:hover,
120173
.language .dropdown-item:focus {
121174
color: #E83524 !important;
122175
text-decoration: none;
123176
background-color: #f8f9fa;
124177
}
125-
126-
.language .dropdown-item.active,
178+
179+
.language .dropdown-item.active,
127180
.language .dropdown-item:active {
128181
color: #ffffff;
129182
text-decoration: none;
@@ -134,7 +187,7 @@ ol {
134187
border-top: 1px solid #eee;
135188
padding-top: 20px;
136189
margin-left: 80px;
137-
margin-right: 80px;
190+
margin-right: 60px;
138191
min-width: 120px;
139192
margin-bottom: 20px;
140193
}
@@ -247,3 +300,141 @@ img {
247300
.DocSearch mark {
248301
padding: initial;
249302
}
303+
304+
@media (prefers-color-scheme: dark) {
305+
body {
306+
background-color: #18191a;
307+
color: #eeeeee;
308+
}
309+
310+
.carbon-container {
311+
border-top: 1px solid #3b3b3b;
312+
}
313+
h2, h3 {
314+
border-bottom: 1px solid #3b3b3b;
315+
}
316+
317+
.brand-type {
318+
color: #E83524;
319+
}
320+
.brand-orm {
321+
color: #ffffff;
322+
}
323+
.svgIcon {
324+
fill: #eeeeee;
325+
}
326+
327+
a.anchor {
328+
color: #E83524;
329+
}
330+
331+
a {
332+
color: #8ad4ff;
333+
}
334+
335+
a:not(.anchor):hover {
336+
color: #dbefff;
337+
}
338+
339+
.document h1+ul li::before {
340+
color: #E83524;
341+
}
342+
code {
343+
color: #8ad4ff;
344+
}
345+
h1 code, h2 code, h3 code {
346+
color: #333;
347+
}
348+
349+
.left-panel ul a {
350+
color: #cccccc;
351+
}
352+
.left-panel ul a.router-link-active {
353+
color: #E83524;
354+
}
355+
.left-panel ul a b {
356+
color: #999999;
357+
}
358+
.left-panel ul a:hover {
359+
color: #E83524;
360+
}
361+
.left-panel ul a b:hover {
362+
color: #E83524;
363+
}
364+
365+
.navbar-brand {
366+
font-size: 1.4rem;
367+
}
368+
369+
.contribute {
370+
color: #999;
371+
}
372+
373+
.contribute a {
374+
color: #cecece;
375+
}
376+
377+
378+
.language .dropdown-menu a {
379+
color: #616161;
380+
}
381+
382+
.language .dropdown-item:hover,
383+
.language .dropdown-item:focus {
384+
color: #E83524 !important;
385+
background-color: #f8f9fa;
386+
}
387+
388+
.language .dropdown-item.active,
389+
.language .dropdown-item:active {
390+
color: #ffffff;
391+
background-color: transparent;
392+
}
393+
394+
img[src$="/logo_big.png"] {
395+
background-color: rgb(255 255 255);
396+
border-radius: 12px;
397+
}
398+
399+
400+
#carbonads {
401+
background-color: hsl(0, 0%, 2%);
402+
}
403+
404+
#carbonads a {
405+
color: inherit;
406+
}
407+
408+
#carbonads a:hover {
409+
color: inherit;
410+
}
411+
412+
.DocSearch {
413+
--docsearch-text-color: #f5f6f7;
414+
--docsearch-muted-color: #7f8497;
415+
--docsearch-logo-color: #fff;
416+
--docsearch-container-background: rgba(47, 55, 69, 0.7);
417+
418+
/* Modal */
419+
--docsearch-modal-background: #18191a;
420+
421+
/* Search box */
422+
--docsearch-searchbox-background: #18191a;
423+
--docsearch-searchbox-focus-background: #000;
424+
425+
/* Hit */
426+
--docsearch-hit-color: #f5f6f7;
427+
--docsearch-hit-active-color: #fff;
428+
--docsearch-hit-background: #1c1e21;
429+
430+
/* Footer */
431+
--docsearch-footer-background: #242526;
432+
--docsearch-key-gradient: linear-gradient(-26.5deg, #515151, #404040);
433+
434+
/* Shadows */
435+
--docsearch-modal-shadow: inset 1px 1px 0 0 #2c2e40,0,0 3px 8px 0 #000309;
436+
--docsearch-hit-shadow: none;
437+
--docsearch-key-shadow: inset 0 -2px 0 0 #282d55,inset 0 0 1px 1px #51577d,0 2px 2px 0 rgba(3,4,9,.3);
438+
--docsearch-footer-shadow: inset 0 1px 0 0 rgba(73,76,106,.5),0 -4px 8px 0 rgba(0,0,0,.2);
439+
}
440+
}

0 commit comments

Comments
 (0)