Commit d0a56e22 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Move labels css to gl_bootstrap. Fixed label rendering

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 423ffe29
...@@ -85,23 +85,6 @@ pre.well-pre { ...@@ -85,23 +85,6 @@ pre.well-pre {
@include box-shadow(inset 0 2px 4px rgba(0,0,0,.15)); @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 **/ /** Big Labels **/
.state-label { .state-label {
font-size: 14px; font-size: 14px;
......
...@@ -74,3 +74,22 @@ ...@@ -74,3 +74,22 @@
} }
@import "bootstrap/responsive-utilities"; @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,11 +16,11 @@ module LabelsHelper ...@@ -16,11 +16,11 @@ module LabelsHelper
when *klass.warning_labels when *klass.warning_labels
'label-warning' 'label-warning'
when *klass.neutral_labels when *klass.neutral_labels
'label-inverse' 'label-primary'
when *klass.positive_labels when *klass.positive_labels
'label-success' 'label-success'
when *klass.important_labels when *klass.important_labels
'label-important' 'label-danger'
else else
'label-info' 'label-info'
end end
......
.side-filters.hidden-xs.hidden-sm .side-filters.hidden-xs.hidden-sm
= form_tag project_entities_path, method: 'get' do = form_tag project_entities_path, method: 'get' do
%fieldset
- if current_user - if current_user
%fieldset
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:scope].blank?)} %li{class: ("active" if params[:scope].blank?)}
= link_to project_filter_path(scope: nil) do = link_to project_filter_path(scope: nil) do
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
= link_to project_filter_path(scope: 'created-by-me') do = link_to project_filter_path(scope: 'created-by-me') do
Created by me Created by me
%fieldset
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:state].blank?)} %li{class: ("active" if params[:state].blank?)}
= link_to project_filter_path(state: nil) do = link_to project_filter_path(state: nil) do
......
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