Skip to content

Commit

Permalink
Styles and small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
oskarrough committed Jun 1, 2014
1 parent 66c4e26 commit 938fda8
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
13 changes: 10 additions & 3 deletions ember/app/styles/base/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ html {
// -webkit-font-smoothing: antialiased;
}
strong {
@extend %patron-bold;
@extend %patron-medium;
}
em {
@extend %patron-italic;
Expand Down Expand Up @@ -69,7 +69,8 @@ input,
table,
address,
textarea,
form {
form,
hr {
margin: 0 0 1rem;
}

Expand All @@ -83,5 +84,11 @@ embed {
}

.Manchet {
font-size: 22px;
font-size: 20px;
}
.Article-body {
p {
font-size: 18px;
}
}

2 changes: 1 addition & 1 deletion ember/app/styles/base/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ button {

.Btn--large {
font-size: 19px;
padding: em(11) em(10) em(8);
padding: em(11) 1.5rem em(8);
}

.Btn--danger {
Expand Down
14 changes: 7 additions & 7 deletions ember/app/templates/about.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<article class="Article">
<h1>About Muchplay</h1>
<p class="Manchet">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
<p>{{#link-to 'application'}}Back to home{{/link-to}}</p>
<div class="Article-body">
<p><strong>Muchplay offers you a way to collect the tracks and sounds you want from YouTube and Soundcloud with a streamlined online music manager.</strong></p>
<p>With all your favorites in one single list it's a great way to share and play all the music you enjoy.</p>
<hr>
<p>Development begun in March 2014 and this was last updated the 1st of June 2014. If you'd like to get in touch, please do so at <a href="mailto:oskar@rough.dk">oskar@rough.dk</a>.</p>
<p>{{#link-to 'application'}}Back to home{{/link-to}}</p>
</div>
</article>
6 changes: 0 additions & 6 deletions ember/app/templates/playlist/index.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
{{#if tracks}}
<h2>Tracks</h2>
{{else}}
<h2>No tracks yet.</h2>
{{/if}}

{{render 'tracks' tracks}}

0 comments on commit 938fda8

Please sign in to comment.