Merge remote-tracking branch 'upstream/develop' into feat/2924-histoi…

…re-support
epicmaxco · Apr 30, 2023 · 4b6fab8 · 4b6fab8
2 parents fab1cbc + ff8f7d2
commit 4b6fab8
Show file tree

Hide file tree

Showing 95 changed files with 3,865 additions and 3,442 deletions.
diff --git a/README.md b/README.md
@@ -99,24 +99,28 @@ Information, guides and tutorials are available
 on [vuestic.dev](https://vuestic.dev)
 
 ### Partners & Sponsors ❤️
+
 <div>
- <a href="https://vuejs.org/partners/epicmax.html" target="_blank" title="VueJS - The Progressive JavaScript Framework">
+ <!-- <a href="https://vuejs.org/partners/epicmax.html" target="_blank" title="VueJS - The Progressive JavaScript Framework">
  <picture>
  <source media="(prefers-color-scheme: dark)" srcset="./.github/assets/vuejs-light.svg" />
  <img src="./.github/assets/vuejs.svg" loading="lazy" alt=""/>
  </picture>
- </a>
+ </a> -->
  <a href="https://nuxt.com/support/agencies/epicmax" target="_blank" title="Nuxt - The Intuitive Web Framework">
  <picture>
   <source media="(prefers-color-scheme: dark)" srcset="./.github/assets/nuxt-light.svg" />
-  <img hspace="15" src="./.github/assets/nuxt.svg" loading="lazy" alt=""/>
+  <img src="./.github/assets/nuxt.svg" loading="lazy" alt=""/>
  </picture>
  </a>
  <a href="https://epicmax.co/" target="_blank" title="Epicmax - Top Vue.js Development Company">
- <img src="./.github/assets/epicmax.svg" loading="lazy" alt="">
+ <img hspace="24" src="./.github/assets/epicmax.svg" loading="lazy" alt="">
  </a>
- <a href="https://www.jetbrains.com/" target="_blank" title="JetBrains: Essential tools for software developers and teams">
- <img hspace="15" src="./.github/assets/jb_square.svg" loading="lazy" alt="">
+ <a href="https://vuejobs.com/" target="_blank" title="Vue.js jobs – Browse through dozens of Vue.js openings">
+ <picture>
+  <source media="(prefers-color-scheme: dark)" srcset="./.github/assets/vuejobs-light.svg" />
+  <img src="./.github/assets/vuejobs.svg" loading="lazy" alt=""/>
+ </picture>
  </a>
  <br />
  <br />
@@ -126,18 +130,15 @@ on [vuestic.dev](https://vuestic.dev)
   <img src="./.github/assets/aggrid.svg" loading="lazy" alt=""/>
  </picture>
  </a>
- <a href="https://vuejobs.com/" target="_blank" title="Vue.js jobs – Browse through dozens of Vue.js openings">
- <picture>
-  <source media="(prefers-color-scheme: dark)" srcset="./.github/assets/vuejobs-light.svg" />
-  <img hspace="15" src="./.github/assets/vuejobs.svg" loading="lazy" alt=""/>
- </picture>
- </a>
  <a href="https://flatlogic.com/" target="_blank" title="Flatlogic - The best way to create React, Angular and Vue full-stack web applications">
  <picture>
   <source media="(prefers-color-scheme: dark)" srcset="./.github/assets/flatlogic-light.svg" />
-  <img src="./.github/assets/flatlogic.svg" loading="lazy" alt=""/>
+  <img hspace="24" src="./.github/assets/flatlogic.svg" loading="lazy" alt=""/>
  </picture>
  </a>
+ <a href="https://www.jetbrains.com/" target="_blank" title="JetBrains: Essential tools for software developers and teams">
+ <img src="./.github/assets/jb_square.svg" loading="lazy" alt="">
+ </a>
 </div>
 <br />
 
@@ -157,10 +158,12 @@ example of a real-world web application based on Vuestic UI.
 ### Contributing
 
 Thanks for all your wonderful PRs, issues and ideas.
+
 <a href="https://github.com/epicmaxco/vuestic-ui/graphs/contributors">
-<img src="https://opencollective.com/vuestic-ui/contributors.svg?width=890&button=false" />
+ <img src="https://opencollective.com/vuestic-ui/contributors.svg?width=890&button=false" />
 </a>
-<br>
+<br />
+
 You’re always welcome to join: check out
 our <a href="https://vuestic.dev/en/contribution/guide">
 contribution guides</a>

diff --git a/package.json b/package.json
@@ -41,10 +41,10 @@
  "pre-commit": "lerna run --concurrency 1 --stream precommit --since HEAD"
  },
  "resolutions": {
- "nuxt": "3.4.0",
- "semver": "^7.0.0",
+ "nuxt": "3.1.1",
  "vue": "3.2.37",
+ "vite": "^4",
  "vue-router": "4.1.6",
- "@nuxt/schema": "3.4.0"
+ "@nuxt/schema": "3.0.0"
  }
 }
