Skip to content

Commit

Permalink
revert: revert add responsive layout"
Browse files Browse the repository at this point in the history
This reverts commit aa1b001, reversing
changes made to d69d8a1.
  • Loading branch information
BeADre committed Jan 29, 2022
1 parent ec9a182 commit d54e500
Show file tree
Hide file tree
Showing 70 changed files with 1,189 additions and 406 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/deploy-playground-sync-gitee.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Deploy Playground And Sync to Gitee

on:
push:
branches: [dev, main]

jobs:
deploy-playground-sync-gitee:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 6

- name: Set node version to 14
uses: actions/setup-node@v2
with:
node-version: '14.x'
cache: 'pnpm'

- name: Install dependencies
run: pnpm bootstrap

- name: Build playground
run: cd packages/varlet-ui-playground && pnpm build

- name: Deploy site
uses: JamesIves/[email protected]
with:
branch: playground-gh-page
folder: packages/varlet-ui-playground/site

- name: Sync to Gitee
uses: wearerequired/git-mirror-action@master
env:
SSH_PRIVATE_KEY: ${{ secrets.GITEE_RSA_PRIVATE_KEY }}
with:
source-repo: [email protected]:varletjs/varlet.git
destination-repo: [email protected]:varlet/varlet-ui-playground.git
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ packages/varlet-ui/umd
packages/varlet-ui/coverage
packages/varlet-ui/highlight

packages/varlet-ui-playground/site
packages/varlet-ui-playground/public/touch-emulator
packages/varlet-ui-playground/public/varlet.esm.js
packages/varlet-ui-playground/public/varlet-touch-emulator.js
packages/varlet-ui-playground/public/varlet.css

packages/varlet-icons/dist

packages/varlet-vscode-extension/dist
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ packages/varlet-ui/coverage/**
packages/varlet-ui/highlight/**
packages/varlet-ui/types/global.d.ts

packages/varlet-ui-playground/dist/**
packages/varlet-ui-playground/public/**

**/package.json
*.md

Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
## [1.25.1](https://github.com/varletjs/varlet/compare/v1.25.0...v1.25.1) (2022-01-27)


### Bug Fixes

