Skip to content

E
Element
Commit c02809c4 authored by Leopoldthecoder's avatar Leopoldthecoder
Browse files
Options

misc visual updates

parent 3d229c41
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 81 deletions
examples/app.vue
View file @ c02809c4
......@@ -40,7 +40,7 @@
.container,
.page-container {
width: 960px;
width: 1140px;
margin: 0 auto;
}
......
examples/components/demo-block.vue
View file @ c02809c4
......@@ -19,7 +19,11 @@
transition: .2s;
&.hover {
box-shadow: 0 6px 18px 0 rgba(232, 237, 250, .5);
box-shadow: 0 0 8px 0 rgba(232, 237, 250, .6), 0 2px 4px 0 rgba(232, 237, 250, .5);
}
code {
font-family: Menlo, Monaco, Consolas, Courier, monospace;
}
.source {
......@@ -27,7 +31,7 @@
}
.meta {
background-color: #fbfcfd;
background-color: #f9fafc;
border-top: solid 1px #eaeefb;
clear: both;
overflow: hidden;
......@@ -42,7 +46,7 @@
border-left: solid 1px #eaeefb;
float: right;
font-size: 14px;
line-height: 1.5;
line-height: 1.8;
color: #5e6d82;
word-break: break-word;
......@@ -51,10 +55,10 @@
}
code {
background-color: #f4faff;
border: solid 1px #eaeefb;
color: #5e6d82;
background-color: #e6effb;
margin: 0 4px;
padding: 0 4px;
padding: 4px 8px;
font-size: 12px;
}
}
......@@ -68,10 +72,11 @@
}
code.hljs {
font-size: 12px;
padding: 18px 24px;
margin: 0;
line-height: 1.4;
background-color: #fbfcfd;
line-height: 1.8;
background-color: #f9fafc;
border: none;
max-height: none;
border-radius: 0;
......@@ -107,7 +112,7 @@
&:hover {
color: #20a0ff;
background-color: rgba(32, 159, 255, .05);
background-color: #f9fafc;
}
}
}
......
examples/components/footer-nav.vue
View file @ c02809c4
......@@ -97,10 +97,10 @@
},
created() {
navConfig[0].groups.map(group => group.list).forEach(list => {
this.nav = navConfig[0].children;
navConfig[1].groups.map(group => group.list).forEach(list => {
this.nav = this.nav.concat(list);
});
this.nav = this.nav.concat(navConfig[1].children);
this.updateNav();
}
};
......
examples/components/footer.vue
View file @ c02809c4
......@@ -29,7 +29,7 @@
.footer {
height: 120px;
background-color: #324057;
color: #fff;
color: #a4aebd;
width: 100%;
z-index: 1000;
margin-top: -120px;
......@@ -58,10 +58,10 @@
margin: 12px 18px 0 0;
line-height: 1;
font-size: 12px;
color: #8492a6;
color: #768193;
a {
color: #8492a6;
color: #768193;
text-decoration: none;
}
}
......@@ -99,13 +99,12 @@
display: inline-block;
line-height: 32px;
text-align: center;
color: #324057;
background-color: #fff;
color: #8D99AB;
background-color: transparent;
size: 32px;
border-radius: 50%;
font-size: 22px;
font-size: 32px;
vertical-align: middle;
&:hover {
color: #fff;
transform: scale(1.2);
}
}
......@@ -113,22 +112,14 @@
.doc-icon-weixin {
margin-right: 36px;
&:hover {
background-color: #26CB72;
color: #fff;
}
}
.doc-icon-github {
margin-right: 0;
transform: translateY(8px);
position: relative;
&::before {
position: absolute;
left: 4px;
bottom: -6px;
}
&:hover {
transform: translateY(8px) scale(1.2);
background-color: #437AC0;
color: #fff;
}
}
}
......
examples/components/header.vue
View file @ c02809c4
......@@ -4,12 +4,11 @@
}
.header {
height: 80px;
background-color: #20a0ff;
background-color: rgba(32, 160, 255, 1);
color: #fff;
top: 0;
left: 0;
width: 100%;
z-index: 1000;
line-height: @height;
z-index: 100;
position: relative;
......@@ -58,6 +57,7 @@
list-style: none;
position: relative;
cursor: pointer;
margin-left: 20px;
a {
text-decoration: none;
......@@ -77,24 +77,28 @@
}
}
}
/*.el-menu-item__bar {
background-color: #99d2fc;
}*/
}
.header-fixed {
position: fixed;
top: -80px;
box-shadow: 0px 2px 8px 0px rgba(50,63,87,0.45);
box-shadow: 0 2px 6px 0 rgba(50, 63, 87, 0.25);
}
.header-hangUp {
top: 0;
}
.header-home {
position: fixed;
top: 0;
background-color: rgba(32, 160, 255, 0);
}
</style>
<template>
<div class="headerWrapper">
<header class="header"
ref="header"
:style="headerStyle"
:class="{
'header-home': isHome,
'header-fixed': isFixed,
'header-hangUp': hangUp
}">
......@@ -133,13 +137,19 @@
return {
active: '',
isFixed: false,
isHome: false,
headerStyle: {},
hangUp: false
};
},
watch: {
'$route.path'(val) {
this.isHome = val === '/';
this.headerStyle.backgroundColor = `rgba(32, 160, 255, ${ this.isHome ? '0' : '1' })`;
}
},
mounted() {
this.isHome = this.$route.path === '/';
function scroll(fn) {
var beforeScrollTop = document.body.scrollTop;
......@@ -154,6 +164,13 @@
}, false);
}
scroll((direction) => {
if (this.isHome) {
const threshold = 200;
let alpha = Math.min(document.body.scrollTop, threshold) / threshold;
this.$refs.header.style.backgroundColor = `rgba(32, 160, 255, ${ alpha })`;
return;
}
this.headerStyle.backgroundColor = 'rgba(32, 160, 255, 1)';
const bounding = this.$el.getBoundingClientRect();
if (bounding.bottom < 0) {
this.isFixed = true;
......
examples/components/side-nav.vue
View file @ c02809c4
......@@ -2,7 +2,6 @@
.side-nav {
width: 100%;
box-sizing: border-box;
border-right: 1px solid #eaeefa;
li {
list-style: none;
......@@ -15,12 +14,12 @@
.nav-item {
a {
font-size:18px;
color:#5e6d82;
line-height: 42px;
height: 42px;
font-size: 16px;
color: #5e6d82;
line-height: 40px;
height: 40px;
margin: 0;
padding: 0 0 0 12px;
padding: 0;
text-decoration: none;
display: block;
position: relative;
......@@ -28,26 +27,15 @@
&.active {
color: #20a0ff;
&:after {
content: '';
width: 2px;
background-color: #20a0ff;
height: 32px;
border-radius: 2px;
left: 0;
position: absolute;
top: 5px;
}
}
}
.nav-item {
a {
display: block;
height: 42px;
line-height: 42px;
font-size: 14px;
padding-left: 22px;
height: 40px;
line-height: 40px;
font-size: 13px;
padding-left: 24px;
&:hover {
......@@ -57,9 +45,11 @@
}
}
.nav-group__title {
font-size: 12px;
color: #99a9bf;
padding-left: 15px;
line-height: 34px;
padding-left: 8px;
line-height: 26px;
margin-top: 10px;
}
}
</style>
......
examples/docs/dialog.md
View file @ c02809c4
......@@ -75,8 +75,8 @@ Dialog 弹出一个对话框，适合需要定制性更大的场景。
```html
<el-button type="text" @click.native="dialogVisible = true">点击打开 Dialog</el-button>
<el-dialog title="提示" v-model="dialogVisible">
<span>这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息，这是一段信息</span>
<el-dialog title="提示" v-model="dialogVisible" size="tiny">
<span>这是一段信息</span>
<span slot="footer" class="dialog-footer">
<el-button @click.native="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click.native="dialogVisible = false">确 定</el-button>
......
examples/index.template.html
View file @ c02809c4
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<link rel="stylesheet" href="//at.alicdn.com/t/font_1471936010_8874195.css">
<link rel="stylesheet" href="//at.alicdn.com/t/font_1473762766_7074292.css">
<title>Element</title>
</head>
<body>
......
examples/nav.config.json
View file @ c02809c4
[
{
"name": "安装指南",
"children": [{
"path": "/quickstart",
"name": "快速上手"
}, {
"path": "/development",
"name": "开发指南"
}]
},
{
"name": "基础组件",
"groups": [{
......@@ -242,15 +252,5 @@
}
]
}]
},
{
"name": "安装指南",
"children": [{
"path": "/quickstart",
"name": "快速上手"
}, {
"path": "/development",
"name": "开发指南"
}]
}
]
examples/pages/component.vue
View file @ c02809c4
......@@ -7,8 +7,6 @@
}
.page-component {
.content {
padding-left: 25px;
border-left: 1px solid #eaeefa;
margin-left: -1px;
> {
......
examples/pages/index.vue
View file @ c02809c4
......@@ -6,8 +6,8 @@
}
}
.banner {
position: relative;
height: 420px;
background-color: #20a0ff;
color: #fff;
margin-bottom: 130px;
......@@ -18,9 +18,24 @@
img {
position: absolute;
top: 15px;
right: -105px;
right: -10px;
}
}
.banner-sky {
position: absolute;
top: -150px;
bottom: -15px;
width: 100%;
margin-top: -140px;
transform: skewY(-5deg);
transform-origin: center;
background-image: linear-gradient(180deg, #0d1a44 13%, #3c4f91 56%, #5fc1e4 100%);
}
img.banner-stars {
top: -10px;
left: 50%;
transform: translateX(-50%);
}
.banner-desc {
padding-top: 80px;
font-size: 46px;
......@@ -34,7 +49,7 @@
}
.cards {
margin: 0 auto 110px;
width: 960px;
width: 1140px;
.container {
@utils-clearfix;
......@@ -45,7 +60,7 @@
li {
width: 33.33333%;
padding: 0 11px;
padding: 0 19px;
box-sizing: border-box;
float: left;
list-style: none;
......@@ -116,6 +131,8 @@
<template>
<div>
<div class="banner">
<div class="banner-sky"></div>
<img class="banner-stars" src="~examples/assets/images/stars.png" alt="Element">
<div class="container">
<div class="banner-desc">
<h2>Element</h2>
......
examples/pages/nav.vue
View file @ c02809c4
......@@ -68,11 +68,11 @@
<div>
<h2>导航</h2>
<div class="block">
<p>导航可以解决用户在访问页面时：在哪里，去哪里，怎样去的问题。一般导航会有「侧栏导航」和「顶部导航」2种类型。</p>
<p>导航可以解决用户在访问页面时：在哪里，去哪里，怎样去的问题。一般导航会有「侧栏导航」和「顶部导航」2 种类型。</p>
</div>
<div class="block">
<h3>选择合适的导航</h3>
<p>选择合适的导航可以让用户在产品的使用过程中非常流畅,相反若是不合适就会引起用户操作不适(方向不明确)，以下是「侧栏导航」和 「顶部导航」的区别。</p>
<p>选择合适的导航可以让用户在产品的使用过程中非常流畅,相反若是不合适就会引起用户操作不适（方向不明确），以下是「侧栏导航」和 「顶部导航」的区别。</p>
</div>
<div class="block">
<h3>侧栏导航</h3>
......
packages/theme-default/src/dialog.css
View file @ c02809c4
......@@ -47,7 +47,7 @@
color: #C0CCDA;
&:hover {
color: var(--dialog-background-color);
color: var(--color-primary);
}
}
......
packages/theme-default/src/message-box.css
View file @ c02809c4
......@@ -36,6 +36,10 @@
cursor: pointer;
line-height: 20px;
text-align: center;
&:hover {
color: var(--color-primary);
}
}
@e input {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment