diff --git a/css/base.css b/css/base.css index 3b5975e..e54b40e 100644 --- a/css/base.css +++ b/css/base.css @@ -172,6 +172,7 @@ header { width: 30%; margin: 0 1.5%; margin-bottom: 50px; + float: left; box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; } @@ -191,6 +192,8 @@ header { -ms-box-sizing: border-box; } .article:hover { color: #333; } + .article:hover img.article-cover { + opacity: 1; } .article a:hover { border: none; color: #000; } @@ -211,13 +214,6 @@ header { -ms-transition: all 0.2s ease-in; -o-transition: all 0.2s ease-in; transition: all 0.2s ease-in; } - .article img.article-cover:hover { - opacity: 1; - -webkit-transition: all 0.2s ease-in; - -moz-transition: all 0.2s ease-in; - -ms-transition: all 0.2s ease-in; - -o-transition: all 0.2s ease-in; - transition: all 0.2s ease-in; } .article .tag { width: 100px; position: absolute; @@ -301,3 +297,14 @@ footer { color: #333332; text-align: center; font-size: 0.9em; } + +.img { + padding: 10px 0px 10px 10px; } + .img.right img { + float: right; + width: 300px; } + .img.left img { + float: left; + width: 300px; } + .img.center { + text-align: center; } diff --git a/css/base.scss b/css/base.scss index cce1023..4648e47 100644 --- a/css/base.scss +++ b/css/base.scss @@ -232,6 +232,7 @@ header { width: 30%; margin: 0 1.5%; margin-bottom: 50px; + float: left; @include box-sizing(); } @@ -245,6 +246,9 @@ header { &:hover { color: #333; + img.article-cover { + opacity: 1; + } } a:hover { @@ -271,11 +275,6 @@ header { width: 100%; opacity: 0.8; @include transition(all, 0.2s, ease-in); - - &:hover { - opacity: 1; - @include transition(all, 0.2s, ease-in); - } } .tag { @@ -389,4 +388,20 @@ footer { font-size: 0.9em; } -// ============== /TEAM ============== // \ No newline at end of file +// ============== /TEAM ============== // + +.img { + padding: 10px 0px 10px 10px; + + &.right img{ + float: right; + width: 300px; + } + &.left img{ + float: left; + width: 300px; + } + &.center { + text-align: center; + } +} \ No newline at end of file