Commit 618b5491 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve UI for emoji awards

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a2912074
...@@ -103,19 +103,23 @@ ...@@ -103,19 +103,23 @@
} }
.awards { .awards {
@include clearfix;
line-height: 32px;
margin: 5px 0;
.award { .award {
@include border-radius(5px);
border: 1px solid; border: 1px solid;
padding: 1px 3px; padding: 0px 10px;
width: 50px; float: left;
border-radius: 5px; margin: 0 5px;
float:left; border-color: $border-color;
margin: 0 3px;
border-color: #ccc;
cursor: pointer; cursor: pointer;
&.active { &.active {
border-color: rgba(79,176,252,0.4); border-color: $border-gray-light;
background-color: rgba(79,176,252,0.1); background-color: $gray-light;
.counter { .counter {
font-weight: bold; font-weight: bold;
...@@ -126,26 +130,37 @@ ...@@ -126,26 +130,37 @@
float: left; float: left;
margin-right: 10px; margin-right: 10px;
} }
.counter {
float: left;
}
} }
.awards-controls { .awards-controls {
height: 25px; line-height: 32px;
width: 28px; margin-left: 10px;
float: left; float: left;
padding: 0 0 5px 5px;
line-height: 1;
.add-award { .add-award {
font-size: 27px; font-size: 24px;
color: #ccc; color: $gl-gray;
position: relative;
top: 2px;
&:hover { &:hover,
text-decoration: none;
}
&:link { &:link {
text-decoration: none; text-decoration: none;
} }
} }
.awards-menu {
padding: $gl-padding;
min-width: 214px;
> li {
margin: 5px;
}
}
} }
.awards-menu{ .awards-menu{
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= render 'shared/show_aside' = render 'shared/show_aside'
.gray-content-block.second-block .gray-content-block.second-block.oneline-block
.row .row
.col-md-9 .col-md-9
.votes-holder.pull-right .votes-holder.pull-right
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.dropdown.awards-controls .dropdown.awards-controls
%a.add-award{"data-toggle" => "dropdown", "data-target" => "#", "href" => "#"} %a.add-award{"data-toggle" => "dropdown", "data-target" => "#", "href" => "#"}
= icon('plus-circle') = icon('plus-square-o')
%ul.dropdown-menu.awards-menu %ul.dropdown-menu.awards-menu
- emoji_list.each do |emoji| - emoji_list.each do |emoji|
%li{"data-emoji" => "#{emoji}"}= image_tag url_to_emoji(emoji), height: "20px", width: "20px" %li{"data-emoji" => "#{emoji}"}= image_tag url_to_emoji(emoji), height: "20px", width: "20px"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment