From b2bcdc00cc0a8f64426af3f01fb454cc09874d80 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Tue, 19 Jan 2016 19:11:48 +0000 Subject: [PATCH] Small restyle. Removed material bootstrap --- package.json | 1 - static/src/js/components/index/project-image.js | 15 +++++++-------- static/src/js/components/navbar/navbar.js | 2 +- static/src/js/events.js | 2 +- static/src/less/homepage.less | 3 ++- static/src/less/navbar.less | 4 ++++ static/src/less/style.less | 3 +-- static/src/less/variables.less | 2 +- templates/base.html | 2 +- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 5cf71cb..256291e 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "dependencies": { "animate.css": "=3.4.0", "bootstrap": "=3.3.5", - "bootstrap-material-design": "=0.5.7", "ionicons": "=2.0.1", "jquery": "=2.1.4", "react": "=0.13.3", diff --git a/static/src/js/components/index/project-image.js b/static/src/js/components/index/project-image.js index 60a24f0..14459c7 100644 --- a/static/src/js/components/index/project-image.js +++ b/static/src/js/components/index/project-image.js @@ -12,15 +12,14 @@ export default class ProjectImage extends React.Component { } componentDidMount() { if (this.props.data.link.startsWith('#')) { - return; + this.setState({url: this.props.data.link}) + } else { + Reverser(this.props.data.link) + .then(function (url) { + this.setState({ url }); + }.bind(this)) + .catch(console.log); } - Reverser(this.props.data.link) - .then(function (url) { - this.setState({ url }); - }.bind(this)) - .catch(function (error) { - console.log('Got this error:', error); - }); } render() { diff --git a/static/src/js/components/navbar/navbar.js b/static/src/js/components/navbar/navbar.js index f083c87..4bb9214 100644 --- a/static/src/js/components/navbar/navbar.js +++ b/static/src/js/components/navbar/navbar.js @@ -8,7 +8,7 @@ export default class NavBar extends React.Component { return (