diff --git a/examples/assets/images/intro-theme-b.png b/examples/assets/images/intro-theme-b.png new file mode 100644 index 000000000..46a5e22bc Binary files /dev/null and b/examples/assets/images/intro-theme-b.png differ diff --git a/examples/assets/images/theme-index-blue.png b/examples/assets/images/theme-index-blue.png new file mode 100644 index 000000000..94d126232 Binary files /dev/null and b/examples/assets/images/theme-index-blue.png differ diff --git a/examples/assets/images/theme-index-icon.svg b/examples/assets/images/theme-index-icon.svg new file mode 100644 index 000000000..e8d95dc35 --- /dev/null +++ b/examples/assets/images/theme-index-icon.svg @@ -0,0 +1 @@ +资源 104 \ No newline at end of file diff --git a/examples/assets/images/theme-index-red.png b/examples/assets/images/theme-index-red.png new file mode 100644 index 000000000..1a7f0d768 Binary files /dev/null and b/examples/assets/images/theme-index-red.png differ diff --git a/examples/assets/images/theme-intro.png b/examples/assets/images/theme-intro.png new file mode 100644 index 000000000..bb5da7a2d Binary files /dev/null and b/examples/assets/images/theme-intro.png differ diff --git a/examples/components/header.vue b/examples/components/header.vue index d75c5e6d1..7a154be8d 100644 --- a/examples/components/header.vue +++ b/examples/components/header.vue @@ -302,8 +302,7 @@
    • - - -
  • - -
    • diff --git a/examples/docs/en-US/custom-theme.md b/examples/docs/en-US/custom-theme.md index 15e82e465..22d4ed3d1 100644 --- a/examples/docs/en-US/custom-theme.md +++ b/examples/docs/en-US/custom-theme.md @@ -1,5 +1,10 @@ ## Custom theme -Element uses BEM-styled CSS so that you can override styles easily. But if you need to replace styles at a large scale, e.g. change the theme color from blue to orange or green, maybe overriding them one by one is not a good idea. We provide three ways to change the style variables. +Element uses BEM-styled CSS so that you can override styles easily. But if you need to replace styles at a large scale, e.g. change the theme color from blue to orange or green, maybe overriding them one by one is not a good idea. We provide four ways to change the style variables. + +### Online Theme Roller +Use [Online Theme Roller](./#/en-US/theme) to customize all Design Tokens of global variables and components，and preview the new theme in real-time.and it can generate a complete style package based on the new theme for you to download directly (to import new style files in your project, please refer to the 'Import custom theme' or 'Import component theme on demand' part of this section). + + ### Changing theme color If you just want to change the theme color of Element, the [theme preview website](https://elementui.github.io/theme-chalk-preview/#/en-US) is recommended. The theme color of Element is bright and friendly blue. By changing it, you can make Element more visually connected to specific projects. diff --git a/examples/docs/es/custom-theme.md b/examples/docs/es/custom-theme.md index e253796e4..a99858cf1 100644 --- a/examples/docs/es/custom-theme.md +++ b/examples/docs/es/custom-theme.md @@ -1,5 +1,10 @@ ## Tema personalizado -Element utiliza la metodología BEM en CSS con la finalidad de que puedas sobrescribir los estilos fácilmente. Pero, si necesita remplazar estilos a gran escala, por ejemplo, cambiar el color del tema de azul a naranja o verde, quizás reemplazarlos uno a uno no sea lo más adecuado, para ello hay 3 maneras de modificar los estilos. +Element utiliza la metodología BEM en CSS con la finalidad de que puedas sobrescribir los estilos fácilmente. Pero, si necesita remplazar estilos a gran escala, por ejemplo, cambiar el color del tema de azul a naranja o verde, quizás reemplazarlos uno a uno no sea lo más adecuado, para ello hay 4 maneras de modificar los estilos. + +### Online Theme Roller +Use [Online Theme Roller](./#/es/theme) to customize all Design Tokens of global variables and components，and preview the new theme in real-time.and it can generate a complete style package based on the new theme for you to download directly (to import new style files in your project, please refer to the 'Import custom theme' or 'Import component theme on demand' part of this section). + + ### Cambiando el color del tema Si lo que se busca es cambiar el color del tema de Element, se recomienda utilizar el [sitio de visualización de temas](https://elementui.github.io/theme-chalk-preview/#/en-US). Element utiliza un color azul brillante y amigable como tema principal. Al cambiarlo, puede hacer que Element este más conectado visualmente a proyectos específicos. diff --git a/examples/docs/fr-FR/custom-theme.md b/examples/docs/fr-FR/custom-theme.md index 17b44c018..b1f2fd210 100644 --- a/examples/docs/fr-FR/custom-theme.md +++ b/examples/docs/fr-FR/custom-theme.md @@ -1,5 +1,10 @@ ## Thème -Element utilise le style BEM pour le CSS afin que vous puissiez écraser les règles prédéfinies facilement. Mais si vous avez besoin de remplacer des styles à une plus grande échelle , e.g. changer le thème de bleu à orange ou vert, les modifier une par une serait fastidieux. Nous fournissons trois méthodes pour changer les variables de style. +Element utilise le style BEM pour le CSS afin que vous puissiez écraser les règles prédéfinies facilement. Mais si vous avez besoin de remplacer des styles à une plus grande échelle , e.g. changer le thème de bleu à orange ou vert, les modifier une par une serait fastidieux. Nous fournissons four méthodes pour changer les variables de style. + +### Online Theme Roller +Use [Online Theme Roller](./#/fr-FR/theme) to customize all Design Tokens of global variables and components，and preview the new theme in real-time.and it can generate a complete style package based on the new theme for you to download directly (to import new style files in your project, please refer to the 'Import custom theme' or 'Import component theme on demand' part of this section). + + ### Changer la couleur du thème Si vous avez juste besoin de changer la couleur du thème, le [générateur de thème en ligne](https://elementui.github.io/theme-chalk-preview/#/en-US) est recommandé. La couleur du thème d'Element est un bleu clair et agréable. En le changeant, vous rendez Element visuellement plus adapté à vos projets. diff --git a/examples/docs/zh-CN/custom-theme.md b/examples/docs/zh-CN/custom-theme.md index bb948f101..a1047bef3 100644 --- a/examples/docs/zh-CN/custom-theme.md +++ b/examples/docs/zh-CN/custom-theme.md @@ -1,5 +1,10 @@ ## 自定义主题 -Element 默认提供一套主题，CSS 命名采用 BEM 的风格，方便使用者覆盖样式。我们提供了三种方法，可以进行不同程度的样式自定义。 +Element 默认提供一套主题，CSS 命名采用 BEM 的风格，方便使用者覆盖样式。我们提供了四种方法，可以进行不同程度的样式自定义。 + +### 在线主题编辑器 +使用[在线主题编辑器](./#/zh-CN/theme)，可以修改定制 Element 所有全局和组件的 Design Tokens，并可以方便地实时预览样式改变后的视觉。同时它还可以基于新的定制样式生成完整的样式文件包，供直接下载使用（关于如何使用下载的主题包，请参考本节「引入自定义主题」和「搭配插件按需引入组件主题」部分）。 + + ### 仅替换主题色 如果仅希望更换 Element 的主题色，推荐使用[在线主题生成工具](https://elementui.github.io/theme-chalk-preview)。Element 默认的主题色是鲜艳、友好的蓝色。通过替换主题色，能够让 Element 的视觉更加符合具体项目的定位。 diff --git a/examples/i18n/page.json b/examples/i18n/page.json index 0df96c94a..1683ebab6 100644 --- a/examples/i18n/page.json +++ b/examples/i18n/page.json @@ -12,6 +12,11 @@ "7": "使用组件 Demo 快速体验交互细节；使用前端框架封装的代码帮助工程师快速开发。", "8": "资源", "9": "下载相关资源，用其快速搭建页面原型或高保真视觉稿，提升产品设计效率。", + "10": "主题", + "11": "在线主题编辑器，可视化定制和管理站点主题、组件样式", + "12": "主题定制功能上线", + "13": "点击开始编辑", + "14": "尝试您的新主题", "lang": "zh-CN", "titleSize": "34", "paraSize": "18" @@ -113,6 +118,11 @@ "7": "Experience interaction details by strolling through component demos. Use encapsulated code to improve developing efficiency.", "8": "Resource", "9": "Download relevant design resources for shaping page prototype or visual draft, increasing design efficiency.", + "10": "Theme", + "11": "Online theme roller, visualize custom and manage site themes and component styles", + "12": "Theme customization is available!", + "13": "Click here", + "14": "Make your own theme", "lang": "en-US", "titleSize": "34", "paraSize": "18" @@ -214,6 +224,11 @@ "7": "Experimenta la interacción al pasear con los ejemplos de los componentes. Utiliza el código encapsulado para mejorar la eficiencia en el desarrollo.", "8": "Recursos", "9": "Descarga los recursos de diseño relevantes para dar forma a un prototipo o borrador, aumentando la eficiencia del diseño.", + "10": "Theme", + "11": "Online theme roller, visualize custom and manage site themes and component styles", + "12": "Theme customization is available!", + "13": "Click here", + "14": "Make your own theme", "lang": "es", "titleSize": "34", "paraSize": "18" @@ -315,6 +330,11 @@ "7": "Découvrez les détails de chaque composant and parcourant les différentes démos. Utilisez l'encapsulation du code pour développer plus efficacement.", "8": "Ressources", "9": "Téléchargez différents outils de prototypage ou de visualisation pour un design plus efficace.", + "10": "Theme", + "11": "Online theme roller, visualize custom and manage site themes and component styles", + "12": "Theme customization is available!", + "13": "Click here", + "14": "Make your own theme", "lang": "fr-FR", "titleSize": "34", "paraSize": "18" diff --git a/examples/pages/template/index.tpl b/examples/pages/template/index.tpl index 0db7964cc..d8a3706a5 100644 --- a/examples/pages/template/index.tpl +++ b/examples/pages/template/index.tpl @@ -49,80 +49,18 @@ } .jumbotron { width: 890px; - height: 465px; margin: 30px auto; position: relative; - - div { - width: 100%; - height: 100%; - background-color: transparent; - position: absolute; - top: 0; - left: 0; - } - img { + width: 100%; + } + .jumbotron-red { + transition: height .1s; + background: #FFF; position: absolute; - } - - .jumbotron-cloud-1 { - right: 0; - top: 0; - height: 55px; - } - - .jumbotron-plant-2 { - left: 60px; - top: 200px; - } - - .jumbotron-web { - height: 385px; - top: 35px; - left: 110px; - } - - .jumbotron-cloud-2 { left: 0; - top: 50px; - height: 55px; - } - - .jumbotron-compo-1 { - left: 94px; - height: 90px; - top: 220px; - } - - .jumbotron-compo-2 { - right: 73px; - top: 60px; - height: 124px; - } - - .jumbotron-compo-3 { - right: 42px; - top: 200px; - height: 120px; - } - - .jumbotron-plant-1 { - bottom: 0; - left: 30px; - height: 185px; - } - - .jumbotron-figure-1 { - bottom: 0; - right: 180px; - height: 140px; - } - - .jumbotron-figure-2 { - bottom: 0; - right: 10px; - height: 68px; + top:0; + overflow: hidden; } } .cards { @@ -144,7 +82,7 @@ li { - width: 33.33333%; + width: 25%; padding: 0 19px; box-sizing: border-box; float: left; @@ -268,6 +206,81 @@ } } } + .theme-intro-b { + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 200; + .intro-banner { + position: absolute + } + img { + width: 300px; + } + .title { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + color: #FFF; + text-align: center; + font-weight: bold; + font-size: 24px; + display: flex; + justify-content: center; + align-items: center; + p { + padding: 0; + margin: 10px 0; + } + } + } + .theme-intro-a { + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 200; + .mask{ + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; + background: #000; + opacity: .5; + } + .intro-banner { + top: 50%; + left: 50%; + position: fixed; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + box-sizing: border-box; + text-align: center; + z-index: 100; + img { + width: 100%; + } + .intro-text { + position: absolute; + top: 50%; + left: 0; + right: 0; + p { + padding: 0; + margin: 0; + font-size: 48px; + font-weight: bold; + color: #FFF; + } + } + } + } diff --git a/examples/pages/template/theme.tpl b/examples/pages/template/theme.tpl index 3d0ecb11a..646d9f5dc 100644 --- a/examples/pages/template/theme.tpl +++ b/examples/pages/template/theme.tpl @@ -97,6 +97,9 @@ export default { this.userTheme = []; saveUserThemeToLocal(this.userTheme); } + this.$nextTick(() => { + window.scrollTo(0, 0); + }); }, data() { return { diff --git a/package.json b/package.json index 47dd63832..6557fccbf 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,6 @@ "mocha": "^6.0.2", "node-sass": "^4.11.0", "optimize-css-assets-webpack-plugin": "^5.0.1", - "perspective.js": "^1.0.0", "postcss": "^7.0.14", "progress-bar-webpack-plugin": "^1.11.0", "rimraf": "^2.5.4", diff --git a/yarn.lock b/yarn.lock index 16329bed7..de54022e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2999,7 +2999,7 @@ dom-serializer@0: domelementtype "~1.1.1" entities "~1.1.1" -dom-walk@^0.1.0, dom-walk@^0.1.1: +dom-walk@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg= @@ -7258,15 +7258,6 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -perspective.js@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/perspective.js/-/perspective.js-1.0.0.tgz#b14aca449043fcfd21297fabd2dfa184f42cb26c" - integrity sha1-sUrKRJBD/P0hKX+r0t+hhPQssmw= - dependencies: - color-convert "^1.9.0" - dom-walk "^0.1.1" - throttle-debounce "^1.0.1" - pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"