diff --git a/web/app/components/comment/__action/comment__action.scss b/web/app/components/comment/__action/comment__action.scss index 3cd88b8a..14822b91 100644 --- a/web/app/components/comment/__action/comment__action.scss +++ b/web/app/components/comment/__action/comment__action.scss @@ -7,4 +7,8 @@ &:hover { color: #06c5c5; } + + &:focus { + outline: none; + } } diff --git a/web/app/components/comment/_level/comment_level.scss b/web/app/components/comment/_level/comment_level.scss index b9a86082..3036dd31 100644 --- a/web/app/components/comment/_level/comment_level.scss +++ b/web/app/components/comment/_level/comment_level.scss @@ -1,9 +1,19 @@ @import '../comment.vars'; -.comment_level { - @for $i from 1 through 5 { +@for $i from 1 through 5 { + .comment_level { &_#{$i} { - margin-left: $i * ($avatarSize + $avatarOffset); + padding-left: $i * ($avatarSize + $avatarOffset); + + &.comment_replying { + .comment__input { + margin-left: -$i * ($avatarSize + $avatarOffset); + + @media (min-width: 768px) { + margin-left: 0; + } + } + } } } } diff --git a/web/app/components/comment/_replying/comment_replying.scss b/web/app/components/comment/_replying/comment_replying.scss new file mode 100644 index 00000000..6f388d9d --- /dev/null +++ b/web/app/components/comment/_replying/comment_replying.scss @@ -0,0 +1,28 @@ +.comment_replying { + border: 3px solid #eee; + + @media (min-width: 768px) { + border: 0; + padding-top: 0; + } + + .comment__body { + padding: 8px 8px 0; + + @media (min-width: 768px) { + padding: 0; + } + } + + .comment__input { + border-left-width: 0; + border-right-width: 0; + border-bottom-width: 0; + padding-left: 0; + + @media (min-width: 768px) { + border: 3px solid #eee; + padding-left: 32px; + } + } +} diff --git a/web/app/components/comment/index.js b/web/app/components/comment/index.js index d4720c93..58028e39 100644 --- a/web/app/components/comment/index.js +++ b/web/app/components/comment/index.js @@ -22,9 +22,8 @@ require('./__vote/_type/_down/comment__vote_type_down.scss'); require('./__vote/_type/_up/comment__vote_type_up.scss'); require('./_level/comment_level.scss'); - require('./_pinned/comment_pinned.scss'); - +require('./_replying/comment_replying.scss'); require('./_useless/comment_useless.scss'); require('./_view/_admin/comment_view_admin.scss'); diff --git a/web/app/components/input/__button/_type/_preview/input__button_type_preview.scss b/web/app/components/input/__button/_type/_preview/input__button_type_preview.scss index b6f448e3..d25fa228 100644 --- a/web/app/components/input/__button/_type/_preview/input__button_type_preview.scss +++ b/web/app/components/input/__button/_type/_preview/input__button_type_preview.scss @@ -1,5 +1,5 @@ .input__button_type_preview { - &:hover { + &:hover, &:focus { box-shadow: inset 0 0 0 2px #0aa; color: #099; } diff --git a/web/app/components/input/__button/_type/_send/input__button_type_send.scss b/web/app/components/input/__button/_type/_send/input__button_type_send.scss index 771dec10..05475e6f 100644 --- a/web/app/components/input/__button/_type/_send/input__button_type_send.scss +++ b/web/app/components/input/__button/_type/_send/input__button_type_send.scss @@ -2,7 +2,7 @@ background: #0aa; color: #fff; - &:hover { + &:hover, &:focus { background: #06c5c5; } } diff --git a/web/app/components/input/input.jsx b/web/app/components/input/input.jsx index fa35eb08..3e75104e 100644 --- a/web/app/components/input/input.jsx +++ b/web/app/components/input/input.jsx @@ -59,6 +59,7 @@ export default class Input extends Component {