Skip to content

Commit

Permalink
优化全局Style , 新增一个全屏按钮
Browse files Browse the repository at this point in the history
  • Loading branch information
BoBoooooo committed Oct 7, 2018
1 parent b068835 commit ec78f2f
Show file tree
Hide file tree
Showing 19 changed files with 593 additions and 111 deletions.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"font-awesome": "4.7.0",
"http-proxy-middleware": "^0.17.3",
"axios": "0.18.0",
"screenfull": "3.3.3",

"element-ui": "2.4.6",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"js-cookie": "2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {
.el-table{
height:calc(100% - 130px);
height:100%;
overflow: auto;
}
</style>
2 changes: 1 addition & 1 deletion src/components/GithubCorner/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<a href="https://github.com/BoBoooooo" target="_blank" class="github-corner" aria-label="Follow me on Github" title="Follow me on Github">
<svg width="80" height="80" viewBox="0 0 250 250" style="fill:#40c9c6; color:#fff; position: absolute; top: 2px; border: 0; right: 0;"
<svg width="80" height="80" viewBox="0 0 250 250" style="fill:#40c9c6; color:#fff; position: absolute; top: 84px; border: 0; right: 0;"
aria-hidden="true">
<path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
<path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
Expand Down
4 changes: 3 additions & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import router from './router'
import store from './store'
import '@/icons' // icon
import '@/permission' // 权限import axios from 'axios';
import axios from 'axios'
// import axios from 'axios'
import '@/styles/index.scss' // global css

import * as filters from './filters' // global filters

Vue.use(ElementUI)
Expand Down
94 changes: 94 additions & 0 deletions src/styles/btn.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
@import './variables.scss';

@mixin colorBtn($color) {
background: $color;
&:hover {
color: $color;
&:before,
&:after {
background: $color;
}
}
}

.blue-btn {
@include colorBtn($blue)
}

.light-blue-btn {
@include colorBtn($light-blue)
}

.red-btn {
@include colorBtn($red)
}

.pink-btn {
@include colorBtn($pink)
}

.green-btn {
@include colorBtn($green)
}

.tiffany-btn {
@include colorBtn($tiffany)
}

.yellow-btn {
@include colorBtn($yellow)
}

.pan-btn {
font-size: 14px;
color: #fff;
padding: 14px 36px;
border-radius: 8px;
border: none;
outline: none;
transition: 600ms ease all;
position: relative;
display: inline-block;
&:hover {
background: #fff;
&:before,
&:after {
width: 100%;
transition: 600ms ease all;
}
}
&:before,
&:after {
content: '';
position: absolute;
top: 0;
right: 0;
height: 2px;
width: 0;
transition: 400ms ease all;
}
&::after {
right: inherit;
top: inherit;
left: 0;
bottom: 0;
}
}

.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;
}

99 changes: 76 additions & 23 deletions src/styles/element-ui.scss
Original file line number Diff line number Diff line change
@@ -1,29 +1,82 @@
//覆盖一些element-ui样式 覆盖css样式可在这里添加
.el-upload {
input[type="file"] {
display: none !important;
}
}
//覆盖一些element-ui样式

.el-upload__input {
display: none;
.el-breadcrumb__inner, .el-breadcrumb__inner a{
font-weight: 400!important;
}

//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
.el-dialog {
transform: none;
left: 0;
position: relative;
margin: 0 auto;
}
.el-upload {
input[type="file"] {
display: none !important;
}
}

.el-upload__input {
display: none;
}

.cell {
.el-tag {
margin-right: 0px;
}
}

.small-padding {
.cell {
padding-left: 5px;
padding-right: 5px;
}
}

.fixed-width{
.el-button--mini{
padding: 7px 10px;
width: 60px;
}
}

.status-col {
.cell {
padding: 0 10px;
text-align: center;
.el-tag {
margin-right: 0px;
}
}
}

//暂时性解决dialog 问题 https://github.com/ElemeFE/element/issues/2461
.el-dialog {
transform: none;
left: 0;
position: relative;
margin: 0 auto;
}

//文章页textarea修改样式
.article-textarea {
textarea {
padding-right: 40px;
resize: none;
border: none;
border-radius: 0px;
border-bottom: 1px solid #bfcbd9;
}
}

//element ui upload
.upload-container {
.el-upload {
width: 100%;
.el-upload-dragger {
width: 100%;
height: 200px;
}
}
}

//element ui upload
.upload-container {
.el-upload {
width: 100%;
.el-upload-dragger {
width: 100%;
height: 200px;
}
//dropdown
.el-dropdown-menu{
a{
display: block
}
}
Loading

0 comments on commit ec78f2f

Please sign in to comment.