Skip to content
This repository has been archived by the owner on Aug 10, 2018. It is now read-only.

Commit

Permalink
Mooar work
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher De Cairos committed Jan 23, 2015
1 parent 74472e2 commit 735d07a
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 69 deletions.
11 changes: 11 additions & 0 deletions firehose/components/MakePreview.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var React = require("react");

var MakePreview = React.createClass({
render: function() {
return (
<iframe src="https://chrisdecairos.ca" className="make-preview"></iframe>
);
}
});

module.exports = MakePreview;
20 changes: 8 additions & 12 deletions firehose/components/header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,22 @@ var ViewToggle = require("./ViewToggle.jsx");
var Header = React.createClass({
getInitialState: function() {
return {
loggedIn: this.props.loggedIn,
loggedIn: false,
isAdmin: false,
viewState: this.props.viewState
};
},
handleLoggedIn: function(user) {
this.setState({
loggedIn: true
loggedIn: true,
isAdmin: user.isAdmin
});
this.props.onLoggedIn(user);
},
handleLoggedOut: function() {
this.setState({
loggedIn: false
loggedIn: false,
isAdmin: false
});
this.props.onLoggedOut();
},
Expand All @@ -31,24 +34,17 @@ var Header = React.createClass({
render: function() {
var toggle;

if ( this.state.loggedIn ) {
if ( this.state.loggedIn && this.state.isAdmin ) {
toggle = <ViewToggle
onToggle={this.onToggle}
viewState={this.state.viewState} />;
} else {
toggle = "";
}

var navbarClasses = "navbar navbar-inverse navbar-fixed-top ";

if (this.props.viewState === "one-up") {
navbarClasses += "one-up-enabled";
} else {
navbarClasses += "grid-enabled";
}

return (
<div className={navbarClasses}>
<div className="navbar navbar-inverse navbar-fixed-top">
<div className="container">
<div className="navbar-header">
<div className="navbar-brand">
Expand Down
2 changes: 1 addition & 1 deletion firehose/components/shared/FeatureMake.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var FeatureMake = React.createClass({
this.props.onClick();
},
render: function() {
var featureClass = "make-feature-toggle fa fa-4 ";
var featureClass = "feature-toggle fa ";

if ( this.state.featured ) {
featureClass += "fa-star";
Expand Down
2 changes: 1 addition & 1 deletion firehose/components/shared/Navigate.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var Navigate = React.createClass({
this.props.onNavigate(this.state.delta);
},
render: function() {
var navigationClass = "firehose-make-nav fa fa-4 ";
var navigationClass = "make-nav fa ";

if ( this.state.delta > 0 ) {
navigationClass += "fa-arrow-right";
Expand Down
2 changes: 1 addition & 1 deletion firehose/components/shared/Trash.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var React = require("react");
var Trash = React.createClass({
render: function() {
return (
<i className="firehose-trash-make fa fa-trash fa-4" on></i>
<i className="firehose-trash-make fa fa-trash-o"></i>
);
}
});
Expand Down
6 changes: 3 additions & 3 deletions firehose/components/views/MakeDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ var MakeDetails = React.createClass({
},
render: function() {
return (
<div>
<div>AVATAR</div>
<div className="firehose-make-details">
<div className="details-avatar">AVATAR</div>
<div>
<span>TITLE</span>
<span>AuthorLink</span>
</div>
<div>
<div className="firehose-one-up-controls">
<Trash />
<FeatureMake />
<Navigation onNavigate={this.onNavigate} delta="-1"/>
Expand Down
52 changes: 28 additions & 24 deletions firehose/less/firehose.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,23 @@
background: white;
}

.navbar.one-up-enabled,
.one-up-enabled {
.navbar {
color: @firehose-white;
background: @firehose-light-blue;
}
.navbar.grid-enabled,
.grid-enabled {
color: @firehose-light-blue;
background: @firehose-white;
}

.one-up-enabled .firehose-slider {
.firehose-slider {
background-color: @firehose-white;
}
.grid-enabled .firehose-slider {
background-color: @firehose-light-blue;
}

.one-up-enabled .navbar-brand {
.navbar-brand {
background: @firehose-light-blue;
color: @firehose-white;
&:hover {
background: @firehose-light-blue !important;
color: @firehose-white !important;
}
}
.grid-enabled .navbar-brand {
background: @firehose-white;
color: @firehose-light-blue;
&:hover {
background-color: @firehose-white !important;
color: @firehose-light-blue !important;
}
}

.nav {
li {
Expand All @@ -71,14 +54,12 @@
cursor: pointer;
&.left {
.firehose-slider {
float: left;
margin-left: 2px;
right: 72px;
}
}
&.right {
.firehose-slider {
float: right;
margin-right: 2px;
right: 27px;
}
}
.firehose-toggle-icon {
Expand All @@ -98,9 +79,32 @@
border-radius: 35px;
}
.firehose-slider {
position: absolute;
height: 20px;
width: 20px;
margin-top: 2px;
border-radius: 15px;
transition: right .25s ease-out;
}
}

.firehose-make-details {
width: 100%;
height: 70px;

.details-avatar {
float: left;
height: 70px;
width: 70px;
}

.details-controls {
float: rightl
}

.trash-make,
.feature-toggle,
.make-nav {
font-weight: bold;
}
}
2 changes: 1 addition & 1 deletion firehose/public/javascript/firehose-app.js

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions firehose/public/stylesheets/firehose.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 735d07a

Please sign in to comment.