Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
e62f8c14
Commit
e62f8c14
authored
Sep 14, 2017
by
Black Wayne
Committed by
杨奕
Sep 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Popover: add chalk theme (#7003)
* Popover: add chalk theme * Popover: add chalk theme
parent
c20954f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
74 additions
and
43 deletions
+74
-43
packages/popover/src/main.vue
packages/popover/src/main.vue
+1
-1
packages/theme-chalk/src/common/var.scss
packages/theme-chalk/src/common/var.scss
+29
-23
packages/theme-chalk/src/mixins/mixins.scss
packages/theme-chalk/src/mixins/mixins.scss
+32
-15
packages/theme-chalk/src/popover.scss
packages/theme-chalk/src/popover.scss
+12
-4
No files found.
packages/popover/src/main.vue
View file @
e62f8c14
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<transition
:name=
"transition"
@
after-leave=
"doDestroy"
>
<transition
:name=
"transition"
@
after-leave=
"doDestroy"
>
<div
<div
class=
"el-popover"
class=
"el-popover"
:class=
"[popperClass]"
:class=
"[popperClass
, content && 'el-popover--plain'
]"
ref=
"popper"
ref=
"popper"
v-show=
"!disabled && showPopper"
v-show=
"!disabled && showPopper"
:style=
"
{ width: width + 'px' }">
:style=
"
{ width: width + 'px' }">
...
...
packages/theme-chalk/src/common/var.scss
View file @
e62f8c14
...
@@ -13,30 +13,30 @@ $--color-white: #fff;
...
@@ -13,30 +13,30 @@ $--color-white: #fff;
$--color-black
:
#000
;
$--color-black
:
#000
;
$--color-primary
:
#1989fa
;
$--color-primary
:
#1989fa
;
$--color-primary-light-1
:
mix
(
$--color-white
,
$--color-primary
,
10%
);
$--color-primary-light-1
:
mix
(
$--color-white
,
$--color-primary
,
10%
);
// #3095fb#
$--color-primary-light-2
:
mix
(
$--color-white
,
$--color-primary
,
20%
);
$--color-primary-light-2
:
mix
(
$--color-white
,
$--color-primary
,
20%
);
// #47a1fb#
$--color-primary-light-3
:
mix
(
$--color-white
,
$--color-primary
,
30%
);
$--color-primary-light-3
:
mix
(
$--color-white
,
$--color-primary
,
30%
);
// #5eadfc#
$--color-primary-light-4
:
mix
(
$--color-white
,
$--color-primary
,
40%
);
$--color-primary-light-4
:
mix
(
$--color-white
,
$--color-primary
,
40%
);
// #75b8fc#
$--color-primary-light-5
:
mix
(
$--color-white
,
$--color-primary
,
50%
);
$--color-primary-light-5
:
mix
(
$--color-white
,
$--color-primary
,
50%
);
// #8cc4fd#
$--color-primary-light-6
:
mix
(
$--color-white
,
$--color-primary
,
60%
);
$--color-primary-light-6
:
mix
(
$--color-white
,
$--color-primary
,
60%
);
// #a3d0fd#
$--color-primary-light-7
:
mix
(
$--color-white
,
$--color-primary
,
70%
);
$--color-primary-light-7
:
mix
(
$--color-white
,
$--color-primary
,
70%
);
// #badcfe#
$--color-primary-light-8
:
mix
(
$--color-white
,
$--color-primary
,
80%
);
$--color-primary-light-8
:
mix
(
$--color-white
,
$--color-primary
,
80%
);
// #d1e7fe#
$--color-primary-light-9
:
mix
(
$--color-white
,
$--color-primary
,
90%
);
$--color-primary-light-9
:
mix
(
$--color-white
,
$--color-primary
,
90%
);
// #e8f3ff#
$--color-success
:
#67c23a
;
$--color-success
:
#67c23a
;
$--color-warning
:
#eb9e05
;
$--color-warning
:
#eb9e05
;
$--color-danger
:
#fa5555
;
$--color-danger
:
#fa5555
;
$--color-info
:
#878d99
;
$--color-info
:
#878d99
;
$--color-success-light
:
mix
(
$--color-white
,
$--color-success
,
80%
);
$--color-success-light
:
mix
(
$--color-white
,
$--color-success
,
80%
);
// #e1f3d8#
$--color-warning-light
:
mix
(
$--color-white
,
$--color-warning
,
80%
);
$--color-warning-light
:
mix
(
$--color-white
,
$--color-warning
,
80%
);
// #fbeccd#
$--color-danger-light
:
mix
(
$--color-white
,
$--color-danger
,
80%
);
$--color-danger-light
:
mix
(
$--color-white
,
$--color-danger
,
80%
);
// #fedddd#
$--color-info-light
:
mix
(
$--color-white
,
$--color-info
,
80%
);
$--color-info-light
:
mix
(
$--color-white
,
$--color-info
,
80%
);
// #e7e8eb#
$--color-success-lighter
:
mix
(
$--color-white
,
$--color-success
,
90%
);
$--color-success-lighter
:
mix
(
$--color-white
,
$--color-success
,
90%
);
// #f0f9ec#
$--color-warning-lighter
:
mix
(
$--color-white
,
$--color-warning
,
90%
);
$--color-warning-lighter
:
mix
(
$--color-white
,
$--color-warning
,
90%
);
// #fdf5e6#
$--color-danger-lighter
:
mix
(
$--color-white
,
$--color-danger
,
90%
);
$--color-danger-lighter
:
mix
(
$--color-white
,
$--color-danger
,
90%
);
// #ffeeee#
$--color-info-lighter
:
mix
(
$--color-white
,
$--color-info
,
90%
);
$--color-info-lighter
:
mix
(
$--color-white
,
$--color-info
,
90%
);
// #f3f4f5#
$--color-text-primary
:
#2d2f33
;
$--color-text-primary
:
#2d2f33
;
$--color-text-regular
:
#5a5e66
;
$--color-text-regular
:
#5a5e66
;
...
@@ -70,7 +70,7 @@ $--border-radius-circle: 100%;
...
@@ -70,7 +70,7 @@ $--border-radius-circle: 100%;
-------------------------- */
-------------------------- */
$--box-shadow-base
:
0
2px
4px
rgba
(
0
,
0
,
0
,
.12
)
,
0
0
6px
rgba
(
0
,
0
,
0
,
.04
);
$--box-shadow-base
:
0
2px
4px
rgba
(
0
,
0
,
0
,
.12
)
,
0
0
6px
rgba
(
0
,
0
,
0
,
.04
);
$--box-shadow-dark
:
0
2px
4px
rgba
(
0
,
0
,
0
,
.12
)
,
0
0
6px
rgba
(
0
,
0
,
0
,
.12
);
$--box-shadow-dark
:
0
2px
4px
rgba
(
0
,
0
,
0
,
.12
)
,
0
0
6px
rgba
(
0
,
0
,
0
,
.12
);
$--box-shadow-light
:
0
2px
12px
0
rgba
(
0
,
0
,
0
,
0
.03
);
/* Fill
/* Fill
-------------------------- */
-------------------------- */
$--fill-base
:
$--color-white
;
$--fill-base
:
$--color-white
;
...
@@ -78,6 +78,7 @@ $--fill-base: $--color-white;
...
@@ -78,6 +78,7 @@ $--fill-base: $--color-white;
/* Font
/* Font
-------------------------- */
-------------------------- */
$--font-size-base
:
14px
;
$--font-size-base
:
14px
;
$--font-size-small
:
13px
;
$--font-color-base
:
#5a5e66
;
$--font-color-base
:
#5a5e66
;
$--font-color-disabled-base
:
#bbb
;
$--font-color-disabled-base
:
#bbb
;
$--font-weight-primary
:
500
;
$--font-weight-primary
:
500
;
...
@@ -101,6 +102,7 @@ $--disabled-border-base: $--border-color-lighter;
...
@@ -101,6 +102,7 @@ $--disabled-border-base: $--border-color-lighter;
/* Icon
/* Icon
-------------------------- */
-------------------------- */
$--icon-color
:
#666
;
$--icon-color
:
#666
;
$--icon-color-base
:
$--color-info
;
/* Checkbox
/* Checkbox
-------------------------- */
-------------------------- */
...
@@ -460,8 +462,11 @@ $--dialog-font-size: 14px;
...
@@ -460,8 +462,11 @@ $--dialog-font-size: 14px;
/* Table
/* Table
-------------------------- */
-------------------------- */
$--table-border-color
:
$--border-color-
base
;
$--table-border-color
:
$--border-color-
lighter
;
$--table-text-color
:
$--color-text-regular
;
$--table-text-color
:
$--color-text-regular
;
$--table-header-color
:
$--color-text-secondary
;
$--table-row-hover-background
:
$--background-color-base
;
$--table-current-row-background
:
$--background-color-base
;
$--table-header-background
:
$--color-text-secondary
;
$--table-header-background
:
$--color-text-secondary
;
$--table-footer-background
:
$--color-text-placeholder
;
$--table-footer-background
:
$--color-text-placeholder
;
...
@@ -482,11 +487,12 @@ $--pagination-hover-color: $--color-white;
...
@@ -482,11 +487,12 @@ $--pagination-hover-color: $--color-white;
/* Popover
/* Popover
-------------------------- */
-------------------------- */
$--popover-fill
:
$--color-white
;
$--popover-fill
:
$--color-white
;
$--popover-font-size
:
12px
;
$--popover-font-size
:
$--font-size-base
;
$--popover-border-color
:
$--
disabled-border-base
;
$--popover-border-color
:
$--
border-color-lighter
;
$--popover-arrow-size
:
6px
;
$--popover-arrow-size
:
6px
;
$--popover-padding
:
10px
;
$--popover-padding
:
10px
;
$--popover-title-font-size
:
13px
;
$--popover-padding-large
:
28px
34px
;
$--popover-title-font-size
:
18px
;
$--popover-title-color
:
$--color-text-primary
;
$--popover-title-color
:
$--color-text-primary
;
/* Tooltip
/* Tooltip
...
@@ -529,7 +535,7 @@ $--tag-danger-color: $--color-danger;
...
@@ -529,7 +535,7 @@ $--tag-danger-color: $--color-danger;
/* Dropdown
/* Dropdown
-------------------------- */
-------------------------- */
$--dropdown-menu-box-shadow
:
$--box-shadow-
dark
;
$--dropdown-menu-box-shadow
:
$--box-shadow-
light
;
$--dropdown-menuItem-hover-fill
:
$--color-text-secondary
;
$--dropdown-menuItem-hover-fill
:
$--color-text-secondary
;
$--dropdown-menuItem-hover-color
:
$--link-color
;
$--dropdown-menuItem-hover-color
:
$--link-color
;
...
...
packages/theme-chalk/src/mixins/mixins.scss
View file @
e62f8c14
@import
"function"
;
@import
"function"
;
@import
"../common/var"
;
@import
"../common/var"
;
/* Transition
-------------------------- */
@mixin
primary-transition
{
transition
:
$t-primary
;
}
@mixin
specific-transition
(
$attr
)
{
transition
:
$attr
$t-primary
;
}
@mixin
specific-transition-with-time
(
$attr
,
$time
)
{
transition
:
$attr
$t-primary
;
}
/* Flex
/* Flex
-------------------------- */
-------------------------- */
@mixin
flex-center
{
@mixin
flex-center
{
...
@@ -27,16 +13,47 @@
...
@@ -27,16 +13,47 @@
align-items
:
center
;
align-items
:
center
;
}
}
/* Scrollbar
-------------------------- */
@mixin
scroll-bar
{
$--scrollbar-thumb-background
:
#b4bccc
;
$--scrollbar-track-background
:
#edeff5
;
&
:
:-
webkit-scrollbar
{
z-index
:
11
;
width
:
6px
;
background
:
black
;
&
:horizontal
{
height
:
6px
;
}
/* placeholder
&
-thumb
{
border-radius
:
5px
;
background
:
$--scrollbar-thumb-background
;
}
&
-corner
{
background
:
$--scrollbar-track-background
;
}
&
-track
{
background
:
$--scrollbar-track-background
;
}
}
}
/* Placeholder
-------------------------- */
-------------------------- */
@mixin
placeholder
{
@mixin
placeholder
{
&
:
:-
webkit-input-placeholder
{
&
:
:-
webkit-input-placeholder
{
@content
@content
}
}
&
:
:-
moz-placeholder
{
&
:
:-
moz-placeholder
{
@content
@content
}
}
&
:
-
ms-input-placeholder
{
&
:
-
ms-input-placeholder
{
@content
@content
}
}
...
...
packages/theme-chalk/src/popover.scss
View file @
e62f8c14
...
@@ -5,13 +5,20 @@
...
@@ -5,13 +5,20 @@
position
:
absolute
;
position
:
absolute
;
background
:
$--popover-fill
;
background
:
$--popover-fill
;
min-width
:
150px
;
min-width
:
150px
;
border-radius
:
2
px
;
border-radius
:
4
px
;
border
:
1px
solid
$--popover-border-color
;
border
:
1px
solid
$--popover-border-color
;
padding
:
$--popover-padding
;
padding
:
$--popover-padding
;
z-index
:
$--index-popper
;
z-index
:
$--index-popper
;
color
:
$--color-text-regular
;
line-height
:
1
.7
;
text-align
:
justify
;
word-break
:
break-all
;
font-size
:
$--popover-font-size
;
font-size
:
$--popover-font-size
;
box-shadow
:
0
2px
4px
0
rgba
(
0
,
0
,
0
,
.12
)
,
box-shadow
:
$--box-shadow-light
;
0
0
6px
0
rgba
(
0
,
0
,
0
,
.04
);
@include
m
(
plain
)
{
padding
:
$--popover-padding-large
;
}
.
popper__arrow
,
.
popper__arrow
,
.
popper__arrow
:
:
after
{
.
popper__arrow
:
:
after
{
...
@@ -25,6 +32,7 @@
...
@@ -25,6 +32,7 @@
.popper__arrow
{
.popper__arrow
{
border-width
:
$--popover-arrow-size
;
border-width
:
$--popover-arrow-size
;
filter
:
drop-shadow
(
0
2px
12px
rgba
(
0
,
0
,
0
,
0
.03
))
}
}
.
popper__arrow
:
:
after
{
.
popper__arrow
:
:
after
{
...
@@ -113,6 +121,6 @@
...
@@ -113,6 +121,6 @@
color
:
$--popover-title-color
;
color
:
$--popover-title-color
;
font-size
:
$--popover-title-font-size
;
font-size
:
$--popover-title-font-size
;
line-height
:
1
;
line-height
:
1
;
margin-bottom
:
9
px
;
margin-bottom
:
15
px
;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment