Skip to content

Commit

Permalink
Add a link to github
Browse files Browse the repository at this point in the history
  • Loading branch information
zoeesilcock committed May 14, 2015
1 parent 2c203f8 commit 28d57d8
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ bower_components/*
tmp/app.js
tmp/main.css
tmp/main.css.map
tmp/images

public/app.js
public/app.min.js
public/main.css
public/main.css.map
public/images
22 changes: 20 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@ module.exports = function(grunt) {
}
}
},
// Images
copy: {
dev: {
expand: true,
cwd: 'images',
src: '**/*',
dest: 'tmp/images'
},
dist: {
expand: true,
cwd: 'images',
src: '**/*',
dest: 'public/images'
}
},
// Sass
sass: {
dev: {
Expand Down Expand Up @@ -41,8 +56,8 @@ module.exports = function(grunt) {
// Watch
watch: {
app: {
files: ['src/**/*.js', 'src/**/*.scss'],
tasks: ['browserify:dev', 'sass:dev']
files: ['src/**/*.js', 'src/**/*.scss', 'images/**/*'],
tasks: ['browserify:dev', 'sass:dev', 'copy:dev']
},
options: {
livereload: true,
Expand Down Expand Up @@ -79,6 +94,7 @@ module.exports = function(grunt) {
grunt.task.run([
'connect:livereload',
'sass:dev',
'copy:dev',
'browserify:dev',
'open',
'watch:app'
Expand All @@ -88,6 +104,7 @@ module.exports = function(grunt) {
grunt.registerTask('dist', function(target) {
grunt.task.run([
'sass:dist',
'copy:dist',
'browserify:dist',
'uglify'
]);
Expand All @@ -98,6 +115,7 @@ module.exports = function(grunt) {

grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-open');
grunt.loadNpmTasks('grunt-notify');
Expand Down
Binary file added images/github_mark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const App = React.createClass({
<Timer msLeft={this.state.timer.msLeft} state={this.state.timer.state} />
<Interval minutes={this.state.timer.minutes} state={this.state.timer.state} />
<People people={this.state.people} currentDriverIndex={this.state.currentDriverIndex} />
<a href="https://github.com/zoeesilcock/mobtimer-react" target="blank" className="github"><img src="images/github_mark.png" />github</a>
</div>
);
}
Expand Down
13 changes: 13 additions & 0 deletions src/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,18 @@ input {
font-size: 16px;
}

.github {
color: $darker;
font-size: 12px;
float: right;
padding: 10px;

img {
width: 16px;
vertical-align: middle;
padding-right: 5px;
}
}

@import "timer";
@import "people";

0 comments on commit 28d57d8

Please sign in to comment.