diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index c31231b60fec153c9fc2a1a20c12d23187f5db0f..11d4d4dd5167bb3948ec2b807061682db9e60669 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -401,7 +401,7 @@ div[data-template=flow] { a { display : block; - span { + span:not(.caret) { padding-left: 5px; } } @@ -412,7 +412,6 @@ div[data-template=flow] { margin-left: 100px; } - .dropdown-menu { bottom : 0; top: auto; @@ -445,6 +444,16 @@ div[data-template=flow] { .magic-service-selector { label { display : inline;} + img { + cursor : pointer; + height : 28px; + width : 28px; + + &:hover { + @include opacity(0.6); + } + } + input:not(:checked) + label { @include opacity(0.4); } diff --git a/app/assets/stylesheets/new_styles/_composer.scss b/app/assets/stylesheets/new_styles/_composer.scss index 5d22479558ce6f271fd86c4497b7a082596c581e..a496845827165a3ead738fea1652c46a12a7c990 100644 --- a/app/assets/stylesheets/new_styles/_composer.scss +++ b/app/assets/stylesheets/new_styles/_composer.scss @@ -11,10 +11,12 @@ #photo_upload_button { position: relative; - margin-top: 9px; + margin : { + bottom : 9px; + } input{ - opacity: 0; + @include opacity(0); position: absolute; top: 0; left: 0; diff --git a/app/assets/templates/picture-form.jst.hbs b/app/assets/templates/picture-form.jst.hbs index 93440dc60a76b2fc407621bc9040347498eb02fa..2dccd9059650b600a6875bbfdb06bc5d2665f91b 100644 --- a/app/assets/templates/picture-form.jst.hbs +++ b/app/assets/templates/picture-form.jst.hbs @@ -3,9 +3,11 @@ <div style="margin:0;padding:0;display:inline"> <input name="utf8" type="hidden" value="✓"/> </div> - <div id='photo_upload_button'> - <a class='btn'><i class="icon-camera" style="margin-right:4px;"></i>Add Photos</a> - <input name="photo[user_file]" type="file"/> - <div class="photos well"></div> + + <div class="photos well"> + <div id='photo_upload_button'> + <a class='btn'><i class="icon-camera" style="margin-right:4px;"></i>Add Photos</a> + <input name="photo[user_file]" type="file"/> + </div> </div> </form> diff --git a/app/assets/templates/post-form.jst.hbs b/app/assets/templates/post-form.jst.hbs index 48da9a6eb1673b0b1570df0cf9bd2952635f1763..1a27bdd584374bb2866bec0ee07414c53137502e 100644 --- a/app/assets/templates/post-form.jst.hbs +++ b/app/assets/templates/post-form.jst.hbs @@ -7,7 +7,7 @@ <legend> Make Something! </legend> - <textarea name="text" id='post_text' class="text span8"/> + <textarea name="text" id='post_text' class="text span8" placeholder="Add Text"/> <textarea id="text_with_markup" style="display:none;"/> </fieldset> </form> diff --git a/app/assets/templates/services-selector.jst.hbs b/app/assets/templates/services-selector.jst.hbs index afeb4180b505679e52da8b437ebb088ddf394e64..992b062b030841d02c83fa3638800cb169dd703f 100644 --- a/app/assets/templates/services-selector.jst.hbs +++ b/app/assets/templates/services-selector.jst.hbs @@ -1,10 +1,8 @@ -<span class="service-selector-title">Broadcast</span> - <!--*CSS MAGIC* CHECKBOX IS HIDDEN AND IS CHECKED BY CLICKING THE LABEL, CHANGE THIS AT YOUR OWN PERIL, RUN JASMINE AFTER--> <div class="magic-service-selector"> {{#each current_user.services}} <input id="service_toggle_{{provider}}" type="checkbox" name="services" class="service" value="{{provider}}" /> - <label for="service_toggle_{{provider}}"><img class="legacy-provider-image" src="/assets/social_media_logos/{{provider}}-16x16.png" data-provider="{{provider}}" /></label> + <label for="service_toggle_{{provider}}"><img class="legacy-provider-image" src="/assets/social_media_logos/{{provider}}-32x32.png" data-provider="{{provider}}" /></label> {{/each}} </div>