diff --git a/app/assets/images/buttons/bday.png b/app/assets/images/buttons/bday.png
deleted file mode 100644
index f0ff81e73237c3ea0f6a999e4f12485dc5223e7d..0000000000000000000000000000000000000000
Binary files a/app/assets/images/buttons/bday.png and /dev/null differ
diff --git a/app/assets/images/buttons/bday@2x.png b/app/assets/images/buttons/bday@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..18a0a2ca1ef0b69ee535b6d6b477dc139be84591
Binary files /dev/null and b/app/assets/images/buttons/bday@2x.png differ
diff --git a/app/assets/images/buttons/edit@2x.png b/app/assets/images/buttons/edit@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..96b91998a4f958088c4dc4280cde06e622c7f7fe
Binary files /dev/null and b/app/assets/images/buttons/edit@2x.png differ
diff --git a/app/assets/images/buttons/editgear.png b/app/assets/images/buttons/editgear.png
deleted file mode 100644
index d9aebbae0251e7c5d791a5b278450c31118a90b3..0000000000000000000000000000000000000000
Binary files a/app/assets/images/buttons/editgear.png and /dev/null differ
diff --git a/app/assets/images/buttons/pub.png b/app/assets/images/buttons/pub.png
deleted file mode 100644
index 671069ebcff4865e322a544565f1aee6f87e0571..0000000000000000000000000000000000000000
Binary files a/app/assets/images/buttons/pub.png and /dev/null differ
diff --git a/app/assets/images/buttons/pub@2x.png b/app/assets/images/buttons/pub@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..004eff66b7abc38f4712d7e04099fa052561e2bf
Binary files /dev/null and b/app/assets/images/buttons/pub@2x.png differ
diff --git a/app/assets/images/buttons/service-icons/fb.png b/app/assets/images/buttons/service-icons/fb.png
deleted file mode 100644
index 18707046d832605dc26fa62e711a9f2cc4cb44f1..0000000000000000000000000000000000000000
Binary files a/app/assets/images/buttons/service-icons/fb.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/fb@2x.png b/app/assets/images/buttons/service-icons/fb@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd582a21ee7e96116784d0ade5cbcff206d4c6b0
Binary files /dev/null and b/app/assets/images/buttons/service-icons/fb@2x.png differ
diff --git a/app/assets/images/buttons/service-icons/tumblr.png b/app/assets/images/buttons/service-icons/tumblr.png
deleted file mode 100644
index b7bf5a3067cda21c3cd59cad1ed2ee8983938ece..0000000000000000000000000000000000000000
Binary files a/app/assets/images/buttons/service-icons/tumblr.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/tumblr@2x.png b/app/assets/images/buttons/service-icons/tumblr@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..727615c46d697ac37a73d730922b7a7a63e6dfb7
Binary files /dev/null and b/app/assets/images/buttons/service-icons/tumblr@2x.png differ
diff --git a/app/assets/images/buttons/service-icons/twitter.png b/app/assets/images/buttons/service-icons/twitter.png
deleted file mode 100644
index d826709552f9966d5d3c4395aa82da78271c7f81..0000000000000000000000000000000000000000
Binary files a/app/assets/images/buttons/service-icons/twitter.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/twitter@2x.png b/app/assets/images/buttons/service-icons/twitter@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0109656544accadbd08acec7a282579bc17f94a
Binary files /dev/null and b/app/assets/images/buttons/service-icons/twitter@2x.png differ
diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss
index e1fe26f613e724f942b076a7448f6f92e0ab1193..1100860dc587e2a9077b83a40c2f004599b61958 100644
--- a/app/assets/stylesheets/new_styles/_profile.scss
+++ b/app/assets/stylesheets/new_styles/_profile.scss
@@ -65,6 +65,11 @@
@include transition(opacity);
@include opacity(0.4);
+ &.small img {
+ height : 40px;
+ width : 40px;
+ }
+
&:hover {
@include opacity(1);
text-decoration : none;
@@ -126,6 +131,9 @@
.cake {
@include opacity(0.63);
+ width : 11px;
+ height : 15px;
+
margin-right : 2px;
position : relative;
top : -3px;
diff --git a/app/assets/stylesheets/new_styles/_typography.scss b/app/assets/stylesheets/new_styles/_typography.scss
index b79b2f3035c83531fdec31969ee23e953cbf780e..19e568b1ac31782e6f302dc4ba86ee171e24a250 100644
--- a/app/assets/stylesheets/new_styles/_typography.scss
+++ b/app/assets/stylesheets/new_styles/_typography.scss
@@ -1,16 +1,19 @@
/* Roboto */
@font-face {
font-family : Roboto;
- src : image-url('fonts/Roboto-Regular.ttf')
+ src : image-url('fonts/Roboto-Regular.ttf');
+ weight : normal;
}
@font-face {
font-family : Roboto-Bold;
- src : image-url('fonts/Roboto-Bold.ttf')
+ src : image-url('fonts/Roboto-Bold.ttf');
+ weight : normal;
}
body, p, h1, h2, h3, h4, h5, h6, textarea, input, * {
- font-family : Roboto, Helvetica, sans;
+ font-family : Roboto, Helvetica, sans-serif;
+ font-weight : normal;
}
a {
diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs
index 878506689eb3c4e1feef94061a4cb1c7c587545f..a293aeecc9aeb5044fb3331cf45c3b16ada728a7 100644
--- a/app/assets/templates/profile-info.jst.hbs
+++ b/app/assets/templates/profile-info.jst.hbs
@@ -15,10 +15,9 @@
<span class="divider">•</span>
{{/if}}
-
{{#if birthday}}
<span class="stat">
- <img src='{{imageUrl "buttons/bday.png"}}' class="cake" />
+ <img src='{{imageUrl "buttons/bday@2x.png"}}' class="cake" />
{{birthday}}
</span>
<span class="divider">•</span>
@@ -26,17 +25,16 @@
<span class="stat services">
<a href="https://facebook.com" class="service" target="_blank">
- <img src='{{imageUrl "buttons/service-icons/fb.png"}}' />
+ <img src='{{imageUrl "buttons/service-icons/fb@2x.png"}}' />
</a>
<a href="https://twitter.com" class="service" target="_blank">
- <img src='{{imageUrl "buttons/service-icons/twitter.png"}}' />
+ <img src='{{imageUrl "buttons/service-icons/twitter@2x.png"}}' />
</a>
<a href="https://tumblr.com" class="service" target="_blank">
- <img src='{{imageUrl "buttons/service-icons/tumblr.png"}}' />
+ <img src='{{imageUrl "buttons/service-icons/tumblr@2x.png"}}' />
</a>
</span>
</div>
-
</div>
<!--<dl>-->
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs
index 01a75cd97d586c7c2c53fbed180ed7de504e6330..28c1f353ea5175d878d3d0f2efec91f86de96efe 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -19,11 +19,11 @@
<section id="profile-controls">
{{#if isOwnProfile}}
- <a href="#composer" title="New Post" class="control" rel="facebox">
- <img src='{{imageUrl "buttons/pub.png"}}' />
+ <a href="#composer" title="New Post" class="control small" rel="facebox">
+ <img src='{{imageUrl "buttons/pub@2x.png"}}' />
</a>
- <a href="#" title="Edit Layout" id="edit-mode-toggle" class="control">
- <img src='{{imageUrl "buttons/editgear.png"}}' />
+ <a href="#" title="Edit Layout" id="edit-mode-toggle" class="control small">
+ <img src='{{imageUrl "buttons/edit@2x.png"}}' />
</a>
{{else}}
<a href="#" class="control">
diff --git a/public/404.html b/public/404.html
index 5e5e5f4b0e9bd43a5a86d45881ee43bad792ce28..7f831bafa0dc53c60d32ca47dd0c744fa9926857 100644
--- a/public/404.html
+++ b/public/404.html
@@ -8,13 +8,13 @@
body,
html {
- height: 100%;
+ overflow-y : hidden;
}
body {
margin-bottom: 0;
padding-bottom: 0;
- margin-top: 10%;
+ margin-top: 5%;
background-color: #fff;
color: #666;
text-align: center;