diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-20 14:05:42 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-20 14:05:42 +0200 |
commit | 436e96467dba5ccbaa5ffef21f760f6441fe8a0f (patch) | |
tree | 806d9eb7e0a6026f4ef87cf9bf2bdb9a9e8bd04d | |
parent | b07c02eb13fca5f991575bb0955373d54f1a2d9d (diff) | |
download | gitlab-ce-436e96467dba5ccbaa5ffef21f760f6441fe8a0f.tar.gz |
Nicer icons for enabled/disabled stuff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/common.scss | 1 | ||||
-rw-r--r-- | app/helpers/icons_helper.rb | 4 | ||||
-rw-r--r-- | app/models/hipchat_service.rb | 2 | ||||
-rw-r--r-- | app/views/projects/services/_form.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/services/index.html.haml | 8 |
5 files changed, 7 insertions, 15 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index 018c8d9e3aa..c2787af2345 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -1,5 +1,6 @@ /** COLORS **/ .cgray { color: gray } +.clgray { color: #BBB } .cred { color: #D12F19 } .cgreen { color: #4a2 } .cblue { color: #29A } diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 41249a56acb..e4dfc236ca1 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -1,9 +1,9 @@ module IconsHelper def boolean_to_icon(value) if value.to_s == "true" - content_tag :i, nil, class: 'icon-circle cgreen' + content_tag :i, nil, class: 'icon-ok cgreen' else - content_tag :i, nil, class: 'icon-circle cgray' + content_tag :i, nil, class: 'icon-off clgray' end end diff --git a/app/models/hipchat_service.rb b/app/models/hipchat_service.rb index 7fec5c4fbe8..ea2169fb168 100644 --- a/app/models/hipchat_service.rb +++ b/app/models/hipchat_service.rb @@ -25,7 +25,7 @@ class HipchatService < Service end def description - 'Simple web-based real-time group chat' + 'Private group chat and IM' end def to_param diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index a099193cb6e..202bf327217 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -1,11 +1,6 @@ %h3.page-title - - if @service.activated? - %span.cgreen - %i.icon-circle - - else - %span.cgray - %i.icon-circle-blank = @service.title + = boolean_to_icon @service.activated? %p= @service.description diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml index 82b85a18acd..190aa69dab7 100644 --- a/app/views/projects/services/index.html.haml +++ b/app/views/projects/services/index.html.haml @@ -6,12 +6,8 @@ - @services.each do |service| %li %h4 - - if service.activated? - %span.cgreen - %i.icon-circle - - else - %span.cgray - %i.icon-circle-blank = link_to edit_project_service_path(@project, service.to_param) do = service.title + .pull-right + = boolean_to_icon service.activated? %p= service.description |