Skip to content

Commit 9f5915a

Browse files
author
levy
committed
Merge branch 'dev'
2 parents 5517721 + 1a41bf1 commit 9f5915a

47 files changed

Lines changed: 198 additions & 198 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Please make sure these boxes are checked before submitting your PR, thank you!
22

3-
* [ ] Make sure you follow Element's contributing guide ([中文](https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.zh-CN.md) | [English](https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.en-US.md) | [Español](https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.es.md) | [Français](https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.fr-FR.md)).
3+
* [ ] Make sure you follow Element's contributing guide ([中文](https://github.com/femessage/element/blob/master/.github/CONTRIBUTING.zh-CN.md) | [English](https://github.com/femessage/element/blob/master/.github/CONTRIBUTING.en-US.md) | [Español](https://github.com/femessage/element/blob/master/.github/CONTRIBUTING.es.md) | [Français](https://github.com/femessage/element/blob/master/.github/CONTRIBUTING.fr-FR.md)).
44
* [ ] Make sure you are merging your commits to `dev` branch.
55
* [ ] Add some descriptions and refer relative issues for you PR.

‎FAQ.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<details>
4646
<summary>你们的文档怎么偷偷更新了？</summary>
4747

48-
我们只会在 Element 发布新版本时同步更新文档，以体现最新的变化。详细的更新内容可以查看 [changelog](https://github.com/ElemeFE/element/blob/master/CHANGELOG.zh-CN.md)。
48+
我们只会在 Element 发布新版本时同步更新文档，以体现最新的变化。详细的更新内容可以查看 [changelog](https://github.com/femessage/element/blob/master/CHANGELOG.zh-CN.md)。
4949
</details>
5050

5151
<details>
@@ -117,7 +117,7 @@
117117
<details>
118118
<summary>When do you update documentations of Element?</summary>
119119

120-
We update documentations only when a new version of Element is published so that it reflects all the changes introduced in that version. Updated changed can be found in the [changelog](https://github.com/ElemeFE/element/blob/master/CHANGELOG.en-US.md)。
120+
We update documentations only when a new version of Element is published so that it reflects all the changes introduced in that version. Updated changed can be found in the [changelog](https://github.com/femessage/element/blob/master/CHANGELOG.en-US.md)。
121121
</details>
122122

123123
<details>
@@ -191,7 +191,7 @@
191191
<details>
192192
<summary>¿Cuando añaden a la documentación de `Element`?</summary>
193193

194-
Añadamos la documentación con cada versión nueva de `Element` y los cambios reflejan los cambios del software de esa versión. Los cambios actuales y históricos se encuentran [aquí](https://github.com/ElemeFE/element/blob/master/CHANGELOG.en-US.md).
194+
Añadamos la documentación con cada versión nueva de `Element` y los cambios reflejan los cambios del software de esa versión. Los cambios actuales y históricos se encuentran [aquí](https://github.com/femessage/element/blob/master/CHANGELOG.en-US.md).
195195
</details>
196196

197197
<details>

‎examples/components/footer.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<div class="container">
44
<div class="footer-main">
55
<h4>{{ langConfig.links }}</h4>
6-
<a href="https://github.com/ElemeFE/element" class="footer-main-link" target="_blank">{{ langConfig.repo }}</a>
7-
<a href="https://github.com/ElemeFE/element/releases" class="footer-main-link" target="_blank">{{ langConfig.changelog }}</a>
8-
<a href="https://github.com/ElemeFE/element/blob/dev/FAQ.md" class="footer-main-link" target="_blank">{{ langConfig.faq }}</a>
6+
<a href="https://github.com/femessage/element" class="footer-main-link" target="_blank">{{ langConfig.repo }}</a>
7+
<a href="https://github.com/femessage/element/releases" class="footer-main-link" target="_blank">{{ langConfig.changelog }}</a>
8+
<a href="https://github.com/femessage/element/blob/dev/FAQ.md" class="footer-main-link" target="_blank">{{ langConfig.faq }}</a>
99
<a href="https://github.com/ElementUI/element-starter" class="footer-main-link" target="_blank">{{ langConfig.starter }}</a>
1010
<a :href="'/#/' + lang + '/component/custom-theme'" class="footer-main-link" target="_blank">{{ langConfig.theme }}</a>
1111
<a href="https://github.com/elemefe/element-react" class="footer-main-link" target="_blank">Element-React</a>
@@ -14,8 +14,8 @@
1414
<div class="footer-main">
1515
<h4>{{ langConfig.community }}</h4>
1616
<a :href="gitterLink" class="footer-main-link" target="_blank">{{ langConfig.gitter }}</a>
17-
<a href="https://github.com/ElemeFE/element/issues" class="footer-main-link" target="_blank">{{ langConfig.feedback }}</a>
18-
<a :href="`https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.${ lang }.md`" class="footer-main-link" target="_blank">{{ langConfig.contribution }}</a>
17+
<a href="https://github.com/femessage/element/issues" class="footer-main-link" target="_blank">{{ langConfig.feedback }}</a>
18+
<a :href="`https://github.com/femessage/element/blob/master/.github/CONTRIBUTING.${ lang }.md`" class="footer-main-link" target="_blank">{{ langConfig.contribution }}</a>
1919
<a href="https://segmentfault.com/t/element-ui" class="footer-main-link" target="_blank">SegmentFault</a>
2020
<a href="https://github.com/ElementUI/awesome-element" class="footer-main-link" target="_blank">Awesome Element</a>
2121
</div>
@@ -31,7 +31,7 @@
3131
<img src="../assets/images/qrcode.png" alt="">
3232
</el-popover>
3333
<i class="doc-icon-weixin elementdoc" v-popover:weixin></i>
34-
<a href="https://github.com/elemefe" target="_blank">
34+
<a href="https://github.com/femessage" target="_blank">
3535
<i class="doc-icon-github elementdoc"></i>
3636
</a>
3737
<a :href="gitterLink" target="_blank">

‎examples/components/side-nav.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
if (xhr.readyState === 4 && xhr.status === 200) {
289289
const {data: navs} = JSON.parse(xhr.responseText);
290290
this.femessageNavs = navs.map(nav => {
291-
nav.url = `https://static.deepexi.top/serverless-console/index.html#/material/${nav.repoName}`;
291+
nav.url = `https://frontend-infra.deepexi.com/home/index.html#/material/${nav.repoName}`;
292292
return nav;
293293
}).filter(nav => nav.lib && nav.lib.indexOf('element') > -1);
294294
}

‎examples/docs/en-US/custom-theme.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ The above website enables you to preview theme of a new theme color in real-time
2121
$--color-primary: teal;
2222

2323
/* icon font path, required */
24-
$--font-path: '~element-ui/lib/theme-chalk/fonts';
24+
$--font-path: '~@femessage/element-ui/lib/theme-chalk/fonts';
2525

26-
@import "~element-ui/packages/theme-chalk/src/index";
26+
@import "~@femessage/element-ui/packages/theme-chalk/src/index";
2727
```
2828

2929
Then in the entry file of your project, import this style file instead of Element's built CSS:
3030
```JS
3131
import Vue from 'vue'
32-
import Element from 'element-ui'
32+
import Element from '@femessage/element-ui'
3333
import './element-variables.scss'
3434

3535
Vue.use(Element)
@@ -107,7 +107,7 @@ Importing your own theme is just like importing the default theme, only this tim
107107

108108
```javascript
109109
import '../theme/index.css'
110-
import ElementUI from 'element-ui'
110+
import ElementUI from '@femessage/element-ui'
111111
import Vue from 'vue'
112112

113113
Vue.use(ElementUI)

‎examples/docs/en-US/i18n.md‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ The default language of Element is Chinese. If you wish to use another language,
44

55
```javascript
66
import Vue from 'vue'
7-
import ElementUI from 'element-ui'
8-
import locale from 'element-ui/lib/locale/lang/en'
7+
import ElementUI from '@femessage/element-ui'
8+
import locale from '@femessage/element-ui/lib/locale/lang/en'
99

1010
Vue.use(ElementUI, { locale })
1111
```
@@ -14,9 +14,9 @@ Or if you are importing Element on demand:
1414

1515
```javascript
1616
import Vue from 'vue'
17-
import { Button, Select } from 'element-ui'
18-
import lang from 'element-ui/lib/locale/lang/en'
19-
import locale from 'element-ui/lib/locale'
17+
import { Button, Select } from '@femessage/element-ui'
18+
import lang from '@femessage/element-ui/lib/locale/lang/en'
19+
import locale from '@femessage/element-ui/lib/locale'
2020

2121
// configure language
2222
locale.use(lang)
@@ -32,7 +32,7 @@ webpack.config.js
3232
```javascript
3333
{
3434
plugins: [
35-
new webpack.NormalModuleReplacementPlugin(/element-ui[\/\\]lib[\/\\]locale[\/\\]lang[\/\\]zh-CN/, 'element-ui/lib/locale/lang/en')
35+
new webpack.NormalModuleReplacementPlugin(/@femessage[\/\\]element-ui[\/\\]lib[\/\\]locale[\/\\]lang[\/\\]zh-CN/, '@femessage/element-ui/lib/locale/lang/en')
3636
]
3737
}
3838
```
@@ -44,9 +44,9 @@ Element is compatible with [vue-i18n@5.x](https://github.com/kazupon/vue-i18n),
4444
```javascript
4545
import Vue from 'vue'
4646
import VueI18n from 'vue-i18n'
47-
import Element from 'element-ui'
48-
import enLocale from 'element-ui/lib/locale/lang/en'
49-
import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
47+
import Element from '@femessage/element-ui'
48+
import enLocale from '@femessage/element-ui/lib/locale/lang/en'
49+
import zhLocale from '@femessage/element-ui/lib/locale/lang/zh-CN'
5050

5151
Vue.use(VueI18n)
5252
Vue.use(Element)
@@ -61,9 +61,9 @@ Element may not be compatible with i18n plugins other than vue-i18n, but you can
6161

6262
```javascript
6363
import Vue from 'vue'
64-
import Element from 'element-ui'
65-
import enLocale from 'element-ui/lib/locale/lang/en'
66-
import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
64+
import Element from '@femessage/element-ui'
65+
import enLocale from '@femessage/element-ui/lib/locale/lang/en'
66+
import zhLocale from '@femessage/element-ui/lib/locale/lang/zh-CN'
6767

6868
Vue.use(Element, {
6969
i18n: function (path, options) {
@@ -78,10 +78,10 @@ You need to manually handle it for compatibility with `6.x`.
7878

7979
```javascript
8080
import Vue from 'vue'
81-
import Element from 'element-ui'
81+
import Element from '@femessage/element-ui'
8282
import VueI18n from 'vue-i18n'
83-
import enLocale from 'element-ui/lib/locale/lang/en'
84-
import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
83+
import enLocale from '@femessage/element-ui/lib/locale/lang/en'
84+
import zhLocale from '@femessage/element-ui/lib/locale/lang/zh-CN'
8585

8686
Vue.use(VueI18n)
8787

@@ -115,9 +115,9 @@ import Vue from 'vue'
115115
import DatePicker from 'element/lib/date-picker'
116116
import VueI18n from 'vue-i18n'
117117

118-
import enLocale from 'element-ui/lib/locale/lang/en'
119-
import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
120-
import ElementLocale from 'element-ui/lib/locale'
118+
import enLocale from '@femessage/element-ui/lib/locale/lang/en'
119+
import zhLocale from '@femessage/element-ui/lib/locale/lang/zh-CN'
120+
import ElementLocale from '@femessage/element-ui/lib/locale'
121121

122122
Vue.use(VueI18n)
123123
Vue.use(DatePicker)
@@ -145,8 +145,8 @@ ElementLocale.i18n((key, value) => i18n.t(key, value))
145145

146146
```html
147147
<script src="//unpkg.com/vue"></script>
148-
<script src="//unpkg.com/element-ui"></script>
149-
<script src="//unpkg.com/element-ui/lib/umd/locale/en.js"></script>
148+
<script src="//unpkg.com/@femessage/element-ui"></script>
149+
<script src="//unpkg.com/@femessage/element-ui/lib/umd/locale/en.js"></script>
150150

151151
<script>
152152
ELEMENT.locale(ELEMENT.lang.en)
@@ -158,9 +158,9 @@ Compatible with `vue-i18n`
158158
```html
159159
<script src="//unpkg.com/vue"></script>
160160
<script src="//unpkg.com/vue-i18n/dist/vue-i18n.js"></script>
161-
<script src="//unpkg.com/element-ui"></script>
162-
<script src="//unpkg.com/element-ui/lib/umd/locale/zh-CN.js"></script>
163-
<script src="//unpkg.com/element-ui/lib/umd/locale/en.js"></script>
161+
<script src="//unpkg.com/@femessage/element-ui"></script>
162+
<script src="//unpkg.com/@femessage/element-ui/lib/umd/locale/zh-CN.js"></script>
163+
<script src="//unpkg.com/@femessage/element-ui/lib/umd/locale/en.js"></script>
164164

165165
<script>
166166
Vue.locale('en', ELEMENT.lang.en)
@@ -223,4 +223,4 @@ Currently Element ships with the following languages:
223223
<li>Esperanto (eo)</li>
224224
</ul>
225225

226-
If your target language is not included, you are more than welcome to contribute: just add another language config [here](https://github.com/ElemeFE/element/tree/dev/src/locale/lang) and create a pull request.
226+
If your target language is not included, you are more than welcome to contribute: just add another language config [here](https://github.com/femessage/element/tree/dev/src/locale/lang) and create a pull request.

‎examples/docs/en-US/input.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ You can get some recommended tips based on the current input.
355355
loadAll() {
356356
return [
357357
{ "value": "vue", "link": "https://github.com/vuejs/vue" },
358-
{ "value": "element", "link": "https://github.com/ElemeFE/element" },
358+
{ "value": "element", "link": "https://github.com/femessage/element" },
359359
{ "value": "cooking", "link": "https://github.com/ElemeFE/cooking" },
360360
{ "value": "mint-ui", "link": "https://github.com/ElemeFE/mint-ui" },
361361
{ "value": "vuex", "link": "https://github.com/vuejs/vuex" },
@@ -439,7 +439,7 @@ Customize how suggestions are displayed.
439439
loadAll() {
440440
return [
441441
{ "value": "vue", "link": "https://github.com/vuejs/vue" },
442-
{ "value": "element", "link": "https://github.com/ElemeFE/element" },
442+
{ "value": "element", "link": "https://github.com/femessage/element" },
443443
{ "value": "cooking", "link": "https://github.com/ElemeFE/cooking" },
444444
{ "value": "mint-ui", "link": "https://github.com/ElemeFE/mint-ui" },
445445
{ "value": "vuex", "link": "https://github.com/vuejs/vuex" },
@@ -487,7 +487,7 @@ Search data from server-side.
487487
loadAll() {
488488
return [
489489
{ "value": "vue", "link": "https://github.com/vuejs/vue" },
490-
{ "value": "element", "link": "https://github.com/ElemeFE/element" },
490+
{ "value": "element", "link": "https://github.com/femessage/element" },
491491
{ "value": "cooking", "link": "https://github.com/ElemeFE/cooking" },
492492
{ "value": "mint-ui", "link": "https://github.com/ElemeFE/mint-ui" },
493493
{ "value": "vuex", "link": "https://github.com/vuejs/vuex" },

‎examples/docs/en-US/installation.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ npm i element-ui -S
1010

1111
### CDN
1212

13-
Get the latest version from [unpkg.com/element-ui](https://unpkg.com/element-ui/) , and import JavaScript and CSS file in your page.
13+
Get the latest version from [unpkg.com/element-ui](https://unpkg.com/@femessage/element-ui/) , and import JavaScript and CSS file in your page.
1414

1515
```html
1616
<!-- import CSS -->
17-
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
17+
<link rel="stylesheet" href="https://unpkg.com/@femessage/element-ui/lib/theme-chalk/index.css">
1818
<!-- import JavaScript -->
19-
<script src="https://unpkg.com/element-ui/lib/index.js"></script>
19+
<script src="https://unpkg.com/@femessage/element-ui/lib/index.js"></script>
2020
```
2121

2222
:::tip

‎examples/docs/en-US/layout.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ Taking example by Bootstrap's responsive design, five breakpoints are preset: xs
315315
Additionally, Element provides a series of classes for hiding elements under certain conditions. These classes can be added to any DOM elements or custom components. You need to import the following CSS file to use these classes:
316316

317317
```js
318-
import 'element-ui/lib/theme-chalk/display.css';
318+
import '@femessage/element-ui/lib/theme-chalk/display.css';
319319
```
320320

321321
The classes are:

‎examples/docs/en-US/loading.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Show a full screen animation while loading data.
173173
### Service
174174
You can also invoke Loading with a service. Import Loading service:
175175
```javascript
176-
import { Loading } from 'element-ui';
176+
import { Loading } from '@femessage/element-ui';
177177
```
178178
Invoke it:
179179
```javascript

0 commit comments

Comments
 (0)