Skip to content

updated some of the design / architecture / styling #3

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

Merged
merged 8 commits into from
Jul 6, 2016

Conversation

I3rendan
Copy link
Contributor

@I3rendan I3rendan commented Jun 7, 2016

No description provided.

@pfgray
Copy link
Contributor

pfgray commented Jun 29, 2016

All of the random .DS_Store files have to be removed

@@ -10,16 +10,69 @@ html, body {
height: 100%;
width: 100%;
font-family: sans-serif;
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like you accidentally committed a diff

<div class="transcript-body">
<program ng-repeat="program in transcript.programs" program="program"> </program>
Copy link
Contributor

Choose a reason for hiding this comment

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

took out the program?

@I3rendan I3rendan merged commit 8e6ce67 into master Jul 6, 2016
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.

2 participants