gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1080 from Ana06/text-color

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/difficulty_levels/index.html.haml
View file

@ -20,7 +20,7 @@
%td
= difficulty_level.description
%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
%td
.btn-group{role: "group"}

3
app/views/admin/event_types/index.html.haml
View file

@ -28,7 +28,7 @@
= "#{event_type.minimum_abstract_length} - #{event_type.maximum_abstract_length}"
Words
%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
%td
.btn-group{role: "group"}
@ -39,4 +39,3 @@
.row
.col-md-12.text-right
= link_to 'Add Event Type', new_admin_conference_program_event_type_path(@conference.short_title), class: 'btn btn-primary'

2
app/views/proposal/show.html.haml
View file

@ -76,7 +76,7 @@
%dt Difficulty:
%dd
- 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
- if @event.require_registration