Skip to content

Commit 0cb59dc

Browse files
committed
Merge branch 'develop'
2 parents 7b588cc + a731cb0 commit 0cb59dc

File tree

9 files changed

+136
-10
lines changed

9 files changed

+136
-10
lines changed

assets/images/telegram-group.svg

+16
Loading

assets/styles/layouts/_article.scss

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.article-layout {
2+
min-height: 90vh;
3+
}

assets/styles/layouts/_post.scss

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
.static-sidebar-wrapper {
1515
@apply static h-full inset-0 flex-none w-full;
16-
17-
min-width: 258px;
1816
}
1917

2018
@screen lg {

assets/styles/main.scss

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
@import "layouts/pages";
1818
@import "layouts/expr";
1919
@import "layouts/post";
20+
@import "layouts/article";
2021

2122
/* Import components */
2223
@import "components/buttons";

assets/styles/tailwind.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ module.exports = {
3737
"dark-hover",
3838
"dark-group-hover",
3939
"dark-even",
40-
"dark-odd"
40+
"dark-odd",
41+
"hover",
4142
],
4243
textColor: ["group-hover", "hover", "dark", "dark-hover", "dark-active"],
4344
borderColor: ["dark", "dark-focus", "dark-focus-within"],

components/layouts/base/footer.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</div>
99
<div class="px-2 text-gray-500">
1010
by
11-
<a href="https://geongeorge.com/" class="underline" target="_blank">geon</a>
11+
<a href="https://twitter.com/geongeorgek" class="underline" target="_blank">geon</a>
1212
</div>
1313
</div>
1414
</div>

components/layouts/expr.vue

+18-6
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,25 @@
4848
/>
4949
</a>
5050
</div>
51-
<div class="mx-auto w-full text-center mt-10">
51+
<div class="mt-6 w-full w-2/5 sponsor-effect">
5252
<a
53-
href="https://bit.ly/ihr-contribute"
54-
rel="nofollow"
55-
class="p-2 text-white font-bold underline text-red-400 hover:text-red-600 rounded"
53+
href="http://bit.ly/ihr-telegram"
54+
rel="noopener nofollow"
5655
target="_blank"
57-
>Sponsor us</a>
56+
>
57+
<img
58+
class="sponsor mx-auto"
59+
src="~/assets/images/telegram-group.svg"
60+
alt="datree.io"
61+
/>
62+
</a>
63+
</div>
64+
<div class="mx-auto w-full text-center mt-10">
65+
<nuxt-link to="/donate"
66+
class="p-2 text-white font-bold underline text-red-400 hover:text-red-600 rounded"
67+
>
68+
Support this project
69+
</nuxt-link>
5870
</div>
5971
</div>
6072
</div>
@@ -113,7 +125,7 @@ export default {
113125
min-width: 200px;
114126
}
115127
.sponsor-effect {
116-
opacity: 0.7;
128+
opacity: 0.8;
117129
transition: opacity 200ms ease-out;
118130
}
119131
.sponsor-effect:hover {

layouts/article.vue

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<template>
2+
<post>
3+
<article class="article-layout">
4+
<nuxt></nuxt>
5+
</article>
6+
</post>
7+
</template>
8+
9+
<script>
10+
import post from "~/components/layouts/base/post";
11+
12+
export default {
13+
components: {
14+
post
15+
}
16+
}
17+
</script>
18+
19+
<style>
20+
21+
</style>

pages/donate.vue

+74
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)