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 000000000..ab5940c25 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 000000000..2fb0b930c 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 000000000..48ce0dc3c 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 000000000..7b6aec6a0 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 1915d7dc2..8490a2c70 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 db268f266..4bc38b406 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 fc8455bec..49f4973d2 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 de74b9a73..d3a440fc5 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 5b3aa27b4..305bdba72 100644 --- a/app/assets/templates/profile-info.jst.hbs +++ b/app/assets/templates/profile-info.jst.hbs @@ -8,7 +8,7 @@ {{#if location}} - + {{location}} @@ -17,7 +17,7 @@ {{#if birthday}} - + {{birthday}} • @@ -25,20 +25,20 @@ - + - + - + {{#if isOwnProfile}} • - + {{/if}} diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs index ebc58f3bb..9106abed4 100644 --- a/app/assets/templates/profile.jst.hbs +++ b/app/assets/templates/profile.jst.hbs @@ -1,60 +1,62 @@ -
- {{#if showFollowButton}} - - - - - FOLLOW +
+
+ {{#if showFollowButton}} + + + + + FOLLOW + - - - {{/if}} + + {{/if}} - {{#if current_user.guid}} - - - - - HOME + {{#if current_user.guid}} + + + + + HOME + - - - {{else}} - - - - DIASPORA + + {{else}} + + + + DIASPORA + - - - {{/if}} + + {{/if}} - {{#if isOwnProfile}} - - - - - - {{/if}} + {{#if isOwnProfile}} + + + + + + {{/if}} +
+ +
+ + + +
+ {{#if isOwnProfile}} + + + + + + + {{/if}} +
+ +
+ +
- -
- - - -
- {{#if isOwnProfile}} - - - - - - - {{/if}} -
- -
- -
\ No newline at end of file diff --git a/public/imagetest-unmodified.jpg b/public/imagetest-unmodified.jpg new file mode 100644 index 000000000..db16d1c05 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 000000000..85df6071e 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 000000000..f47d1ad51 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 a20760bfd..000000000 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 92d4445df..000000000 Binary files a/public/img/glyphicons-halflings.png and /dev/null differ