Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
geongeorge committed Oct 11, 2020
2 parents 7b588cc + a731cb0 commit 0cb59dc
Show file tree
Hide file tree
Showing 9 changed files with 136 additions and 10 deletions.
16 changes: 16 additions & 0 deletions assets/images/telegram-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/styles/layouts/_article.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.article-layout {
min-height: 90vh;
}
2 changes: 0 additions & 2 deletions assets/styles/layouts/_post.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

.static-sidebar-wrapper {
@apply static h-full inset-0 flex-none w-full;

min-width: 258px;
}

@screen lg {
Expand Down
1 change: 1 addition & 0 deletions assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
@import "layouts/pages";
@import "layouts/expr";
@import "layouts/post";
@import "layouts/article";

/* Import components */
@import "components/buttons";
Expand Down
3 changes: 2 additions & 1 deletion assets/styles/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ module.exports = {
"dark-hover",
"dark-group-hover",
"dark-even",
"dark-odd"
"dark-odd",
"hover",
],
textColor: ["group-hover", "hover", "dark", "dark-hover", "dark-active"],
borderColor: ["dark", "dark-focus", "dark-focus-within"],
Expand Down
2 changes: 1 addition & 1 deletion components/layouts/base/footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
<div class="px-2 text-gray-500">
by
<a href="https://geongeorge.com/" class="underline" target="_blank">geon</a>
<a href="https://twitter.com/geongeorgek" class="underline" target="_blank">geon</a>
</div>
</div>
</div>
Expand Down
24 changes: 18 additions & 6 deletions components/layouts/expr.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,25 @@
/>
</a>
</div>
<div class="mx-auto w-full text-center mt-10">
<div class="mt-6 w-full w-2/5 sponsor-effect">
<a
href="https://bit.ly/ihr-contribute"
rel="nofollow"
class="p-2 text-white font-bold underline text-red-400 hover:text-red-600 rounded"
href="http://bit.ly/ihr-telegram"
rel="noopener nofollow"
target="_blank"
>Sponsor us</a>
>
<img
class="sponsor mx-auto"
src="~/assets/images/telegram-group.svg"
alt="datree.io"
/>
</a>
</div>
<div class="mx-auto w-full text-center mt-10">
<nuxt-link to="/donate"
class="p-2 text-white font-bold underline text-red-400 hover:text-red-600 rounded"
>
Support this project
</nuxt-link>
</div>
</div>
</div>
Expand Down Expand Up @@ -113,7 +125,7 @@ export default {
min-width: 200px;
}
.sponsor-effect {
opacity: 0.7;
opacity: 0.8;
transition: opacity 200ms ease-out;
}
.sponsor-effect:hover {
Expand Down
21 changes: 21 additions & 0 deletions layouts/article.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<template>
<post>
<article class="article-layout">
<nuxt></nuxt>
</article>
</post>
</template>

<script>
import post from "~/components/layouts/base/post";
export default {
components: {
post
}
}
</script>

<style>
</style>
74 changes: 74 additions & 0 deletions pages/donate.vue

Large diffs are not rendered by default.

0 comments on commit 0cb59dc

Please sign in to comment.