mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2025-01-30 12:52:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: solve merge conflict

Browse Source
This commit is contained in:
07akioni 2019-10-09 17:43:04 +08:00
commit 85c9ce7ea2
5 changed files with 113 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
styles/Dropdown.scss
View File

@ -1,75 +1,103 @@
@import './mixins/mixins.scss';
@import './themes/vars.scss';
@import "./mixins/mixins.scss";
@import "./themes/vars.scss";
@include themes-mixin {
@include b(popover-content) {
@include b(dropdown) {
@include once {
.n-dropdown__activator {
cursor: pointer;
}
}
}
@include b(dropdown) {
.n-dropdown__activator {
cursor: pointer;
}
}
@include b(dropdown-menu) {
@include once {
transform-origin: inherit;
position: relative;
margin: 6px 0;
border-radius: 6px;
font-size: 14px;
// box-shadow:0px 2px 20px 0px rgba(0,0,0,0.16);
.n-dropdown-menu-light-bar-container {
@include fade-in-transition(dropdown-menu-light-bar);
overflow: hidden;
position: absolute;
border-radius: 6px;
top: 0;
right: 0;
left: 0;
bottom: 0;
.n-dropdown-menu-light-bar {
position: absolute;
width: 100%;
left: 0;
height: 28px;
transition: top 0.15s $default-cubic-bezier;
}
}
}
}
@include b(dropdown-submenu) {
@include once {
position: relative;
.n-dropdown-submenu__activator {
cursor: pointer;
}
.n-dropdown-submenu__menu {
@include fade-in-scale-up-transition(
dropdown-submenu,
left top,
0.2s
);
position: absolute;
left: 100%;
top: 0;
border-radius: 6px;
font-size: 14px;
box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.16);
}
}
}
@include b(dropdown-menu) {
transform-origin: inherit;
position: relative;
background-color: rgba(75, 81, 106, 1);
margin: 6px 0;
border-radius: 6px;
font-size: 14px;
box-shadow:0px 2px 20px 0px rgba(0,0,0,0.16);
.n-dropdown-menu-light-bar-container {
@include fade-in-transition(dropdown-menu-light-bar);
overflow: hidden;
position: absolute;
border-radius: 6px;
top: 0;
right: 0;
left: 0;
bottom: 0;
.n-dropdown-menu-light-bar {
position: absolute;
width: 100%;
background-color: $select-item-background-color--active;
left: 0;
height: 28px;
transition: top .15s $default-cubic-bezier;
@include b(dropdown-item) {
@include once {
position: relative;
height: 28px;
line-height: 28px;
white-space: nowrap;
padding: 0 12px;
font-size: 14px;
cursor: pointer;
&.n-dropdown-item--with-arrow {
padding: 0 20px 0 12px;
}
.n-dropdown-item__arrow {
position: absolute;
right: 4px;
top: 50%;
transform: translateY(-50%);
.n-icon {
vertical-align: middle;
}
}
}
}
@include b(dropdown-menu) {
background-color: $--dropdown-menu-bg-color;
.n-dropdown-menu-light-bar-container {
.n-dropdown-menu-light-bar {
background-color: $--dropdown-item-hover-bg-color;
}
}
.n-dropdown-item:hover {
color: $--dropdown-item-hover-font-color;
}
}
@include b(dropdown-submenu) {
.n-dropdown-submenu__menu {
background-color: $--dropdown-menu-bg-color;
}
}
}
}
@include b(dropdown-submenu) {
position: relative;
.n-dropdown-submenu__activator {
cursor: pointer;
}
.n-dropdown-submenu__menu {
@include fade-in-scale-up-transition(dropdown-submenu, left top, .2s);
position: absolute;
left: 100%;
top: 0;
background-color: rgba(75, 81, 106, 1);
border-radius: 6px;
font-size: 14px;
box-shadow:0px 2px 20px 0px rgba(0,0,0,0.16);
}
}
@include b(dropdown-item) {
position: relative;
height: 28px;
line-height: 28px;
white-space: nowrap;
padding: 0 12px;
font-size: 14px;
cursor: pointer;
&.n-dropdown-item--with-arrow {
padding: 0 20px 0 12px;
}
.n-dropdown-item__arrow {
position: absolute;
right: 4px;
top: 50%;
transform: translateY(-50%);
.n-icon {
vertical-align: middle;
}
}
}

6
styles/themes/dark/components/Dropdown.scss Normal file
View File

@ -0,0 +1,6 @@
@mixin setup-dark-dropdown {
$--dropdown-menu-bg-color:#4b516a !global;
$--dropdown-item-hover-bg-color: rgba(96, 220, 178, 0.3) !global;
$--dropdown-item-hover-font-color: #fff !global;
}

2
styles/themes/dark/index.scss
View File

@ -18,6 +18,7 @@
@import "components/Message.scss";
@import "components/LoadingBar.scss";
@import "components/Badge.scss";
@import "components/Dropdown.scss";
@mixin setup-dark-theme () {
@include setup-dark-colors();
@ -62,4 +63,5 @@
@include setup-dark-message;
@include setup-dark-loading-bar;
@include setup-dark-badge;
@include setup-dark-dropdown;
}

5
styles/themes/light/components/Dropdown.scss Normal file
View File

@ -0,0 +1,5 @@
@mixin setup-light-dropdown {
$--dropdown-menu-bg-color: #fff !global;
$--dropdown-item-hover-bg-color: #E8E8E8 !global;
$--dropdown-item-hover-font-color: $primary-6 !global;
}

2
styles/themes/light/index.scss
View File

@ -18,6 +18,7 @@
@import "components/Message.scss";
@import "components/LoadingBar.scss";
@import "components/Badge.scss";
@import "components/Dropdown.scss";
@mixin setup-light-theme () {
@include setup-light-colors();
@ -58,4 +59,5 @@
@include setup-light-message;
@include setup-light-loading-bar;
@include setup-light-badge;
@include setup-light-dropdown;
}