diff --git a/app/assets/images/buttons/bday@2x-white.png b/app/assets/images/buttons/bday@2x-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab5940c2531a4bbb62b6d14a6afe3654fa059fee
Binary files /dev/null and b/app/assets/images/buttons/bday@2x-white.png differ
diff --git a/app/assets/images/buttons/service-icons/fb@2x-white.png b/app/assets/images/buttons/service-icons/fb@2x-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fb0b930c328d04e0222bd8d7c072138f1157adb
Binary files /dev/null and b/app/assets/images/buttons/service-icons/fb@2x-white.png differ
diff --git a/app/assets/images/buttons/service-icons/tumblr@2x-white.png b/app/assets/images/buttons/service-icons/tumblr@2x-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..48ce0dc3cd754d38272add342650d74b9938f23c
Binary files /dev/null and b/app/assets/images/buttons/service-icons/tumblr@2x-white.png differ
diff --git a/app/assets/images/buttons/service-icons/twitter@2x-white.png b/app/assets/images/buttons/service-icons/twitter@2x-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b6aec6a032644829d311efac9a6f6b4235af270
Binary files /dev/null and b/app/assets/images/buttons/service-icons/twitter@2x-white.png differ
diff --git a/app/assets/javascripts/app/pages/profile.js b/app/assets/javascripts/app/pages/profile.js
index 1915d7dc2e17de8ba1d89c9b8c434c770dde5acf..8490a2c703bb1b618209fee980c66d0bcbb628f5 100644
--- a/app/assets/javascripts/app/pages/profile.js
+++ b/app/assets/javascripts/app/pages/profile.js
@@ -2,7 +2,8 @@
//= require ../views/profile_info_view
app.pages.Profile = app.views.Base.extend({
- className : "container",
+
+ id : "profile",
templateName : "profile",
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index db268f266de11ef0dc755fdb686847118e9556f3..4bc38b4060958d9e20258f0d3a16b5e9e280b5fc 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -1,3 +1,7 @@
+body {
+ background-image : image_url("pattern.png");
+}
+
/* new link color */
a { color : rgb(42,156,235) }
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index fc8455bec5bdb389bc376f66ed895e726b7e5b23..49f4973d22239cccefd802d30b903b1838159e4c 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -1,15 +1,9 @@
-
@mixin wide() {
width : $two-column-width + px;
min-width : $two-column-width + px;
max-width : $two-column-width + px;
}
-body {
- background-color : #F6F6F6;
- background-image : image_url('pattern.png')
-}
-
.canvas-frame {
float : left;
margin : 10px;
@@ -28,7 +22,7 @@ body {
.content {
@include transition(box-shadow);
- @include box-shadow(0,1px,3px,rgba(0,0,0,0.2));
+ @include box-shadow(0,1px,10px,rgba(0,0,0,0.9));
background-image : image_url("paper-texture-1.jpg");
diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss
index de74b9a73244743445c952f29ebbfe78b7aa9cda..d3a440fc50437b4b58a79bdb003f6185a19f5770 100644
--- a/app/assets/stylesheets/new_styles/_profile.scss
+++ b/app/assets/stylesheets/new_styles/_profile.scss
@@ -1,3 +1,25 @@
+#profile {
+ color : #fff;
+ background : {
+ color : #333;
+
+ /* The background-image property will be user-generated and set in `app.pages.Profile` (app/assets/javascripts/app/pages/profile.js)
+ and should ONLY be set once the image is fully loaded.
+
+ Optimal imagemagick manipulation settings for uploaded image (via trial & error):
+
+ `convert -brightness-contrast -40x-50`
+
+ NOTE: I noticed that just turning the brightness down had an adverse affect on contrast,
+ thus the "washing out" at -50 contrast. For more info on this specific command, read the documentation
+ on it here: http://www.imagemagick.org/script/command-line-options.php#brightness-contrast */
+ image : url('/imagetest.jpg');
+
+ size : cover;
+ attachment : fixed;
+ }
+}
+
/* getting started pulse animation */
#composer-button.pulse {
-webkit-animation: opacity-pulse 1s infinite;
diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs
index 5b3aa27b4330613351699013860909921c391848..305bdba7280731431a69296ea1551180a0b0e8e1 100644
--- a/app/assets/templates/profile-info.jst.hbs
+++ b/app/assets/templates/profile-info.jst.hbs
@@ -8,7 +8,7 @@
{{#if location}}
<span class="stat">
<a href="http://maps.google.com/maps?q={{location}}" target="_blank">
- <i class="icon-map-marker"></i>
+ <i class="icon-map-marker icon-white"></i>
</a>
{{location}}
</span>
@@ -17,7 +17,7 @@
{{#if birthday}}
<span class="stat">
- <img src='{{imageUrl "buttons/bday@2x.png"}}' class="cake" />
+ <img src='{{imageUrl "buttons/bday@2x-white.png"}}' class="cake" />
{{birthday}}
</span>
<span class="divider">•</span>
@@ -25,20 +25,20 @@
<span class="stat services">
<a href="https://facebook.com" class="service" target="_blank">
- <img src='{{imageUrl "buttons/service-icons/fb@2x.png"}}' />
+ <img src='{{imageUrl "buttons/service-icons/fb@2x-white.png"}}' />
</a>
<a href="https://twitter.com" class="service" target="_blank">
- <img src='{{imageUrl "buttons/service-icons/twitter@2x.png"}}' />
+ <img src='{{imageUrl "buttons/service-icons/twitter@2x-white.png"}}' />
</a>
<a href="https://tumblr.com" class="service" target="_blank">
- <img src='{{imageUrl "buttons/service-icons/tumblr@2x.png"}}' />
+ <img src='{{imageUrl "buttons/service-icons/tumblr@2x-white.png"}}' />
</a>
</span>
{{#if isOwnProfile}}
<span class="divider">•</span>
<a href="/profile/edit" title="Edit Profile" rel="tooltip" style="margin-left:2px;">
- <i class="icon-cog"></i>
+ <i class="icon-cog icon-white"></i>
</a>
{{/if}}
</div>
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs
index ebc58f3bbd9c1cb11fa0ef1d51af21daa9d0f772..9106abed4ae33330cf28bd425334c9b6df00719b 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -1,60 +1,62 @@
-<div id="top-right-nav">
- {{#if showFollowButton}}
- <a href="#" onClick="alert('Not yet implemented!')" id="follow-button">
- <span class="label label-inverse">
- <i class="icon-plus icon-white"></i>
- <span>
- FOLLOW
+<div class="container">
+ <div id="top-right-nav">
+ {{#if showFollowButton}}
+ <a href="#" onClick="alert('Not yet implemented!')" id="follow-button">
+ <span class="label label-inverse">
+ <i class="icon-plus icon-white"></i>
+ <span>
+ FOLLOW
+ </span>
</span>
- </span>
- </a>
- {{/if}}
+ </a>
+ {{/if}}
- {{#if current_user.guid}}
- <a href="/" id="home-button">
- <span class="label label-inverse">
- <i class="icon-home icon-white"></i>
- <span>
- HOME
+ {{#if current_user.guid}}
+ <a href="/" id="home-button">
+ <span class="label label-inverse">
+ <i class="icon-home icon-white"></i>
+ <span>
+ HOME
+ </span>
</span>
- </span>
- </a>
- {{else}}
- <a href="/" id="home-button">
- <span class="label label-inverse">
- <span>
- DIASPORA
+ </a>
+ {{else}}
+ <a href="/" id="home-button">
+ <span class="label label-inverse">
+ <span>
+ DIASPORA
+ </span>
</span>
- </span>
- </a>
- {{/if}}
+ </a>
+ {{/if}}
- {{#if isOwnProfile}}
- <a href="/users/sign_out" title="Log out" id="logout-button">
- <span class="label label-inverse">
- <i class="icon-off icon-white"></i>
- </span>
- </a>
- {{/if}}
-</div>
+ {{#if isOwnProfile}}
+ <a href="/users/sign_out" title="Log out" id="logout-button">
+ <span class="label label-inverse">
+ <i class="icon-off icon-white"></i>
+ </span>
+ </a>
+ {{/if}}
+ </div>
-<section id="profile-info"/>
+ <section id="profile-info"/>
-<div id="composer" style="display:none;">
- <iframe src="/posts/new" height=500 width=700 style="border:none;"></iframe>
-</div>
+ <div id="composer" style="display:none;">
+ <iframe src="/posts/new" height=500 width=700 style="border:none;"></iframe>
+ </div>
-<section id="profile-controls">
- {{#if isOwnProfile}}
- <a href="#composer" id="composer-button" class="control small" rel="facebox">
- <img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
- </a>
- <a href="#" id="edit-mode-toggle" class="control small">
- <img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
- </a>
- {{/if}}
-</section>
+ <section id="profile-controls">
+ {{#if isOwnProfile}}
+ <a href="#composer" id="composer-button" class="control small" rel="facebox">
+ <img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
+ </a>
+ <a href="#" id="edit-mode-toggle" class="control small">
+ <img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
+ </a>
+ {{/if}}
+ </section>
-<section id="canvas"></section>
+ <section id="canvas"></section>
-<div id="paginate"><span class="loader hidden"/></div>
\ No newline at end of file
+ <div id="paginate"><span class="loader hidden"/></div>
+</div>
diff --git a/public/imagetest-unmodified.jpg b/public/imagetest-unmodified.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..db16d1c052fb958623a28e6a9f3c4924384cd6b0
Binary files /dev/null and b/public/imagetest-unmodified.jpg differ
diff --git a/public/imagetest.jpg b/public/imagetest.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..85df6071e81b18fd09052f64b706b95c399d410c
Binary files /dev/null and b/public/imagetest.jpg differ
diff --git a/public/imagetest2.jpg b/public/imagetest2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f47d1ad518352b0edf8798c598031b988bace2a1
Binary files /dev/null and b/public/imagetest2.jpg differ
diff --git a/public/img/glyphicons-halflings-white.png b/public/img/glyphicons-halflings-white.png
deleted file mode 100644
index a20760bfde58d1c92cee95116059fba03c68d689..0000000000000000000000000000000000000000
Binary files a/public/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/public/img/glyphicons-halflings.png b/public/img/glyphicons-halflings.png
deleted file mode 100644
index 92d4445dfd0af414835467132cf50c7c38a303af..0000000000000000000000000000000000000000
Binary files a/public/img/glyphicons-halflings.png and /dev/null differ