Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
surmon-china committed Aug 2, 2017
1 parent 1d860d5 commit c0e0264
Show file tree
Hide file tree
Showing 15 changed files with 455 additions and 16 deletions.
83 changes: 82 additions & 1 deletion assets/sass/common.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@

* {
border-radius: 0;
box-shadow: none;
}

*, *:hover {
@include transition(background-color .25s linear,
color .05s linear,
Expand Down Expand Up @@ -28,6 +34,20 @@
}
}

// swiper
.swiper-wrapper {
z-index: 1;
}

.swiper-pagination {
z-index: 2;
}

.swiper-button-prev,
.swiper-button-next {
z-index: 3;
}

input:-webkit-autofill,
textarea:-webkit-autofill,
select:-webkit-autofill {
Expand Down Expand Up @@ -212,4 +232,65 @@ a {
}
.aside-enter, .aside-leave-active {
opacity: 0
}
}

@keyframes barrage-in {
0% {
background: chartreuse;
transform: translate3d(0, -100%, 0);
}
12% {
background: green;
transform: translate3d(0, 0%, 0);
}
24% {
background: red;
transform: translate3d(0, -40%, 0);
}
36% {
background: darkviolet;
transform: translate3d(0, 0%, 0);
}
60% {
background: pink;
transform: translate3d(0, -20%, 0);
}
72% {
background: yellow;
transform: translate3d(0, 0%, 0);
}
86% {
background: white;
transform: translate3d(0, -10%, 0);
}
100% {
background: black;
transform: translate3d(0, 0%, 0);
}
}

.barrage-enter-active {
// opacity: .5;
animation: barrage-in 2s;
}
.barrage-leave-active {
// opacity: .5;
animation: barrage-in 2s reverse;
}

// .barrage-enter-active, .barrage-leave-active {
// transition: all .2s cubic-bezier(0, 1.2, 1, 0.5);
// opacity: .7;
// animation: barrage .1s;
// // transform: scale(2);
// transform: rotate(90deg);
// transform-origin: right bottom;
// // transform: translate3d(0, -100%, 0);
// }
// .barrage-enter, .barrage-leave-active {
// opacity: .3;
// // transform: scale(2);
// transform: rotate(90deg);
// transform-origin: right bottom;
// // transform: translate3d(0, 100%, 0);
// }
12 changes: 7 additions & 5 deletions assets/sass/iconfont.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

@font-face {font-family: "iconfont";
src: url('//at.alicdn.com/t/font_bxeicwnhp1rzr529.eot?t=1501495021462'); /* IE9*/
src: url('//at.alicdn.com/t/font_bxeicwnhp1rzr529.eot?t=1501495021462#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('//at.alicdn.com/t/font_bxeicwnhp1rzr529.woff?t=1501495021462') format('woff'), /* chrome, firefox */
url('//at.alicdn.com/t/font_bxeicwnhp1rzr529.ttf?t=1501495021462') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('//at.alicdn.com/t/font_bxeicwnhp1rzr529.svg?t=1501495021462#iconfont') format('svg'); /* iOS 4.1- */
src: url('//at.alicdn.com/t/font_63c02i34s6gh9f6r.eot?t=1501676231009'); /* IE9*/
src: url('//at.alicdn.com/t/font_63c02i34s6gh9f6r.eot?t=1501676231009#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('//at.alicdn.com/t/font_63c02i34s6gh9f6r.woff?t=1501676231009') format('woff'), /* chrome, firefox */
url('//at.alicdn.com/t/font_63c02i34s6gh9f6r.ttf?t=1501676231009') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('//at.alicdn.com/t/font_63c02i34s6gh9f6r.svg?t=1501676231009#iconfont') format('svg'); /* iOS 4.1- */
}

.iconfont {
Expand Down Expand Up @@ -145,6 +145,8 @@

.icon-python1:before { content: "\e651"; }

.icon-barrage:before { content: "\e65d"; }

.icon-mongodb:before { content: "\e67b"; }

.icon-code:before { content: "\e7bc"; }
Expand Down
2 changes: 2 additions & 0 deletions assets/sass/variables.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// container
$container-width: 75em;
$header-height: 4.5em;
$mobile-container-width: 100%;
$body-bg: #eee;
$module-bg: rgba(255,255,255,0.6);
$module-hover-bg: rgba(197,197,197,0.4);


// mobile
$mobile-aside-bg: #34393d;
$mobile-aisde-transition: all 0.35s ease-out;
Expand Down
3 changes: 3 additions & 0 deletions components/common/vue-comment/comment.vue
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@
> .tools {
display: flex;
padding: 1em 0;
padding-top: 0;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid $module-hover-bg;
Expand Down Expand Up @@ -764,6 +765,8 @@
> .empty-box {
font-weight: bold;
text-align: center;
height: 5rem;
line-height: 5rem;
}
> .list-box {
Expand Down
Loading

0 comments on commit c0e0264

Please sign in to comment.