* **cli/site:** do not show the fold icon when the height is not high enough to expand the code block ([b4cd0b5](https://github.com/varletjs/varlet/commit/b4cd0b5dc9e7a19c7933d515ee83bf6666578c4f))
* **cli:** fix select scrollbar display error [#305](https://github.com/varletjs/varlet/issues/305) and add esm bundle ([f66ffb7](https://github.com/varletjs/varlet/commit/f66ffb70e197d3f508eeb07488496c6c5d3008bf))
* **collapse:** fix modelValue is undefined when close accrodion item ([0da3871](https://github.com/varletjs/varlet/commit/0da38718b58ddac463965194e4160e1541318803))
* **index-bar:** support ssr and fix top value when click anchor ([6c7df9f](https://github.com/varletjs/varlet/commit/6c7df9f4b218ca4174f610262112dbe8567fecc1))
* **ui/input,select:** fix label color error ([652ae97](https://github.com/varletjs/varlet/commit/652ae97bb594ffa6a9309ec004b8b9c5ebc8ead6))
* **ui/select:** fix word break ([95b1684](https://github.com/varletjs/varlet/commit/95b16848c6672470ea8f75328ac043525ca08057))
* **ui/sticky:** add doubleRaf for ssr [#296](https://github.com/varletjs/varlet/issues/296) ([ed1348c](https://github.com/varletjs/varlet/commit/ed1348c78805282349815d317a98d262915b98f1))
* **ui/tabs:** support nuxt3 ([9459d1d](https://github.com/varletjs/varlet/commit/9459d1d8d36264487d4a3dc29dc82fe22ccfd328))


### Features

* **backTop:** add position and default target ([86f9237](https://github.com/varletjs/varlet/commit/86f92376600578db8433ad67540d931d87bdc773))
* **ui/app-bar:** change app-bar default background color in dark mode ([a073dee](https://github.com/varletjs/varlet/commit/a073dee493408a269666ef9615789d8c446d1e76))
* **ui/dialog:** add dialog-class dialog-style props ([e7f9b5d](https://github.com/varletjs/varlet/commit/e7f9b5d791eb0a1a76d0a6c31b60430880232a2c))
* **ui/skeleton:** add fullscreen-z-index prop ([394f0a9](https://github.com/varletjs/varlet/commit/394f0a9b8dabc5b877f9b27d71e5337ca6876921))


### Performance Improvements

* optimize utils ([24c0f79](https://github.com/varletjs/varlet/commit/24c0f79d83737bf93bfd6220176edb6271250c3b))



# [1.25.0](https://github.com/varletjs/varlet/compare/v1.24.11...v1.25.0) (2022-01-19)


Expand Down
2 changes: 1 addition & 1 deletion README.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Varlet is a Material design mobile component library developed based on `Vue3`,
7. Support WebStorm, VS Code component syntax highlighting
8. Support the SSR
9. Support the Typescript
10. More than 90 percent unit test coverage, providing stability assurance
10. Make sure more than 90 percent unit test coverage, providing stability assurance
11. Support dark mode

### Install
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Varlet 是一个基于 `Vue3` 开发的 Material 风格移动端组件库,全
7. 支持 webstorm,vscode 组件属性高亮
8. 支持 SSR
9. 支持 Typescript
10. 90%以上单元测试覆盖率,提供稳定性保证
10. 确保90%以上单元测试覆盖率,提供稳定性保证
11. 支持暗黑模式

### 安装
Expand Down
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "1.25.0",
"version": "1.25.1",
"scripts": {
"preinstall": "npx only-allow pnpm",
"bootstrap": "pnpm install && node scripts/bootstrap.mjs",
Expand Down Expand Up @@ -30,7 +30,9 @@
"packages/varlet-ui/site/**",
"packages/varlet-ui/public/**",
"packages/varlet-ui/src/*/__tests__/**",
"packages/varlet-ui/.varlet/**"
"packages/varlet-ui/.varlet/**",
"packages/varlet-ui-playground/public/**",
"packages/varlet-ui-playground/dist/**"
],
"extends": [
"@varlet"
Expand All @@ -52,7 +54,9 @@
"packages/varlet-ui/coverage/**",
"packages/varlet-ui/highlight/**",
"packages/varlet-ui/public/**",
"packages/varlet-ui/.varlet/**"
"packages/varlet-ui/.varlet/**",
"packages/varlet-ui-playground/public/**",
"packages/varlet-ui-playground/dist/**"
]
},
"devDependencies": {
Expand All @@ -71,4 +75,4 @@
"typescript": "^4.4.4"
},
"packageManager": "[email protected]"
}
}
1 change: 1 addition & 0 deletions packages/varlet-cli/README.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ module.exports = {
header: {
darkMode: null,
i18n: null,
playground: null,
github: 'https://github.com/varletjs/varlet',
},
},
Expand Down
1 change: 1 addition & 0 deletions packages/varlet-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ module.exports = {
header: {
darkMode: null,
i18n: null,
playground: null,
github: 'https://github.com/varletjs/varlet',
},
},
Expand Down
1 change: 1 addition & 0 deletions packages/varlet-cli/generators/base/varlet.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ module.exports = {
},
header: {
i18n: null,
playground: null,
github: 'https://github.com/varletjs/varlet',
},
menu: [
Expand Down
2 changes: 1 addition & 1 deletion packages/varlet-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@varlet/cli",
"version": "1.25.0",
"version": "1.25.1",
"description": "cli of varlet",
"bin": {
"varlet-cli": "./lib/index.js"
Expand Down
21 changes: 19 additions & 2 deletions packages/varlet-cli/site/pc/components/AppHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@
</div>

<div class="varlet-site-header__tail">
<a
class="varlet-site-header__link"
target="_blank"
:href="playground"
v-ripple
v-if="playground"
>
<var-site-icon name="code-json" :size="24" />
</a>
<a
class="varlet-site-header__link"
target="_blank"
Expand Down Expand Up @@ -80,8 +89,9 @@ export default defineComponent({
const logo: Ref<string> = ref(get(config, 'logo'))
const themesKey = get(config, 'themesKey')
const languages: Ref<Record<string, string>> = ref(get(config, 'pc.header.i18n'))
const github: Ref<Record<string, string>> = ref(get(config, 'pc.header.github'))
const darkMode: Ref<Record<string, string>> = ref(get(config, 'pc.header.darkMode'))
const playground: Ref<string> = ref(get(config, 'pc.header.playground'))
const github: Ref<string> = ref(get(config, 'pc.header.github'))
const darkMode: Ref<boolean> = ref(get(config, 'pc.header.darkMode'))
const currentThemes = ref(getBrowserThemes(themesKey))
const isOpenMenu: Ref<boolean> = ref(false)
Expand Down Expand Up @@ -120,6 +130,7 @@ export default defineComponent({
title,
languages,
nonEmptyLanguages,
playground,
github,
isOpenMenu,
darkMode,
Expand Down Expand Up @@ -201,6 +212,12 @@ export default defineComponent({
align-items: center;
}
@media screen and (max-width: 400px) {
&__tail {
display: none;
}
}
&__language {
border-radius: 3px;
height: 40px;
Expand Down
1 change: 1 addition & 0 deletions packages/varlet-cli/varlet.default.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module.exports = {
'en-US': 'English',
},
github: 'https://github.com/varletjs/varlet',
playground: 'https://varlet.gitee.io/varlet-ui-playground',
darkMode: true,
},
clipboard: {
Expand Down
2 changes: 1 addition & 1 deletion packages/varlet-eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@varlet/eslint-config",
"version": "1.25.0",
"version": "1.25.1",
"description": "eslint config of varlet",
"keywords": [
"eslint",
Expand Down
2 changes: 1 addition & 1 deletion packages/varlet-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@varlet/icons",
"version": "1.25.0",
"version": "1.25.1",
"description": "Icons of varlet",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand Down
1 change: 1 addition & 0 deletions packages/varlet-icons/svg/uF113-code-json.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/varlet-markdown-vite-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@varlet/markdown-vite-plugin",
"version": "1.25.0",
"version": "1.25.1",
"description": "markdown vite plugin of varlet",
"keywords": [
"vite",
Expand Down
2 changes: 1 addition & 1 deletion packages/varlet-stylelint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@varlet/stylelint-config",
"version": "1.25.0",
"version": "1.25.1",
"description": "stylelint config of varlet",
"keywords": [
"stylelint",
Expand Down
2 changes: 1 addition & 1 deletion packages/varlet-touch-emulator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@varlet/touch-emulator",
"version": "1.25.0",
"version": "1.25.1",
"description": "touch-emulator",
"keywords": [
"emulator",
Expand Down
22 changes: 22 additions & 0 deletions packages/varlet-ui-playground/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" type="image/svg" href="./logo.svg" />
<title>Varlet UI Playground</title>
<script>
// process shim for old versions of @vue/compiler-sfc dependency
window.process = { env: {} }
const saved = localStorage.getItem('varlet-ui-playground-prefer-dark')
if (saved !== 'false') {
document.documentElement.classList.add('dark')
}
</script>
<script type="module" src="./src/main.ts"></script>
</head>
<body>
<div id="app"></div>
</body>
</html>
32 changes: 32 additions & 0 deletions packages/varlet-ui-playground/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "@varlet/ui-playground",
"private": true,
"version": "0.0.0",
"description": "varlet ui playground",
"keywords": [
"varlet ui",
"playground",
"repl"
],
"license": "MIT",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "varlet-cli preview"
},
"dependencies": {
"@varlet/ui": "workspace: *",
"@vue/repl": "1.0.0",
"vue": "3.2.29",
"file-saver": "^2.0.5",
"jszip": "^3.6.0"
},
"devDependencies": {
"@varlet/cli": "workspace: *",
"@types/node": "*",
"@types/file-saver": "^2.0.5",
"@vitejs/plugin-vue": "2.1.0",
"typescript": "^4.4.4",
"vite": "2.7.13"
}
}
30 changes: 30 additions & 0 deletions packages/varlet-ui-playground/public/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d54e500

Please sign in to comment.