From f883ecfbaeb9b5d196a4acd97ff8d0a6a5f108b1 Mon Sep 17 00:00:00 2001 From: Technoboy10 Date: Mon, 8 Aug 2016 08:38:32 -0400 Subject: [PATCH] commit changes --- src/_colors.scss | 1 + src/components/grid/grid.jsx | 3 ++ src/components/grid/grid.scss | 37 ++++++++++----- src/components/thumbnail/thumbnail.jsx | 4 +- src/views/explore/explore.jsx | 62 ++++++++++++++------------ src/views/explore/explore.scss | 46 +++++++++++++++---- 6 files changed, 105 insertions(+), 48 deletions(-) diff --git a/src/_colors.scss b/src/_colors.scss index 7a8947665..dff8ef60a 100644 --- a/src/_colors.scss +++ b/src/_colors.scss @@ -11,6 +11,7 @@ $background-color: hsla(0, 0, 99, 1); //#FDFDFD /* UI Secondary Colors */ $ui-aqua: hsla(170, 70, 50, 1); //#26D9BB $ui-purple: hsla(265, 55, 55, 1); //#824DCB +$ui-yellow: hsla(45, 100, 50, 1); //#FFBF00 $ui-white: #fff; $ui-border: hsla(0, 0, 85, 1); //#D9D9D9 diff --git a/src/components/grid/grid.jsx b/src/components/grid/grid.jsx index 04f8a0b42..052a61dd7 100644 --- a/src/components/grid/grid.jsx +++ b/src/components/grid/grid.jsx @@ -12,6 +12,7 @@ var Grid = React.createClass({ return { items: require('./grid.json'), itemType: 'projects', + explore: false, showLoves: false, showFavorites: false, showRemixes: false, @@ -32,6 +33,7 @@ var Grid = React.createClass({ if (this.props.itemType == 'projects') { return ( - - - {this.getBubble('all')} - {this.getBubble('animations')} - {this.getBubble('art')} - {this.getBubble('games')} - {this.getBubble('music')} - {this.getBubble('stories')} - - - {this.getTab('projects')} - {this.getTab('studios')} - -
- - - - + +
+

Explore

- +
+ + {this.getTab('projects')} + {this.getTab('studios')} + + + {this.getBubble('all')} + {this.getBubble('animations')} + {this.getBubble('art')} + {this.getBubble('games')} + {this.getBubble('music')} + {this.getBubble('stories')} + +
+ + + + +
diff --git a/src/views/explore/explore.scss b/src/views/explore/explore.scss index 3e8406771..8918d0e04 100644 --- a/src/views/explore/explore.scss +++ b/src/views/explore/explore.scss @@ -4,6 +4,36 @@ $base-bg: $ui-white; #view { + padding: 0; +} + +.outer { + .title-banner { + &.masthead { + margin-bottom: 0; + background-color: $ui-yellow; + padding: 0; + + h1 { + text-align: center; + color: $ui-white; + font-size: 3rem; + } + + p { + margin: 0; + width: $cols6; + text-align: left; + color: $ui-white; + + a { + border-bottom: 1px solid $ui-white; + color: $ui-white; + } + } + } + } + .box { display: block; margin-right: auto; @@ -13,7 +43,7 @@ $base-bg: $ui-white; .box-content { padding: 0; } - } + } .categories { display: inline-block; @@ -26,20 +56,20 @@ $base-bg: $ui-white; opacity: .75; background-color: $ui-white; color: $header-gray; - + &:hover { opacity: 1; border-color: $active-dark-gray; } - } - li.active { - opacity: 1; - border-color: $active-dark-gray; - - &:hover { + &.active { opacity: 1; border-color: $active-dark-gray; + + &:hover { + opacity: 1; + border-color: $active-dark-gray; + } } } }