diff --git a/rails/app/stylesheets/main.sass b/rails/app/stylesheets/main.sass index 2b84a2db7..7df09d7d1 100644 --- a/rails/app/stylesheets/main.sass +++ b/rails/app/stylesheets/main.sass @@ -69,6 +69,13 @@ table width: auto border-collapse: separate + &.event-by-state + + td + padding: 1em + +border-radius(5px) + + caption caption-side: top @@ -207,6 +214,7 @@ select margin: 0px 2px background-color: #FF4040 padding: 3px + +border-radius(3px) .user color: black diff --git a/rails/app/views/pentabarf/index.rxml b/rails/app/views/pentabarf/index.rxml index f94e69c13..82ab526e2 100644 --- a/rails/app/views/pentabarf/index.rxml +++ b/rails/app/views/pentabarf/index.rxml @@ -3,7 +3,7 @@ xml.div({:id=>'data'}) do xml.fieldset do xml.legend local('pentabarf::events_by_state') - xml.table do + xml.table({:class=>'event-by-state'}) do xml.tr do View_event_state_statistic.select({:conference_id=>@current_conference.conference_id}).each do | state | xml.td(:class=>state.event_state,:style=>"vertical-align: top;") do diff --git a/rails/public/stylesheets/main.css b/rails/public/stylesheets/main.css index 7ee44181e..2f34b8b84 100644 --- a/rails/public/stylesheets/main.css +++ b/rails/public/stylesheets/main.css @@ -60,6 +60,7 @@ fieldset.conflicts { background-color: lightsalmon; } span.sortarrow { color: blue; } table { border: 0px solid #90acc8; padding: 2px; margin: 2px 0 2px 0; width: auto; border-collapse: separate; } +table.event-by-state td { padding: 1em; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; } caption { caption-side: top; text-align: center; width: auto; } @@ -104,7 +105,7 @@ textarea:focus { background-color: #FFFFD0; border-color: #90acc8; } select { border: 1px solid #c8d8e8; color: #000; vertical-align: top; } #activity { position: fixed; right: 0px; top: 0px; height: 20px; z-index: 5; font-size: smaller; } -#activity a { margin: 0px 2px; background-color: #FF4040; padding: 3px; } +#activity a { margin: 0px 2px; background-color: #FF4040; padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; } #activity .user { color: black; margin-left: 2px; } #activity .time { color: white; } #activity :link, #activity :visited { color: black; }