mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2025-03-07 13:48:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of ***REMOVED*** into develop

Browse Source
This commit is contained in:
JiwenBai 2019-08-01 14:48:18 +08:00
commit 126e9c9102
2 changed files with 84 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "naive-ui", "name": "naive-ui",
"version": "0.2.57", "version": "0.2.58",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

159
styles/Cascader.scss
View File

@ -1,83 +1,90 @@
.n-cascader-menu__content-wrapper { /* stylelint-disable */
position: fixed; @import './mixins/mixins.scss';
left: 0; @import './theme/default.scss';
top: 0;
width: 0; @include b(cascader) {
height: 0; font-family: $default-font-family;
overflow: visible; .n-cascader-menu__content-wrapper {
transform: translateZ(0); position: fixed;
.n-cascader-menu__item { left: 0;
height: $default-height; top: 0;
line-height: $default-height; width: 0;
min-width: 100px; height: 0;
} overflow: visible;
.n-cascader-menu__item-next::after { transform: translateZ(0);
content: "\f3d1"; .n-cascader-menu__item {
font-family: "n-Ionicons"; height: $default-height;
position: absolute; line-height: $default-height;
right: 8px; min-width: 100px;
} }
.n-cascader-menu__item-next--selected::after { .n-cascader-menu__item-next::after {
content: "\f3d1"; content: "\f3d1";
font-family: "n-Ionicons"; font-family: "n-Ionicons";
position: absolute; position: absolute;
right: 10px; right: 8px;
color: red; }
} .n-cascader-menu__item-next--selected::after {
.n-cascader-menu__item--selected::after { content: "\f3d1";
content: "\f3ff"; font-family: "n-Ionicons";
font-family: "n-Ionicons"; position: absolute;
position: absolute; right: 10px;
right: 8px; color: red;
color: #63E2B7FF; }
font-size: 18px; .n-cascader-menu__item--selected::after {
} content: "\f3ff";
.n-cascader-menu__content { font-family: "n-Ionicons";
margin-top: 4px; position: absolute;
.n-cascader-menu { right: 8px;
display: inline-block; color: #63E2B7FF;
height: 185px; font-size: 18px;
overflow-y: auto; }
z-index: 0; .n-cascader-menu__content {
position: relative; margin-top: 4px;
border-radius: 9px; .n-cascader-menu {
background-color: #4b516a; display: inline-block;
box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.16); height: 185px;
.n-cascader-menu__item { overflow-y: auto;
display: flex; z-index: 0;
padding: 0px 20px;
white-space: nowrap;
position: relative; position: relative;
transition: color 0.3s cubic-bezier(0.4, 0, 0.2, 1); border-radius: 9px;
span { background-color: #4b516a;
display: flex box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.16);
.n-cascader-menu__item {
display: flex;
padding: 0px 20px;
white-space: nowrap;
position: relative;
transition: color 0.3s cubic-bezier(0.4, 0, 0.2, 1);
span {
display: flex
}
.n-cascader-menu__item-select {
margin-right: 8px;
}
.n-cascader-menu_item-icon {
margin-left: auto;
align-items: center;
}
} }
.n-cascader-menu__item-select { .n-cascader-menu__item--active.n-cascader-menu__item-next::after {
margin-right: 8px; color: #63E2B7FF;
} }
.n-cascader-menu_item-icon { &::-webkit-scrollbar {
margin-left: auto; width: 5px;
align-items: center; }
&::-webkit-scrollbar-track {
background: transparent;
}
&::-webkit-scrollbar-thumb {
background: rgba(255,255,255,0.2);
border-radius: 2.5px;
}
&::-webkit-scrollbar-thumb:hover {
background: rgba(255,255,255,0.3);
}
table thead tr th:last-of-type {
padding-left: 32px;
} }
}
.n-cascader-menu__item--active.n-cascader-menu__item-next::after {
color: #63E2B7FF;
}
&::-webkit-scrollbar {
width: 5px;
}
&::-webkit-scrollbar-track {
background: transparent;
}
&::-webkit-scrollbar-thumb {
background: rgba(255,255,255,0.2);
border-radius: 2.5px;
}
&::-webkit-scrollbar-thumb:hover {
background: rgba(255,255,255,0.3);
}
table thead tr th:last-of-type {
padding-left: 32px;
} }
} }
} }