Commit 38afc3e8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Move labels css to gl_bootstrap. Fixed label rendering


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent cd385a106243
......@@ -85,23 +85,6 @@
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15));
}
.label {
padding: 2px 4px;
font-size: 12px;
font-style: normal;
font-weight: normal;
&.label-gray {
background-color: #eee;
color: #999;
text-shadow: none;
}
&.label-inverse {
background-color: #333333;
}
}
/** Big Labels **/
.state-label {
font-size: 14px;
......
......@@ -74,3 +74,22 @@
}
@import "bootstrap/responsive-utilities";
// Labels
.label {
padding: 2px 4px;
font-size: 12px;
font-style: normal;
font-weight: normal;
display: inline-block;
&.label-gray {
background-color: #eee;
color: #999;
text-shadow: none;
}
&.label-inverse {
background-color: #333333;
}
}
......@@ -16,7 +16,7 @@
when *klass.warning_labels
'label-warning'
when *klass.neutral_labels
'label-inverse'
'label-primary'
when *klass.positive_labels
'label-success'
when *klass.important_labels
......@@ -20,7 +20,7 @@
when *klass.positive_labels
'label-success'
when *klass.important_labels
'label-important'
'label-danger'
else
'label-info'
end
......
.side-filters.hidden-xs.hidden-sm
= form_tag project_entities_path, method: 'get' do
%fieldset
- if current_user
- if current_user
%fieldset
%ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:scope].blank?)}
= link_to project_filter_path(scope: nil) do
......@@ -13,6 +13,7 @@
= link_to project_filter_path(scope: 'created-by-me') do
Created by me
%fieldset
%ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:state].blank?)}
= link_to project_filter_path(state: nil) do
......
Supports Markdown
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