diff --git a/src/js/views/Artist.js b/src/js/views/Artist.js index a2a6c79f..4f96880f 100755 --- a/src/js/views/Artist.js +++ b/src/js/views/Artist.js @@ -132,24 +132,22 @@ class Artist extends React.Component{ ) }else if( this.state.sub_view == 'about' ){ return ( -
-

Biography

+
- +
+ {this.props.artist.followers ?
{this.props.artist.followers.total.toLocaleString() } followers
: null} + {this.props.artist.popularity ?
{this.props.artist.popularity }% popularity
: null} + {this.props.artist.listeners ?
{ this.props.artist.listeners.toLocaleString() } listeners
: null } +
-
- { this.props.artist.bio ?

{this.props.artist.bio.content}


-
Published: { this.props.artist.bio.published }
-
Origin: { this.props.artist.bio.links.link.href }
: null } -
+
+

Biography

+
+ { this.props.artist.bio ?

{this.props.artist.bio.content}


+
Published: { this.props.artist.bio.published }
+
: null } +
+
) } @@ -195,10 +193,7 @@ class Artist extends React.Component{

{ this.props.artist.name }

-
- { scheme == 'spotify' ? : null } - { scheme == 'spotify' ? : null } -
+ { scheme == 'spotify' ?
: null} { this.renderSubViewMenu() }
diff --git a/src/scss/components/_grid.scss b/src/scss/components/_grid.scss index 65232aad..16cee513 100755 --- a/src/scss/components/_grid.scss +++ b/src/scss/components/_grid.scss @@ -1,19 +1,4 @@ -@mixin grid_item( $cols, $gap: 2% ){ - width: ( 0% + ( 100 / $cols ) - ( $gap * 2 ) + ( ( $gap * 2 ) / $cols ) ); - box-sizing: border-box; - margin: 0 $gap 3%; - - &:nth-child(#{$cols}n-#{$cols}) { - margin-right: 0; - @include clearfix; - } - - &:nth-child(#{$cols}n-#{$cols - 1}) { - margin-left: 0; - } -} - .grid { .grid-item-wrapper { diff --git a/src/scss/components/_images.scss b/src/scss/components/_images.scss index a774101c..935bee27 100755 --- a/src/scss/components/_images.scss +++ b/src/scss/components/_images.scss @@ -66,4 +66,34 @@ opacity: 0.5; } } +} + +.tile { + @include grid_item( 2 ); + color: $dark_grey; + text-align: center; + position: relative; + z-index: 1; + float: left; + padding-top: 16%; + font-size: 16px; + + &:before { + content: ''; + display: block; + position: absolute; + top: 0; + width: 100%; + padding-bottom: 100%; + background: $light_grey; + z-index: -1; + } + + .fa { + display: block; + font-size: 40px; + opacity: 0.2; + z-index: 0; + padding-bottom: 10px; + } } \ No newline at end of file diff --git a/src/scss/global/_variables.scss b/src/scss/global/_variables.scss index 662e6e92..6107d22b 100755 --- a/src/scss/global/_variables.scss +++ b/src/scss/global/_variables.scss @@ -66,6 +66,21 @@ $bp_shallow: 650px; filter: blur( $size ); } +@mixin grid_item( $cols, $gap: 2% ){ + width: ( 0% + ( 100 / $cols ) - ( $gap * 2 ) + ( ( $gap * 2 ) / $cols ) ); + box-sizing: border-box; + margin: 0 $gap 3%; + + &:nth-child(#{$cols}n-#{$cols}) { + margin-right: 0; + @include clearfix; + } + + &:nth-child(#{$cols}n-#{$cols - 1}) { + margin-left: 0; + } +} + @mixin responsive( $max_width: null, $min_width: null, $max_height: null, $min_height: null ){ @if $max_width and $max_height { @media( max-width: $max_width ), ( max-height: $max_height ){ diff --git a/src/scss/views/_artist.scss b/src/scss/views/_artist.scss index bb10a048..6c7114f1 100755 --- a/src/scss/views/_artist.scss +++ b/src/scss/views/_artist.scss @@ -2,7 +2,7 @@ .artist-view { .intro { position: relative; - @include clearfix; + @include clearfix(); margin-bottom: 40px; .parallax { @@ -18,13 +18,13 @@ .liner { position: relative; z-index: 1; - padding: 20vh 40px 0 40px; + padding: 20vh 40px 0 220px; .thumbnail { - position: relative; + position: absolute; z-index: 2; - float: left; - margin-right: 35px; + left: 40px; + bottom: 20px; max-width: 144px; } @@ -43,12 +43,11 @@ .sub-views { color: #FFFFFF; - margin-left: -12px; .option { display: inline-block; padding: 8px 0; - margin: 0 12px 0; + margin-right: 15px; font-size: 18px; font-weight: 400; border-bottom: 4px solid transparent; @@ -67,8 +66,8 @@ } - .artist-list { - padding-top: 15px; + .body.about { + padding: 0 40px 40px 40px; } @include responsive( $bp_medium ){ @@ -80,6 +79,7 @@ padding-top: 10vh; .thumbnail { + position: static; float: none; margin: 0 auto 20px; max-width: 100px;