Skip to content

Commit

Permalink
细节修改
Browse files Browse the repository at this point in the history
  • Loading branch information
yangtao committed Sep 19, 2016
1 parent fe0d957 commit 34f86ca
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 80 deletions.
5 changes: 4 additions & 1 deletion src/assets/css/base.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
@import 'chat.scss';
/* 组件 */
@import 'dialogue-bar.scss';
@import 'person-info.scss';

@import 'chat.scss';
@import 'contact.scss';
@import 'find.scss';
@import 'me.scss';
.app-header {
position: absolute;
left: 0;
Expand Down
111 changes: 55 additions & 56 deletions src/assets/css/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ body,
.weui_cells_access .weui_cell_ft::after {
height: 11px;
width: 11px;
vertical-align: middle;
}

/*weui end*/
Expand All @@ -200,7 +201,7 @@ body,
}


/*1*/
/*initial route transition 1*/

._cover-top {
position: relative;
Expand All @@ -212,19 +213,18 @@ body,
color: #ffffff;
user-select: none;
-webkit-user-select: none;
transition: .18s all ease;
transition: .22s all ease;
}


/*2*/
/*initial route transition 2*/

._cover-top .top-title {
transition: .2s all ease;
}


/*3*/
/*initial route transition 3*/

._cover-content {
padding-top: 1px;
Expand All @@ -233,23 +233,23 @@ body,
transform: translate3d(0%, 0, 0);
height: calc(100% - 45px);
position: relative;
background-color: #ebebeb;
background-color: #efeff4;
box-shadow: 0px 0 41px rgba(0,0,0,.1);
}


/*enter ,leaver*/


/*1*/
/*route transition 1*/

.cover-enter ._cover-top,
.cover-leave ._cover-top {
opacity: 0;
}


/*2*/
/*route transition 2*/

.cover-enter ._cover-top .top-title,
.cover-leave ._cover-top .top-title {
Expand All @@ -258,7 +258,7 @@ body,
}


/*3*/
/*route transition 3*/

.cover-enter ._cover-content {
transform: translate3d(80%, 0, 0);
Expand All @@ -270,6 +270,52 @@ body,
}



/*
component- 开头的 是router-view最外层的组件元素
*/

[class*="component-"] {}



/* 保证next page 能覆盖住 current page */

._full_inner {
position: relative;
height: 100%;
z-index: 5;
}

._full_router {
position: absolute;
z-index: 10;
top: 0;
left: 0;
height: 100%;
width: 100%;
}


/* 子路由被激活后应用的样式 */

._effect {
opacity: 1;
transition: .3s all ease;
}

._effect--30 {
transform: translate3d(-30%, 0, 0);
}

._effect--50 {
opacity: 0;
transform: translate3d(-50%, 0, 0);
}


/* components */

/*top-handle.vue*/

._cover-top .top-back {
Expand Down Expand Up @@ -331,52 +377,5 @@ body,
}

._cover-top .top-other .iconfont {
font-size: 20px;
}


/*
component- 开头的 是router-view最外层的export组件元素
*/

[class*="component-"] {}

[class*="router-second"] {
position: relative;
z-index: 2;
}


/* 保证next router page 能覆盖住current page */

._full_inner {
position: relative;
height: 100%;
z-index: 5;
}

._full_router {
position: absolute;
z-index: 10;
top: 0;
left: 0;
height: 100%;
width: 100%;
}


/* effect30 */

._effect {
opacity: 1;
transition: .2s all ease;
}

._effect--30 {
transform: translate3d(-30%, 0, 0);
}

._effect--50 {
opacity: 0;
transform: translate3d(-50%, 0, 0);
font-size: 24px;
}
19 changes: 0 additions & 19 deletions src/assets/css/contact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,4 @@
width:35px;
margin-right:5px;
display:block;
}
.me-line .weui_cell_hd{
border-radius:6px;
margin-right:7px;
overflow: hidden;
border:1px solid #b5b5b5;
font-size: 0;
width: 60px;
height: 60px;
}
.me-line .weui_cell_hd img{
width: 60px;
}
.me-line .weui_cell_primary{
font-size:14px;
color:#111111;
}
.me-line .weui_cell_primary p:first-child{
font-size:18px;
}
10 changes: 10 additions & 0 deletions src/assets/css/me.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.me-line .weui_cell_hd img{
width: 60px;
}
.me-line .weui_cell_primary{
font-size:14px;
color:#111111;
}
.me-line .weui_cell_primary p:first-child{
font-size:18px;
}
3 changes: 1 addition & 2 deletions src/views/contact/add-friends.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,10 @@ export default {
}
},
methods:{
},
events:{
'route-pipe'(_decline){
this.decline = _decline
this.$parent.$emit('route-pipe',_decline)
}
},
created(){
Expand Down Expand Up @@ -144,6 +142,7 @@ export default {
height: 100%;
border: 0;
outline: none;
vertical-align: middle;
}
.add-friends-options img{
width: 35px;
Expand Down
2 changes: 0 additions & 2 deletions src/views/contact/new-friends.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,10 @@ export default {
}
},
methods:{
},
events:{
'route-pipe'(_decline){
this.decline = _decline
this.$parent.$emit('route-pipe',_decline)
}
},
created(){
Expand Down

0 comments on commit 34f86ca

Please sign in to comment.