From 2a37491be07e33a27fbb2e30455e12a95dc23ac2 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Wed, 23 May 2012 15:09:48 -0700
Subject: [PATCH] changed service icons; icons for template picker [ci skip]

---
 app/assets/images/buttons/facebook_hov@2x.png | Bin 0 -> 3643 bytes
 app/assets/images/buttons/tumblr_hov@2x.png   | Bin 0 -> 3935 bytes
 app/assets/images/buttons/twitter_hov@2x.png  | Bin 0 -> 5414 bytes
 app/assets/javascripts/app/pages/composer.js  |   4 +-
 app/assets/stylesheets/mentions.css.scss      |   2 +
 app/assets/stylesheets/new_styles/_base.scss  |   3 +-
 .../stylesheets/new_styles/_composer.scss     |  44 ++++++++++++++----
 app/assets/templates/framer-content.jst.hbs   |  10 +++-
 .../templates/services-selector.jst.hbs       |   2 +-
 9 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 app/assets/images/buttons/facebook_hov@2x.png
 create mode 100644 app/assets/images/buttons/tumblr_hov@2x.png
 create mode 100644 app/assets/images/buttons/twitter_hov@2x.png

diff --git a/app/assets/images/buttons/facebook_hov@2x.png b/app/assets/images/buttons/facebook_hov@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb1558c985c711b66a0a0526c5bfa126c6b7c6a
GIT binary patch
literal 3643
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/buttons/tumblr_hov@2x.png b/app/assets/images/buttons/tumblr_hov@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0ab89d684e1432cb21bf6028b11bc0caf6ad288
GIT binary patch
literal 3935
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/buttons/twitter_hov@2x.png b/app/assets/images/buttons/twitter_hov@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..575450c44044d21fda8b86811f695612c4b1d87f
GIT binary patch
literal 5414
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
Qe%)LeV$Wip={wN=2OT$lF8}}l

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/app/pages/composer.js b/app/assets/javascripts/app/pages/composer.js
index c0e7c0e6a..42e32d97a 100644
--- a/app/assets/javascripts/app/pages/composer.js
+++ b/app/assets/javascripts/app/pages/composer.js
@@ -16,7 +16,9 @@ app.pages.Composer = app.views.Base.extend({
 
   initialize : function(){
     app.frame = this.model = this.model || new app.models.StatusMessage();
-    this.postForm = new app.forms.Post({model : this.model});
+
+    /* add class to make this smaller than the default framer */
+    this.postForm = new app.forms.Post({model : this.model, className : "span4 offset1"});
     this.composerControls = new app.views.ComposerControls({model : this.model});
   },
 
diff --git a/app/assets/stylesheets/mentions.css.scss b/app/assets/stylesheets/mentions.css.scss
index 39ff4c3a7..48b466555 100644
--- a/app/assets/stylesheets/mentions.css.scss
+++ b/app/assets/stylesheets/mentions.css.scss
@@ -2,6 +2,8 @@
 @import '_mixins.css.scss';
 
 .mentions-input-box {
+  @include border-radius(3px);
+
   background: #fff;
   position: relative;
 
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index ab3d361dc..502c5d5fb 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -14,7 +14,8 @@ body {
 }
 
 /* new link color */
-a { color : rgb(42,156,235)  }
+$link-blue : rgb(42,156,235);
+a { color : $link-blue  }
 
 /* bootstrap extentions */
 .icon-red   { background-image: image_url("img/glyphicons-halflings-red.png");   }
diff --git a/app/assets/stylesheets/new_styles/_composer.scss b/app/assets/stylesheets/new_styles/_composer.scss
index 85f6e4ff3..87c6d7e14 100644
--- a/app/assets/stylesheets/new_styles/_composer.scss
+++ b/app/assets/stylesheets/new_styles/_composer.scss
@@ -44,7 +44,8 @@
   }
 
   .template-picker {
-    margin-bottom : 1em;
+    float : left;
+    margin-left : 20px;
 
     input {
       display : none;
@@ -54,6 +55,8 @@
       @include transition(background-color);
       @include border-radius();
 
+      display : inline-block;
+
       cursor : pointer;
 
       margin-right: 11px;
@@ -63,13 +66,37 @@
       line-height: 2em;
 
       &:hover {
-        background-color: #222;
-        text-decoration: none;
+        img {
+          border : 4px solid rgba(255,255,255,1);
+        }
       }
+
+      .template-name {
+        text-align : center;
+        text-transform : uppercase;
+      }
+
+      img {
+        @include border-radius(5px);
+        @include transition(border);
+
+        border : 4px solid transparent;
+        background-color : #ddd;
+
+        height : 54px;
+        width : 54px;
+      }
+
     }
 
     input:checked + label {
-      background-color: #222;
+      .template-name {
+        color : $link-blue;
+      }
+
+      img {
+        border : 4px solid $link-blue;
+      }
     }
   }
 
@@ -133,10 +160,11 @@
 
     img {
       @include transition(opacity);
+      @include box-shadow(0,0,0,0);
 
       cursor : pointer;
-      height : 28px;
-      width : 28px;
+      height : 70px;
+      width : 54px;
     }
 
     input:not(:checked) + label {
@@ -174,8 +202,8 @@ input[type="image"] {
 
 .new_photo .photo{
   display: inline;
-  max-width: 200px;
-  max-height: 75px;
+  max-width: 240px;
+  max-height: 240px;
   padding: 2px;
 }
 
diff --git a/app/assets/templates/framer-content.jst.hbs b/app/assets/templates/framer-content.jst.hbs
index 448dca397..680e11768 100644
--- a/app/assets/templates/framer-content.jst.hbs
+++ b/app/assets/templates/framer-content.jst.hbs
@@ -2,7 +2,13 @@
 
 <div class='template-picker'>
     {{#each templates}}
-    <input id='frame_name_{{name}}' name="frame_name" type="radio" class="mood" value={{name}} {{#if checked}}checked=checked{{/if}} />
-    <label for='frame_name_{{name}}'>{{name}}</label>
+        <input id='frame_name_{{name}}' name="frame_name" type="radio" class="mood" value={{name}} {{#if checked}}checked=checked{{/if}} />
+        <label for='frame_name_{{name}}'>
+            <img src="/assets/branding/asterisk.png" />
+            <div class="template-name">
+                {{name}}
+            </div>
+        </label>
+        <br />
     {{/each}}
 </div>
diff --git a/app/assets/templates/services-selector.jst.hbs b/app/assets/templates/services-selector.jst.hbs
index 59540451d..eaec5629f 100644
--- a/app/assets/templates/services-selector.jst.hbs
+++ b/app/assets/templates/services-selector.jst.hbs
@@ -3,7 +3,7 @@
     {{#each services}}
         <input id="services[{{name}}]" type="checkbox" name="services[{{name}}]" class="services" value="{{name}}" {{#if checked}}checked="checked"{{/if}}/>
         <label for="services[{{name}}]">
-            <img class="legacy-provider-image" src="/assets/social_media_logos/{{name}}-32x32.png" data-provider="{{name}}" data-url="/auth/{{name}}" title="Share on {{name}}" />
+            <img class="legacy-provider-image" src="/assets/buttons/{{name}}_hov@2x.png" data-provider="{{name}}" data-url="/auth/{{name}}" title="Share on {{name}}" />
         </label>
     {{/each}}
 </form>