diff --git a/public/images/hatched-bg-dark.png b/public/images/hatched-bg-dark.png new file mode 100644 index 000000000..1ab8861c9 Binary files /dev/null and b/public/images/hatched-bg-dark.png differ diff --git a/public/javascripts/app/templates/post-viewer.handlebars b/public/javascripts/app/templates/post-viewer.handlebars index 6270d8f8c..6182ec7c4 100644 --- a/public/javascripts/app/templates/post-viewer.handlebars +++ b/public/javascripts/app/templates/post-viewer.handlebars @@ -5,7 +5,7 @@
- +
@@ -23,7 +23,45 @@
-
-
+ +
+
+ + +
+ diff --git a/public/javascripts/app/views/post_feedback_view.js b/public/javascripts/app/views/post_feedback_view.js index 9c564e01a..e3ed6ac5d 100644 --- a/public/javascripts/app/views/post_feedback_view.js +++ b/public/javascripts/app/views/post_feedback_view.js @@ -14,9 +14,9 @@ app.views.PostViewerFeedback = app.views.Feedback.extend({ tooltipSelector : ".label", - comment : function(){ - console.log(this.model) + comment : function(evt){ + if(evt) { evt.preventDefault() } + $("#post-interactions").slideToggle() } }) - diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss index 64732ab62..14b8ba83e 100644 --- a/public/stylesheets/sass/new-templates.scss +++ b/public/stylesheets/sass/new-templates.scss @@ -255,9 +255,22 @@ $light-grey: #999; padding: 20px; } +.avatar.smaller { + height: 35px; + width: 35px; +} + +.author-name { + color: inherit; + font-weight: bold; +} + #post-author { @include border-radius(); + border: 1px solid rgba(255,255,255,0.2); + border-top: 1px solid rgba(255,255,255,0.5); + float: left; margin: 0; @@ -269,13 +282,6 @@ $light-grey: #999; .avatar { @include border-radius(); - height: 35px; - width: 35px; - } - - .author-name { - color: inherit; - font-weight: bold; } .post-time { @@ -290,13 +296,80 @@ $light-grey: #999; } } -#user-controls { +#post-reactions { position: fixed; - height: 30px; width: 100%; bottom: 0; left: 0; text-align: center; +} + +#post-interactions { + @include center(horizontal); + + #post-interactions-container { + @include box-shadow(0, 6px, 15px, #000); + @include border-radius(); + + border-top: 1px solid #555; + border-right: 1px solid #444; + border-left: 1px solid #444; + + width: 420px; + background-image: url("../images/hatched-bg-dark.png"); + + color: #ccc; + } + + #post-comments { + text-align: left; + padding-top: 0; + max-height: 500px; + overflow: auto; + } + + #new-post-comment { + border: 2px solid #333; + text-align: left; + background-image: url("../images/hatched-bg-dark.png"); + } + + #new-post-comment-container { + padding: 10px; + + textarea{ + width: 390px; + height: 18px; + } + } +} + +.post-comment { + box-shadow: 0 1px 2px -2px #999; + border-bottom: 1px solid #333; + + &:last-child { + box-shadow: none; + border-bottom: none; + } + + padding: 10px; + padding-right: 40px; + margin: 0px; + + .avatar { + @include border-radius(); + } + + text-shadow: 0 1px 3px #222; + + a { + color: inherit; + } +} + +#user-controls { + height: 30px; .avatar { vertical-align: top;