From e6a747210e7d291c2465fefa5299a4adce586368 Mon Sep 17 00:00:00 2001 From: Scott Tolksdorf Date: Tue, 3 May 2016 23:47:55 -0400 Subject: [PATCH] New navbar is done for the homepage, looking really good --- client/homebrew/homePage/homePage.jsx | 25 +++++--- client/homebrew/navbar/navbar.jsx | 24 +++++-- client/homebrew/navbar/navbar.less | 18 +++++- shared/naturalCrit/nav/nav.jsx | 74 ++++++++++++++++------ shared/naturalCrit/nav/nav.less | 91 +++++++++++++++++++++++++-- 5 files changed, 195 insertions(+), 37 deletions(-) diff --git a/client/homebrew/homePage/homePage.jsx b/client/homebrew/homePage/homePage.jsx index 08017f24d..3cbb7adf8 100644 --- a/client/homebrew/homePage/homePage.jsx +++ b/client/homebrew/homePage/homePage.jsx @@ -13,6 +13,8 @@ var Editor = require('../editor/editor.jsx'); var Nav = require('naturalCrit/nav/nav.jsx'); +var Navbar = require('../navbar/navbar.jsx'); + @@ -58,17 +60,22 @@ var HomePage = React.createClass({ return(
- - - Test - - + + + Changelog + + + New Brew + + - -
diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index b1647ec46..78cd74639 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -2,13 +2,27 @@ var React = require('react'); var _ = require('lodash'); var cx = require('classnames'); -var COM = React.createClass({ + +var Nav = require('naturalCrit/nav/nav.jsx'); + + + +var Navbar = React.createClass({ render : function(){ - return
- COM Ready! -
+ return + + + +
The Homebrewery
+
+
+ + + {this.props.children} + +
} }); -module.exports = COM; +module.exports = Navbar; diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 6bb4bdf5e..70f54163a 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -1,3 +1,19 @@ -.COM{ +.homebrew nav{ + + .homebrewLogo{ + .animate(color); + font-family : CodeBold; + font-size: 12px; + + div{ + margin-top: 3px; + margin-bottom: -3px; + } + + color : white; + &:hover{ + color : @blue; + } + } } \ No newline at end of file diff --git a/shared/naturalCrit/nav/nav.jsx b/shared/naturalCrit/nav/nav.jsx index 0f1b81c1c..ae03ab8b6 100644 --- a/shared/naturalCrit/nav/nav.jsx +++ b/shared/naturalCrit/nav/nav.jsx @@ -3,47 +3,85 @@ var _ = require('lodash'); var cx = require('classnames'); var Nav = { - base : React.createClass({ render : function(){ return } }), + logo : function(){ + return + {Nav.logoSVG()} + + NaturalCrit + + ; + }, + logoSVG : function(props){ + return + + ; + + }, + + section : React.createClass({ + render : function(){ + return
+ {this.props.children} +
+ } + }), + left : React.createClass({ render : function(){ - return
- COM Ready! + return
+ {this.props.children}
} }), right : React.createClass({ render : function(){ - return
- COM Ready! + return
+ {this.props.children}
} }), - logo : function(props){ - return - - }, - - - - + item : React.createClass({ + getDefaultProps: function() { + return { + icon : null, + href : null, + onClick : function(){}, + color : null + }; + }, + handleClick : function(){ + this.props.onClick(); + }, + render : function(){ + var classes = cx('navItem', this.props.color, this.props.className); + var icon; + if(this.props.icon) icon = ; + if(this.props.href){ + return + {this.props.children} + {icon} + + }else{ + return
+ {this.props.children} + {icon} +
+ } + } + }), }; diff --git a/shared/naturalCrit/nav/nav.less b/shared/naturalCrit/nav/nav.less index 9b2de7f1d..b02c6031b 100644 --- a/shared/naturalCrit/nav/nav.less +++ b/shared/naturalCrit/nav/nav.less @@ -1,5 +1,88 @@ -nav{ - background-color: #333; - min-height : 25px; -} +@font-face { + font-family : CodeLight; + src : url('/assets/naturalCrit/logo/CODE Light.otf'); +} +@font-face { + font-family : CodeBold; + src : url('/assets/naturalCrit/logo/CODE Bold.otf'); +} +nav{ + display : flex; + background-color : #333; + justify-content : space-between; + .navSection{ + display : flex; + align-items : center; + } + .navLogo{ + display : block; + margin-top : 0px; + margin-right : 8px; + margin-left : 8px; + color : white; + text-decoration : none; + + &:hover{ + .name{ color : @orange; } + svg{ fill : @orange } + } + + + svg{ + height : 13px; + margin-right : 0.2em; + cursor : pointer; + fill : white; + } + span.name{ + font-family : 'CodeLight'; + font-size : 15px; + span.crit{ + font-family : 'CodeBold'; + } + small{ + font-family : 'Open Sans'; + font-size : 0.3em; + font-weight : 800; + text-transform : uppercase; + } + } + } + .navItem{ + .animate(background-color); + padding : 5px 8px; + cursor : pointer; + background-color : #333; + font-size : 12px; + color : white; + text-decoration: none; + i{ + margin-left : 5px; + } + &.tealLight:hover{ background-color : @tealLight }; + &.teal:hover{ background-color : @teal }; + &.greenLight:hover{ background-color : @greenLight }; + &.green:hover{ background-color : @green }; + &.blueLight:hover{ background-color : @blueLight }; + &.blue:hover{ background-color : @blue }; + &.purpleLight:hover{ background-color : @purpleLight }; + &.purple:hover{ background-color : @purple }; + &.steelLight:hover{ background-color : @steelLight }; + &.steel:hover{ background-color : @steel }; + &.yellowLight:hover{ background-color : @yellowLight }; + &.yellow:hover{ background-color : @yellow }; + &.orangeLight:hover{ background-color : @orangeLight }; + &.orange:hover{ background-color : @orange }; + &.redLight:hover{ background-color : @redLight }; + &.red:hover{ background-color : @red }; + &.silverLight:hover{ background-color : @silverLight }; + &.silver:hover{ background-color : @silver }; + &.greyLight:hover{ background-color : @greyLight }; + &.grey:hover{ background-color : @grey }; + } + + .navSection + .navSection .navItem{ + border-left : 1px solid #666; + } +} \ No newline at end of file