diff --git a/app/assets/images/buttons/add_post.jpg b/app/assets/images/buttons/add_post.jpg new file mode 100644 index 000000000..8152e7fb2 Binary files /dev/null and b/app/assets/images/buttons/add_post.jpg differ diff --git a/app/assets/images/buttons/edit_canvas.png b/app/assets/images/buttons/edit_canvas.png new file mode 100644 index 000000000..c57abddba Binary files /dev/null and b/app/assets/images/buttons/edit_canvas.png differ diff --git a/app/assets/javascripts/app/views/profile_info_view.js b/app/assets/javascripts/app/views/profile_info_view.js index f94f6d223..8589aa6d8 100644 --- a/app/assets/javascripts/app/views/profile_info_view.js +++ b/app/assets/javascripts/app/views/profile_info_view.js @@ -2,6 +2,7 @@ app.views.ProfileInfo = app.views.Base.extend({ templateName : "profile-info", initialize : function(){ + console.log(this.model) this.model.bind("change", this.render, this) //this should go on profile info view when it gets Extracted } }) \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index 38f7d07bd..919bc9090 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -38,10 +38,6 @@ body { background-image : image_url('pattern.jpg') } -#canvas { - margin-top : 100px; -} - .canvas-frame { float : left; margin : 10px; @@ -182,7 +178,7 @@ body { line-height : 1.1em; text-align : center; } - } + } } diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss index f814d0c30..264f61528 100644 --- a/app/assets/stylesheets/new_styles/_profile.scss +++ b/app/assets/stylesheets/new_styles/_profile.scss @@ -33,4 +33,41 @@ .canvas-frame .fav { @include opacity(1) } +} + +#profile-header { + text-align : center; + padding : 50px; +} + +.profile-image-container { + border-radius: 140px; + border : 3px solid #fff; + box-shadow : 0 0 2px rgba(0,0,0,0.5), 0 0 10px rgba(0,0,0,0.6), inset 0 0 15px rgba(0,0,0,0.5), inset 0 -2px 4px rgba(255,255,255,0.3); + + height : 140px; + width : 140px; + background-position : center; + + display : inline-block; +} + +#profile-controls { + text-align : right; + padding : 10px 18px; + + .control { + @include transition(opacity); + @include opacity(0.4); + + &:hover { + @include opacity(1); + text-decoration : none; + } + + &:active { + @include opacity(0.8); + } + } + } \ No newline at end of file diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs index ef9608aa9..3e6a3fae7 100644 --- a/app/assets/templates/profile-info.jst.hbs +++ b/app/assets/templates/profile-info.jst.hbs @@ -1,7 +1,13 @@ -

{{full_name}}

-
-
Location:
{{location}}
-
Bio:
{{bio}}
-
Birthday:
{{birthday}}
-
Gender:
{{gender}}
-
\ No newline at end of file +
+
+

+ {{full_name}} +

+
+ + + + + + + \ No newline at end of file diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs index 0fc16c895..ea123f4ba 100644 --- a/app/assets/templates/profile.jst.hbs +++ b/app/assets/templates/profile.jst.hbs @@ -4,8 +4,14 @@
-COMPOSE | -EDIT +
+ + + + + + +