This repository has been archived by the owner on Mar 5, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 91
CLEANER PR for #856 the new homepage implementation #952
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
1b4a025
CLEANER PR for #856 the new homepage implementation, this PR only con…
mmmavis d76a1f0
updated CHANGELOG.md
mmmavis 35fa858
updated CHANGELOG.md to include the new blog section on homepage
mmmavis 5f62156
updated a comment to a css rule so that it's more future-proof
mmmavis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
var React = require('react'); | ||
var Router = require('react-router'); | ||
var Link = Router.Link; | ||
var ImageTag = require('./imagetag.jsx'); | ||
|
||
var LinkSwap = React.createClass({ | ||
render: function() { | ||
var classes = "btn btn-awsm"; | ||
// Swap out Link or a simple anchor depending on the props we have. | ||
if (this.props.linkTo) { | ||
return ( | ||
<Link to={this.props.linkTo} className={classes}> | ||
{this.props.children} | ||
</Link> | ||
) | ||
} | ||
return ( | ||
<a href={this.props.href} className={classes}> | ||
{this.props.children} | ||
</a> | ||
) | ||
} | ||
}); | ||
|
||
var IconButton = React.createClass({ | ||
propTypes: { | ||
linkTo: React.PropTypes.string, | ||
href: React.PropTypes.string, | ||
imgSrc: React.PropTypes.string.isRequired, | ||
imgSrc2X: React.PropTypes.string, | ||
head: React.PropTypes.string.isRequired, | ||
subhead: React.PropTypes.string | ||
}, | ||
render: function() { | ||
return ( | ||
<div className="icon-button"> | ||
<LinkSwap linkTo={this.props.linkTo} href={this.props.href}> | ||
<figure> | ||
<ImageTag className="image" src1x={this.props.imgSrc} src2x={this.props.imgSrc2x} | ||
alt="" height={50} /> | ||
<figcaption> | ||
<p className="link-text">{this.props.head}</p> | ||
</figcaption> | ||
</figure> | ||
</LinkSwap> | ||
</div> | ||
); | ||
} | ||
}); | ||
|
||
module.exports = IconButton; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
var React = require('react'); | ||
|
||
var IconButtons = React.createClass({ | ||
render: function() { | ||
return ( | ||
<div className="row icon-buttons"> | ||
{ | ||
React.Children.map(this.props.children, function(iconButton){ | ||
return( | ||
<div className="col-sm-4 col-md-4 col-lg-4">{iconButton}</div> | ||
) | ||
}) | ||
} | ||
</div> | ||
); | ||
} | ||
}); | ||
|
||
module.exports = IconButtons; |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
.icon-button { | ||
a.btn.btn-awsm { | ||
width: 100%; | ||
color: @blueSidebarColor; | ||
background-color: @paleBlue; | ||
box-shadow: 0px 0.4rem 0px @blueSidebarColor, | ||
0px 0.1rem 0px rgba(255, 255, 255, 0.5) inset; | ||
&:hover { | ||
color: @bodyTextColor; | ||
background-color: @awsmBtnColor; | ||
top: 0; | ||
box-shadow: 0px 0.4rem 0px #C4A74F, | ||
0px 0.1rem 0px rgba(255, 255, 255, 0.5) inset; | ||
img { | ||
filter: grayscale(100%); | ||
} | ||
} | ||
} | ||
.link-text { | ||
font-size: 1.5rem; | ||
font-weight: 700; | ||
line-height: 1.2; | ||
margin: 1rem 0 .8rem 0; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
.icon-buttons { | ||
margin-bottom: 5rem; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ack lol I didn't actually look to make sure your new bullet points were being added to the "Unreleased" section--you added them to the release notes for our last release :) Fixed this in e3ac628
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops, sorry should've been more careful. thanks Atul
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is ok, it was your first time editing the changelog 🍔