Merge pull request #1080 from Ana06/text-color

Text color of event types and difficulty levels
This commit is contained in:
Christian Bruckmayer 2016-07-11 16:31:47 +02:00 committed by GitHub
commit 69a5d41b79
3 changed files with 3 additions and 4 deletions

View file

@ -20,7 +20,7 @@
%td %td
= difficulty_level.description = difficulty_level.description
%td %td
%span.label{style: "background-color: #{difficulty_level.color};"} %span.label{style: "background-color: #{difficulty_level.color}; color: #{ contrast_color(difficulty_level.color) };"}
= difficulty_level.color = difficulty_level.color
%td %td
.btn-group{role: "group"} .btn-group{role: "group"}

View file

@ -28,7 +28,7 @@
= "#{event_type.minimum_abstract_length} - #{event_type.maximum_abstract_length}" = "#{event_type.minimum_abstract_length} - #{event_type.maximum_abstract_length}"
Words Words
%td %td
%span.label{style: "background-color: #{event_type.color};"} %span.label{style: "background-color: #{event_type.color}; color: #{ contrast_color(event_type.color) };"}
= event_type.color = event_type.color
%td %td
.btn-group{role: "group"} .btn-group{role: "group"}
@ -39,4 +39,3 @@
.row .row
.col-md-12.text-right .col-md-12.text-right
= link_to 'Add Event Type', new_admin_conference_program_event_type_path(@conference.short_title), class: 'btn btn-primary' = link_to 'Add Event Type', new_admin_conference_program_event_type_path(@conference.short_title), class: 'btn btn-primary'

View file

@ -76,7 +76,7 @@
%dt Difficulty: %dt Difficulty:
%dd %dd
- if @event.difficulty_level - if @event.difficulty_level
%span.label{:style =>"background-color: #{@event.difficulty_level.color};"} %span.label{:style =>"background-color: #{@event.difficulty_level.color}; color: #{ contrast_color(@event.difficulty_level.color) };"}
= @event.difficulty_level.title = @event.difficulty_level.title
- if @event.require_registration - if @event.require_registration