Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move labels css to gl_bootstrap. Fixed label rendering

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  • Loading branch information...
commit d0a56e228018b72b30598ca5b4c744d57d8f1f3e 1 parent 423ffe2
@randx randx authored
View
17 app/assets/stylesheets/generic/common.scss
@@ -85,23 +85,6 @@ pre.well-pre {
@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;
View
19 app/assets/stylesheets/gl_bootstrap.scss
@@ -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;
+ }
+}
View
4 app/helpers/labels_helper.rb
@@ -16,11 +16,11 @@ def label_css_class(name)
when *klass.warning_labels
'label-warning'
when *klass.neutral_labels
- 'label-inverse'
+ 'label-primary'
when *klass.positive_labels
'label-success'
when *klass.important_labels
- 'label-important'
+ 'label-danger'
else
'label-info'
end
View
5 app/views/shared/_project_filter.html.haml
@@ -1,7 +1,7 @@
.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
Please sign in to comment.
Something went wrong with that request. Please try again.