Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SISRP-6547 - Campus Solutions splash page #1

Merged
merged 6 commits into from
Sep 16, 2015

Conversation

winstonkim
Copy link
Contributor

insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@winstonkim can we add an end of line here?

@christianvuerings
Copy link
Contributor

@winstonkim could you ping when when you've made the update?

@winstonkim
Copy link
Contributor Author

@ChristianV made the update! even cleaned the svg up, but travis doesnt seem to be running?

</div>
<div class="section section-1">
<div class="container">
<div class="square-container">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@winstonkim indentation still looks a bit off, can you make sure we use the 2 spaces everywhere?

@christianvuerings
Copy link
Contributor

@winstonkim one last comment and interesting thing about travis, can't seem to make it work even though it's enabled.

@christianvuerings
Copy link
Contributor

@winstonkim travis fix should have been applied in #6 - Can you rebase (we now have a merge conflict) and leave your travis.yml changes out?

FYI - travis-ci/travis-core#137

@christianvuerings
Copy link
Contributor

@winstonkim looks like gulp is working now but the build is failing:

No output has been received in the last 10 minutes, this potentially indicates a stalled build or something wrong with the build itself.

Can you have another look?

@winstonkim winstonkim force-pushed the gh-pages branch 5 times, most recently from 8cca2cc to 04907ac Compare September 15, 2015 06:46
@winstonkim
Copy link
Contributor Author

@ChristianV got it to pass!

gulp.task('default', ['sass', 'watch', 'inlinesource']);

// Test Task
gulp.task('test', ['sass', 'watch', 'inlinesource', 'exit']);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@winstonkim could you remove the watch from this task? Also, aren't those tasks run asynchronously?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChristianV made the changes, let me know if there are any other problems!

christianvuerings added a commit that referenced this pull request Sep 16, 2015
SISRP-6547 - Campus Solutions splash page
@christianvuerings christianvuerings merged commit f2ce05d into ucberkeley:gh-pages Sep 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants