diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index c31231b60..11d4d4dd5 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 5d2247955..a49684582 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 93440dc60..2dccd9059 100644 --- a/app/assets/templates/picture-form.jst.hbs +++ b/app/assets/templates/picture-form.jst.hbs @@ -3,9 +3,11 @@
-
- Add Photos - -
+ +
+
+ Add Photos + +
diff --git a/app/assets/templates/post-form.jst.hbs b/app/assets/templates/post-form.jst.hbs index 48da9a6eb..1a27bdd58 100644 --- a/app/assets/templates/post-form.jst.hbs +++ b/app/assets/templates/post-form.jst.hbs @@ -7,7 +7,7 @@ Make Something! -