From 39decd84956ade7b3f47347110b7b1bc35bf77bf Mon Sep 17 00:00:00 2001 From: dragosct <17456857+dragosct10@users.noreply.github.com> Date: Wed, 27 May 2020 18:14:13 +0300 Subject: [PATCH] Feature/add open collective (#2224) * feat: code-fund re-positioned * refactor: remove patreon add opencollective * feature: change active theme position on dropdown * feature: fixed white spaces * feature: fixed white spaces --- FUNDING.yml | 3 +- ROADMAP.md | 6 +-- docs/app/components/AdManager.vue | 26 +++-------- docs/app/components/PageContainer.vue | 12 ++++++ docs/app/pages/Home/Home.vue | 3 ++ docs/app/pages/Home/HomeSponsors.vue | 5 --- docs/app/template/MainHeader.vue | 62 +++++++-------------------- 7 files changed, 39 insertions(+), 78 deletions(-) diff --git a/FUNDING.yml b/FUNDING.yml index a6c03fff9..bce2ae6f5 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1,2 +1 @@ -patreon: marcosmoura -custom: http://bit.ly/VueMaterialPaypal +open_collective: vue-material diff --git a/ROADMAP.md b/ROADMAP.md index c7493302e..9aafe4f03 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -230,10 +230,10 @@ Well. All kind of help are welcome. If you want to contribute with the project, ## Awesome! I want to pay you a coffee! Vue Material do not run under the umbrella of any company or something like that, and is an independent project created by me on spare time. It became one of the most used UI Libraries for Vue.js. -If you think that this project helped you or your company in some way, you can consider become a backer/sponsor on Patreon: +If you think that this project helped you or your company in some way, you can consider become a backer/sponsor on Open Collective:

- - + +

diff --git a/docs/app/components/AdManager.vue b/docs/app/components/AdManager.vue index c627b0c27..4f49795c1 100644 --- a/docs/app/components/AdManager.vue +++ b/docs/app/components/AdManager.vue @@ -62,28 +62,12 @@ font-size: 12px; line-height: 1.5em; - @media (min-width: $ad-responsive-big) { - margin: 0; - position: fixed; - top: 80px; - right: 24px; - z-index: 1000; - } - - @media (max-width: $ad-responsive-small) { - max-width: none; - margin: 8px auto 16px; - float: none; - } - .splash-container & { - @media (max-width: $ad-responsive-big) { - max-width: 530px; - min-height: 100px; - margin: 0px auto 8px; - float: none; - background: none !important; - } + max-width: 530px; + min-height: 100px; + margin: 0px auto 8px; + float: none; + background: none !important; } } diff --git a/docs/app/components/PageContainer.vue b/docs/app/components/PageContainer.vue index af808c357..525e27406 100644 --- a/docs/app/components/PageContainer.vue +++ b/docs/app/components/PageContainer.vue @@ -43,6 +43,8 @@ @import "~vue-material/components/MdAnimation/variables"; @import "~vue-material/theme/engine"; + $ad-responsive-big: 1690px; + .page-container.centered { max-width: 1100px; margin: 0 auto; @@ -113,6 +115,16 @@ position: fixed; } + @media (min-width: $ad-responsive-big) { + .ad-manager >>> .code-fund { + margin: 0; + position: fixed; + bottom: 0; + right: 24px; + z-index: 1000; + } + } + @media(max-width: 960px){ .ad-manager{ position: relative; diff --git a/docs/app/pages/Home/Home.vue b/docs/app/pages/Home/Home.vue index 466c099f3..24e45b32e 100644 --- a/docs/app/pages/Home/Home.vue +++ b/docs/app/pages/Home/Home.vue @@ -132,6 +132,9 @@ display: flex !important; align-items: center; flex-direction: row; + max-width: none; + margin: 8px auto 16px; + float: none; .code-fund-image { max-width: 175px; diff --git a/docs/app/pages/Home/HomeSponsors.vue b/docs/app/pages/Home/HomeSponsors.vue index 0cdd35168..faac2a328 100644 --- a/docs/app/pages/Home/HomeSponsors.vue +++ b/docs/app/pages/Home/HomeSponsors.vue @@ -19,11 +19,6 @@ - - - - -