Commit 1a97db41 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Simplify issue-box style

parent e02aec66
...@@ -17,54 +17,38 @@ ...@@ -17,54 +17,38 @@
&.issue-box-closed { &.issue-box-closed {
border-color: $border_danger; border-color: $border_danger;
.state { .state {
background-color: $bg_light_danger;
border-color: $border_danger;
color: $color_danger;
.state-label {
background-color: $bg_danger; background-color: $bg_danger;
color: #FFF; color: #FFF;
} border-color: $border_danger;
} }
} }
&.issue-box-merged { &.issue-box-merged {
border-color: $border_primary; border-color: $border_primary;
.state { .state {
background-color: $bg_light_primary;
border-color: $border_primary;
color: $color_primary;
.state-label {
background-color: $bg_primary; background-color: $bg_primary;
color: #FFF; color: #FFF;
} border-color: $border_primary;
} }
} }
&.issue-box-open { &.issue-box-open {
border-color: $border_success; border-color: $border_success;
.state { .state {
background-color: $bg_light_success;
border-color: $border_success; border-color: $border_success;
color: $color_success;
.state-label {
background-color: $bg_success; background-color: $bg_success;
color: #FFF; color: #FFF;
} }
} }
}
&.issue-box-expired { &.issue-box-expired {
border-color: #cea61b; border-color: #cea61b;
.state { .state {
background-color: #fcf8e3;
border-color: #faebcc; border-color: #faebcc;
color: #8a6d3b;
.state-label {
background: #cea61b; background: #cea61b;
color: #FFF; color: #FFF;
} }
} }
}
.control-group { .control-group {
margin-bottom: 0; margin-bottom: 0;
...@@ -72,7 +56,7 @@ ...@@ -72,7 +56,7 @@
.state { .state {
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
line-height: 32px; padding: 10px 25px;
} }
.title { .title {
...@@ -115,14 +99,15 @@ ...@@ -115,14 +99,15 @@
.state-label { .state-label {
font-size: 14px; font-size: 14px;
padding: 1px 25px; float: left;
text-align: center; font-weight: bold;
text-shadow: none;
display: inline-block;
line-height: 34px;
} }
.creator { .creator {
padding: 2px 15px; float: right;
a {
color: #FFF;
text-decoration: underline;
}
} }
} }
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
.issue-box{ class: issue_box_class(@issue) } .issue-box{ class: issue_box_class(@issue) }
.state.clearfix .state.clearfix
.state-label.col-sm-2.col-xs-12 .state-label
- if @issue.closed? - if @issue.closed?
Closed Closed
- else - else
Open Open
%span.creator.col-sm-9.col-xs-12 .creator
Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)} Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)}
%h4.title %h4.title
......
.issue-box{ class: issue_box_class(@merge_request) } .issue-box{ class: issue_box_class(@merge_request) }
.state.clearfix .state.clearfix
%span.state-label.col-sm-2.col-xs-12 .state-label
- if @merge_request.merged? - if @merge_request.merged?
Merged Merged
- elsif @merge_request.closed? - elsif @merge_request.closed?
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
- else - else
Open Open
%span.creator.col-sm-9.col-xs-12 .creator
Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)} Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)}
%h4.title %h4.title
......
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
.issue-box{ class: issue_box_class(@milestone) } .issue-box{ class: issue_box_class(@milestone) }
.state.clearfix .state.clearfix
.state-label.col-sm-2.col-xs-12 .state-label
- if @milestone.closed? - if @milestone.closed?
Closed Closed
- elsif @milestone.expired? - elsif @milestone.expired?
Expired Expired
- else - else
Open Open
%span.creator.col-sm-9.col-xs-12 .creator
= @milestone.expires_at = @milestone.expires_at
%h4.title %h4.title
......
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