Chore: misc fixes and updates

examples/components/footer-nav.vue

@@ -90,8 +90,8 @@
     methods: {
       setNav() {
         let nav = navConfig[this.lang];
-        this.nav = [nav[0]].concat(nav[2].children);
-        nav[3].groups.map(group => group.list).forEach(list => {
+        this.nav = [nav[0]].concat(nav[3].children);
+        nav[4].groups.map(group => group.list).forEach(list => {
           this.nav = this.nav.concat(list);
         });
       },

examples/components/side-nav.vue

@@ -22,7 +22,7 @@
       margin-top: 15px;
     }
 
-    > ul > .nav-item:nth-child(-n + 3) > a {
+    > ul > .nav-item:nth-child(-n + 4) > a {
       margin-top: 0;
     }
 

examples/docs/en-US/quickstart.md

@@ -86,7 +86,7 @@ new Vue({
 })
 ```
 
-Full example (Component list reference [components.json](https://github.com/ElemeFE/element/blob/carbon/components.json))
+Full example (Component list reference [components.json](https://github.com/ElemeFE/element/blob/master/components.json))
 
 ```javascript
 import Vue from 'vue'

examples/docs/zh-CN/quickstart.md

@@ -86,7 +86,7 @@ new Vue({
 })
 ```
 
-完整组件列表和引入方式（完整组件列表以 [components.json](https://github.com/ElemeFE/element/blob/carbon/components.json) 为准）
+完整组件列表和引入方式（完整组件列表以 [components.json](https://github.com/ElemeFE/element/blob/master/components.json) 为准）
 
 ```javascript
 import Vue from 'vue'

examples/docs/zh-CN/upload.md

@@ -18,7 +18,7 @@
         position: relative;
         overflow: hidden;
 
-        &:hover, &:focus{
+        &:hover, &:focus {
           border-color: #409EFF;
         }
       }

examples/nav.config.json

@@ -8,6 +8,10 @@
       "name": "Element React",
       "href": "https://eleme.github.io/element-react/"
     },
+    {
+      "name": "Element Angular",
+      "href": "https://eleme.github.io/element-angular/"
+    },
     {
       "name": "开发指南",
       "children": [
@@ -254,6 +258,10 @@
       "name": "Element React",
       "href": "https://eleme.github.io/element-react/"
     },
+    {
+      "name": "Element Angular",
+      "href": "https://eleme.github.io/element-angular/"
+    },
     {
       "name": "Development",
       "children": [

packages/theme-chalk/src/collapse.scss

@@ -27,11 +27,6 @@
     &.focusing:focus:not(:hover){
       color: $--color-primary;
     }
-
-    //&:focus{
-    //  color: $--color-primary;
-    //}
-
   }
 
   @include e(wrap) {

packages/theme-chalk/src/table.scss

@@ -232,10 +232,6 @@
     }
   }
 
-  th:first-child .cell, td:first-child .cell {
-    padding-left: 0;
-  }
-
   // 拥有多级表头
   @include m((group, border)) {
     border: $--table-border;

packages/upload/src/upload-list.vue

@@ -13,7 +13,7 @@
       :class="['el-upload-list__item', 'is-' + file.status, focusing ? 'focusing' : '']"
       :key="index"
       tabindex="0"
-      @keydown.delete="$emit('remove', file)"
+      @keydown.delete="!disabled && $emit('remove', file)"
       @focus="focusing = true"
       @blur="focusing = false"
       @click="focusing = false"

src/index.js

@@ -248,3 +248,5 @@ module.exports = {
   Main,
   Footer
 };
+
+module.exports.default = module.exports;