@lambo-design/pro-layout 1.0.0-beta.257 → 1.0.0-beta.259

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/package.json +3 -3
  2. package/src/components/pro-layout-sider-search.vue +2 -0
  3. package/src/components/pro-layout-sider.vue +0 -1
  4. package/src/styles/color.less +6 -0
  5. package/src/styles/other-menu.less +0 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/pro-layout",
3
- "version": "1.0.0-beta.257",
3
+ "version": "1.0.0-beta.259",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "author": "lambo",
@@ -10,8 +10,8 @@
10
10
  "registry": "https://registry.npmjs.org/"
11
11
  },
12
12
  "devDependencies": {
13
- "@lambo-design/shared": "^1.0.0-beta.43",
14
- "@lambo-design/core": "^4.7.1-beta.59"
13
+ "@lambo-design/core": "^4.7.1-beta.59",
14
+ "@lambo-design/shared": "^1.0.0-beta.43"
15
15
  },
16
16
  "scripts": {}
17
17
  }
package/src/components/pro-layout-sider-search.vue CHANGED
@@ -238,6 +238,8 @@ export default {
238
238
  @import "@lambo-design/core/src/styles/default.less";
239
239
  .search-fast-con-side-modal {
240
240
  .ivu-modal{
241
+ margin-left: 0px;
242
+ margin-top: 1px;
241
243
  .ivu-modal-content{
242
244
  width: 218px;
243
245
  margin-top: -18px;
package/src/components/pro-layout-sider.vue CHANGED
@@ -51,7 +51,6 @@
51
51
  <ProLayoutOtherMenu :collapsed="collapsed" @select-menu="selectMenu"></ProLayoutOtherMenu>
52
52
  <ProLayoutSiderSearch
53
53
  v-show="!collapsed"
54
- style="margin-right: 35px; margin-left: 1px;"
55
54
  :searchType="0"
56
55
  @select-menu="selectMenu"
57
56
  ></ProLayoutSiderSearch>
package/src/styles/color.less CHANGED
@@ -188,11 +188,17 @@
188
188
  background: var(--layout-sider-background,@_layout-sider-background);
189
189
  color: var(--layout-sider-submenu-color ,@_layout-sider-submenu-color);
190
190
  .other-menu-item{
191
+ border: 1px solid var(--layout-sider-line-color,@_layout-sider-line-color);
191
192
  &:hover {
192
193
  background: var(--layout-sider-menuitem-hover-background,@_layout-sider-menuitem-hover-background);
193
194
  color: var(--layout-sider-menuitem-hover-color,@_layout-sider-menuitem-hover-color);
194
195
  }
195
196
  }
197
+ &.other-menu-collapsed {
198
+ .other-menu-item {
199
+ border-top : 2px solid var(--layout-sider-line-color,@_layout-sider-line-color);
200
+ }
201
+ }
196
202
  }
197
203
  .search-fast-con{
198
204
  background: var(--layout-sider-search-background,@_layout-sider-search-background);
package/src/styles/other-menu.less CHANGED
@@ -6,7 +6,6 @@
6
6
  z-index: 1000;
7
7
  &.other-menu-collapsed {
8
8
  .other-menu-item {
9
- border-top: 2px solid var(--border-color-base,@_border-color-base);
10
9
  width: 100%;
11
10
  .ivu-tooltip {
12
11
  width: 100%;
@@ -28,7 +27,6 @@
28
27
  height: 48.6px;
29
28
  width: 50%;
30
29
  display: inline-block;
31
- border: 1px solid var(--border-color-base,@_border-color-base);
32
30
  cursor: pointer;
33
31
  }
34
32
  }