Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
Preen a bunch of stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
chadwhitacre committed Aug 27, 2015
1 parent 690f802 commit 14a4f97
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 63 deletions.
6 changes: 5 additions & 1 deletion scss/components/cta.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.your-payment .amount {
/* Match content h1 */
font: bold 28px/37px $Ideal;
font: bold 28px/40px $Ideal;
}
.per-week {
margin-bottom: 10px;
Expand All @@ -27,6 +27,10 @@
background: $white;
color: $brown;
margin-bottom: 3px;
padding-left: 8px;
max-width: 128px;
overflow: hidden;
text-overflow: ellipsis;
&.edit, &.join, &.save {
background: $gold;
}
Expand Down
24 changes: 6 additions & 18 deletions scss/components/sign_in.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,12 @@
li {
margin: 0;
list-style: none;
&.facebook button {
@include has-icon("facebook");
}
&.google button {
@include has-icon("google");
}
&.twitter button {
@include has-icon("twitter");
}
&.github button {
@include has-icon("github");
}
&.bitbucket button {
@include has-icon("bitbucket");
}
&.openstreetmap button {
@include has-icon("openstreetmap");
}
&.facebook button { @include has-icon("facebook"); }
&.google button { @include has-icon("google"); }
&.twitter button { @include has-icon("twitter"); }
&.github button { @include has-icon("github"); }
&.bitbucket button { @include has-icon("bitbucket"); }
&.openstreetmap button { @include has-icon("openstreetmap"); }
&:hover button {
background: $darker-green;
}
Expand Down
17 changes: 12 additions & 5 deletions scss/layouts/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,20 @@ body {
position: relative;

h1 {
font: bold 64px/64px $Ideal;
font: bold 64px/80px $Ideal;
color: $white;
position: absolute;
bottom: 4px;
right: 16px;
text-align: right;
}
}

#main {
display: table;
height: 100%;
table-layout: fixed;
width: 100%;
padding-top: 40px;
padding: 40px 0;
}

#sidebar {
Expand Down Expand Up @@ -155,9 +155,8 @@ body {
}

#footer {
background: transparentize($white, 0.1);
border-top: 1px solid $brown;
padding: 10px 40px;
padding: 10px 0;
text-align: right;
font-size: 13px;
line-height: 13px;
Expand All @@ -171,6 +170,14 @@ body {
display: inline-block;
margin: 0 0.3em;
padding: 0.25em 0.5em;

.icon {
font: normal 20px/20px 'icomoon';
}

&:hover {
color: $black;
}
}

&:first-child:before {
Expand Down
21 changes: 8 additions & 13 deletions scss/mixins/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,14 @@
text-transform: none;
-webkit-font-smoothing: antialiased;

@if $name == "facebook" {
content: "\e000";
} @else if $name == "twitter" {
content: "\e001";
} @else if $name == "google" {
content: "\e002";
} @else if $name == "github" {
content: "\e003";
} @else if $name == "openstreetmap" {
content: "\e004";
} @else if $name == "bitbucket" {
content: "\e005";
}
@if $name == "facebook" { content: "\e000"; }
@else if $name == "twitter" { content: "\e001"; }
@else if $name == "google" { content: "\e002"; }
@else if $name == "github" { content: "\e003"; }
@else if $name == "openstreetmap" { content: "\e004"; }
@else if $name == "bitbucket" { content: "\e005"; }
@else if $name == "medium" { content: "\e006"; }
@else if $name == "email" { content: "\e007"; }
}

@mixin has-icon($name: "", $font-size: 16px, $margin-right: 4px) {
Expand Down
32 changes: 22 additions & 10 deletions templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h1><a href="/"><img src="{{ website.asset('gratipay.svg') }}"
<li>
<a id="sign-out" href="/sign-out.html">
<span class="icon">&#xe600;</span>
<span class="screen-reader-text">Sign out</span>
<span class="screen-reader-text">{{ _("Sign out") }}</span>
</a>
</li>
</ul>
Expand All @@ -80,15 +80,27 @@ <h1><a href="/"><img src="{{ website.asset('gratipay.svg') }}"

<div id="footer">
<ul>
<li><a href="/about/">{{ _("About") }}</a></li>
<li><a href="/about/contact">{{ _("Contact Us") }}</a></li>
<li><a href="/about/terms/">{{ _("Terms") }}</a></li>
<li><a href="http://inside.gratipay.com/appendices/colophon">{{ _("Colophon") }}</a></li>
<li><a href="https://medium.com/gratipay-blog">{{ _("Blog") }}</a></li>
<li><a href="https://twitter.com/gratipay">Twitter</a></li>
<li><a href="https://github.com/gratipay/gratipay.com">GitHub</a></li>
<li><a href="https://plus.google.com/+Gratipay/posts">Google Plus</a></li>
<li><a href="https://www.facebook.com/Gratipay">Facebook</a></li>
<li>
<a href="https://medium.com/gratipay-blog"
title="our blog on Medium">
<span class="icon">&#xe006;</span>
<span class="screen-reader-text">{{ _("Blog") }}</span>
</a>
</li>
<li>
<a href="https://github.com/gratipay/gratipay.com/issues/new"
title="public feedback on GitHub">
<span class="icon">&#xe003;</span>
<span class="screen-reader-text">{{ _("GitHub") }}</span>
</a>
</li>
<li>
<a href="mailto:[email protected]"
title="private feedback via email">
<span class="icon">&#xe007;</span>
<span class="screen-reader-text">{{ _("Email") }}</span>
</a>
</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/your-payment.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>{{ _('You Give') }}</h2>
</button>
</div>
<form class="edit" action="/{{ team.slug }}/payment-instruction.json">
$
<span class="amount">$</span>
<input type="text" name="amount" class="amount"
value="{{ format_decimal(payment_instruction.amount) }}"
min="0" max="1000">
Expand Down
Binary file modified www/assets/fonts/icomoon.eot
Binary file not shown.
Loading

0 comments on commit 14a4f97

Please sign in to comment.