Skip to content

Commit 2466c6d

Browse files
JanHolgerJanHolger
committed
Merge branch 'master' of github.com:JavaWebStack/docs
2 parents 6553dfa + 2a03ae5 commit 2466c6d

4 files changed

Lines changed: 98 additions & 4 deletions

File tree

‎src/assets/scss/app.scss‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
font-family: manrope, sans-serif;
88
}
99

10+
html {
11+
scroll-behavior: smooth;
12+
}
13+
1014
#page {
1115
max-width: 1200px;
1216
padding: 0px 20px;
@@ -21,6 +25,16 @@
2125
#markdown-contents {
2226
font-size: 21px;
2327

28+
code {
29+
background: #00000011;
30+
border-radius: 5px;
31+
padding: 0px 4px;
32+
}
33+
34+
code pre {
35+
font-size: 16px;
36+
}
37+
2438
h1, h2, h3 {
2539
border-bottom: 1.3px #CCC solid;
2640
padding-bottom: 10px;

‎src/components/Navigation.vue‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
</div>
1414
</div>
1515
<div id="docs-sidenav" v-if="$route.meta.docs">
16-
asd
16+
<router-link class="sidenav-entry" to="/docs">
17+
Hello there
18+
</router-link>
19+
<router-link class="sidenav-entry selected" to="/docs">
20+
Hello there 2
21+
</router-link>
1722
</div>
1823

1924
</div>
@@ -95,5 +100,24 @@ export default {
95100
width: 300px;
96101
height: 100%;
97102
top: 71.1px;
103+
104+
.sidenav-entry,
105+
.sidenav-entry:visited {
106+
text-decoration: none;
107+
color: #434343;
108+
display: block;
109+
padding: 7px 10px;
110+
font-weight: 600;
111+
transition: 0.3s;
112+
font-size: 18px;
113+
&.selected {
114+
color: #60A8FD;
115+
background: #60A8FD22;
116+
}
117+
&:hover {
118+
color: #60A8FD;
119+
background: #60A8FD11;
120+
}
121+
}
98122
}
99123
</style>

‎src/router/index.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ const router = new VueRouter({
4848
routes
4949
})
5050

51+
router.afterEach(()=>{
52+
window.scrollTo(0, 0)
53+
})
54+
5155
router.beforeEach((to, from, next)=>{
5256
document.title = (to.meta.title || "404") + " | JavaWebStack"
5357
next()

‎src/views/Home.vue‎

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="3" y="45" width="46" height="52">
1212
<path d="M26 45L37.18 51.6357L48.5167 58L48.36 71L48.5167 84L37.18 90.3643L26 97L14.82 90.3643L3.48334 84L3.64 71L3.48334 58L14.82 51.6357L26 45Z" fill="#C4C4C4"/>
1313
</mask>
14-
<g mask="url(#mask0)">
14+
<g mask="url(#mask0)" id="block1">
1515
<path d="M26 45L37.18 51.6357L48.5167 58L48.36 71L48.5167 84L37.18 90.3643L26 97L14.82 90.3643L3.48334 84L3.64 71L3.48334 58L14.82 51.6357L26 45Z" fill="#60A8FD"/>
1616
<rect x="26" y="58.1287" width="22.9109" height="58.1782" fill="#5FA4F5"/>
1717
<path d="M26 19L37.18 25.6357L48.5167 32L48.36 45L48.5167 58L37.18 64.3643L26 71L14.82 64.3643L3.48334 58L3.64 45L3.48334 32L14.82 25.6357L26 19Z" fill="#599CEB"/>
1818
</g>
1919
<mask id="mask1" mask-type="alpha" maskUnits="userSpaceOnUse" x="55" y="45" width="46" height="52">
2020
<path d="M78 45L89.18 51.6357L100.517 58L100.36 71L100.517 84L89.18 90.3643L78 97L66.82 90.3643L55.4833 84L55.64 71L55.4833 58L66.82 51.6357L78 45Z" fill="#C4C4C4"/>
2121
</mask>
22-
<g mask="url(#mask1)">
22+
<g mask="url(#mask1)" id="block2">
2323
<path d="M78 45L89.18 51.6357L100.517 58L100.36 71L100.517 84L89.18 90.3643L78 97L66.82 90.3643L55.4833 84L55.64 71L55.4833 58L66.82 51.6357L78 45Z" fill="#60A8FD"/>
2424
<rect x="78" y="58.1287" width="22.9109" height="58.1782" fill="#5FA4F5"/>
2525
<path d="M78 19L89.18 25.6357L100.517 32L100.36 45L100.517 58L89.18 64.3643L78 71L66.82 64.3643L55.4833 58L55.64 45L55.4833 32L66.82 25.6357L78 19Z" fill="#599CEB"/>
2626
</g>
2727
<mask id="mask2" mask-type="alpha" maskUnits="userSpaceOnUse" x="29" y="0" width="46" height="52">
2828
<path d="M52 0L63.18 6.63567L74.5167 13L74.36 26L74.5167 39L63.18 45.3643L52 52L40.82 45.3643L29.4833 39L29.64 26L29.4833 13L40.82 6.63567L52 0Z" fill="#C4C4C4"/>
2929
</mask>
30-
<g mask="url(#mask2)">
30+
<g mask="url(#mask2)" id="block3">
3131
<path d="M52 0L63.18 6.63567L74.5167 13L74.36 26L74.5167 39L63.18 45.3643L52 52L40.82 45.3643L29.4833 39L29.64 26L29.4833 13L40.82 6.63567L52 0Z" fill="#60A8FD"/>
3232
<rect x="52" y="13.1287" width="22.9109" height="58.1782" fill="#5FA4F5"/>
3333
<path d="M52 -26L63.18 -19.3643L74.5167 -13L74.36 0L74.5167 13L63.18 19.3643L52 26L40.82 19.3643L29.4833 13L29.64 0L29.4833 -13L40.82 -19.3643L52 -26Z" fill="#599CEB"/>
@@ -134,4 +134,56 @@ export default {
134134
}
135135
}
136136
}
137+
138+
#block1 {
139+
position: relative;
140+
animation: block1anim 10s infinite;
141+
}
142+
143+
#block2 {
144+
position: relative;
145+
animation: block2anim 10s infinite;
146+
147+
}
148+
149+
#block3 {
150+
position: relative;
151+
animation: block3anim 10s infinite;
152+
}
153+
154+
@keyframes block1anim {
155+
0% {
156+
transform: none;
157+
}
158+
50% {
159+
transform: translateY(-2px) translateX(2.3px);
160+
}
161+
100%{
162+
transform: none;
163+
}
164+
}
165+
166+
@keyframes block2anim {
167+
0%{
168+
transform: none;
169+
}
170+
50%{
171+
transform: translateY(-2px) translateX(-2.3px);
172+
}
173+
100%{
174+
transform: none;
175+
}
176+
}
177+
178+
@keyframes block3anim {
179+
0%{
180+
transform: none;
181+
}
182+
50%{
183+
transform: translateY(2.3px);
184+
}
185+
100%{
186+
transform: none;
187+
}
188+
}
137189
</style>

0 commit comments

Comments
 (0)