This commit is contained in:
Pan
2017-08-23 11:39:16 +08:00
committed by 花裤衩
parent 385ec5a762
commit 3c05519a09
17 changed files with 54 additions and 61 deletions

View File

@@ -5,29 +5,27 @@ $pink: #E65D6E;
$green: #30B08F;
$tiffany: #4AB7BD;
$yellow:#FEC171;
$panGreen: #30B08F;
@mixin colorBtn($color) {
background: $color;
&:hover {
color: $color;
&:before, &:after {
&:before,
&:after {
background: $color;
}
}
}
.blue-btn {
@include colorBtn($blue)
}
.light-blue-btn{
.light-blue-btn {
@include colorBtn($light-blue)
}
.red-btn {
@include colorBtn($red)
}
@@ -40,12 +38,10 @@ $panGreen: #30B08F;
@include colorBtn($green)
}
.tiffany-btn {
@include colorBtn($tiffany)
}
.yellow-btn {
@include colorBtn($yellow)
}
@@ -63,12 +59,14 @@ $panGreen: #30B08F;
display: inline-block;
&:hover {
background: #fff;
&:before, &:after {
&:before,
&:after {
width: 100%;
transition: 600ms ease all;
}
}
&:before, &:after {
&:before,
&:after {
content: '';
position: absolute;
top: 0;
@@ -85,19 +83,20 @@ $panGreen: #30B08F;
}
}
.custom-button{
display: inline-block;
line-height: 1;
white-space: nowrap;
cursor: pointer;
background: #fff;
color: #fff;
-webkit-appearance: none;
text-align: center;
box-sizing: border-box;
outline: 0;
margin: 0;
padding: 10px 15px;
font-size: 14px;
border-radius: 4px;
.custom-button {
display: inline-block;
line-height: 1;
white-space: nowrap;
cursor: pointer;
background: #fff;
color: #fff;
-webkit-appearance: none;
text-align: center;
box-sizing: border-box;
outline: 0;
margin: 0;
padding: 10px 15px;
font-size: 14px;
border-radius: 4px;
}

View File

@@ -2,7 +2,6 @@
@import './btn.scss';
@import './element-ui.scss';
@import './sidebar.scss';
body {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
@@ -98,15 +97,16 @@ code {
opacity: 0;
}
//main-container全局样式
.app-container {
padding: 20px;
}
.components-container {
margin: 30px 50px;
position: relative;
}
.pagination-container {
margin-top: 30px;
}
@@ -115,9 +115,10 @@ code {
height: 100%!important;
}
.text-center{
.text-center {
text-align: center
}
.svg-icon {
width: 1em;
height: 1em;
@@ -216,7 +217,6 @@ code {
}
}
//refine vue-multiselect plugin
.multiselect {
line-height: 16px;
@@ -227,8 +227,9 @@ code {
}
//refine simplemde
.simplemde-container{
.editor-toolbar.fullscreen,.CodeMirror-fullscreen{
.simplemde-container {
.editor-toolbar.fullscreen,
.CodeMirror-fullscreen {
z-index: 1003;
}
}