diff --git a/packages/docs/assets/fonts.scss b/packages/docs/assets/fonts.scss
@@ -2,33 +2,35 @@
 @mixin title-font() {
  font-weight: 900;
  font-size: 4.5rem;
+ line-height: 1;
 
- @include lg(font-size, 4rem);
- @include md(font-size, 3rem);
- @include sm(font-size, 2.5rem);
+ @include lg(font-size, 4.5rem);
+ @include md(font-size, 4rem);
+ @include sm(font-size, 3.0rem);
  @include xs(font-size, 2rem);
 }
 
 // sub headers
 @mixin subtitle-font() {
- font-weight: 700;
- font-size: 1.4rem;
+ font-weight: 900;
+ font-size: 4rem;
+ line-height: 1;
 
- @include lg(font-size, 1.4rem);
- @include md(font-size, 1.3rem);
- @include sm(font-size, 1.25rem);
- @include xs(font-size, 1.2rem);
+ @include lg(font-size, 4rem);
+ @include md(font-size, 3.5rem);
+ @include sm(font-size, 2.5rem);
+ @include xs(font-size, 2.0rem);
 }
 
 // text
 @mixin text-font() {
  font-weight: normal;
  font-size: 1.2rem;
 
- @include lg(font-size, 1rem);
- @include md(font-size, 0.95rem);
- @include sm(font-size, 0.925rem);
- @include xs(font-size, 0.9rem);
+ @include lg(font-size, 1.2rem);
+ @include md(font-size, 1.2rem);
+ @include sm(font-size, 1.2rem);
+ @include xs(font-size, 1.2rem);
 }
 
 // link
@@ -45,12 +47,12 @@
 // button
 @mixin button-font() {
  font-weight: 600;
- font-size: 1.1rem;
+ font-size: 1.2rem;
 
- @include lg(font-size, 1rem);
- @include md(font-size, 0.95rem);
- @include sm(font-size, 0.925rem);
- @include xs(font-size, 0.9rem);
+ @include lg(font-size, 1.2rem);
+ @include md(font-size, 1.2rem);
+ @include sm(font-size, 1.2rem);
+ @include xs(font-size, 1.2rem);
 }
 
 // code

diff --git a/packages/docs/assets/smart-grid.scss b/packages/docs/assets/smart-grid.scss
@@ -2,12 +2,12 @@
 
 $columns: 12;
 
-$break_lg: 1100px;
-$break_md: 960px;
-$break_sm: 780px;
-$break_xs: 560px;
+$break_lg: 1920px;
+$break_md: 1440px;
+$break_sm: 1024px;
+$break_xs: 640px;
 
-$offset: 30px;
+$offset: 32px;
 $offset_lg: $offset;
 $offset_md: $offset;
 $offset_sm: $offset;
@@ -19,7 +19,7 @@ $offset_md_one_side: ($offset_md * 0.5);
 $offset_sm_one_side: ($offset_sm * 0.5);
 $offset_xs_one_side: ($offset_xs * 0.5);
 
-$fields: 15px;
+$fields: 1rem;
 
 @mixin wrapper-full() {
  padding-left: $fields;
@@ -36,8 +36,8 @@ $fields: 15px;
  #{$type}-right: $offset_one_side;
 }
 
-@mixin wrapper() {
- max-width: 1280px;
+@mixin wrapper($width: 1440px) {
+ max-width: $width;
  margin: 0 auto;
 
  @include wrapper-full();
@@ -123,6 +123,12 @@ $fields: 15px;
  @include sm(margin-left, #{calc(#{$val} + #{$offset_sm_one_side})});
 }
 
+@mixin shift-sm-right($n) {
+ $val: math.div(100%, $columns) * $n;
+
+ @include md(margin-right, #{calc(#{$val} + #{$offset_sm_one_side})});
+}
+
 @mixin shift-xs-left($n) {
  $val: math.div(100%, $columns) * $n;
 

diff --git a/packages/docs/assets/variables.scss b/packages/docs/assets/variables.scss
@@ -0,0 +1,13 @@
+:root {
+ --bg-header: #2450BE;
+ --bg-preview-1: #2450BE;
+ --bg-preview-2: #557DE2;
+ --bg-partners: #335DC9;
+ --bg-customize-1: #4D2CC1;
+ --bg-customize-2: #847EE2;
+ --bg-seamless: #F4F9FC;
+ --bg-admin: #F4F9FC;
+
+ --header-height: 4rem;
+ --header-z-index: 2000;
+}
diff --git a/packages/docs/components/AlgoliaSearch.vue b/packages/docs/components/AlgoliaSearch.vue
@@ -41,7 +41,7 @@ onMounted(() => {
  container: '#docsearch',
  appId: 'DVNV64RN9R',
  indexName: 'vuestic',
- apiKey: 'cd8e70cb466bf6df138543a38c33ea5e',
+ apiKey: '8b7272f0ee34e6e6c6e1b257c8fc054d',
  // absolutely kekw but docsearch is based on React, so we simulate React.createElement()
  // @ts-ignore
  hitComponent ({ hit, children }) {