# HG changeset patch # User bsw # Date 1330942447 -3600 # Node ID 2dae61588ceeedd3ecf562f25a86d6c705cd4534 # Parent bf99dcc58f68e14d9cec18bc0c774626307f3a4e Fixed flaws with area list for smaller screen sizes, added phase icons again diff -r bf99dcc58f68 -r 2dae61588cee app/main/area/_list.lua --- a/app/main/area/_list.lua Sun Mar 04 19:06:17 2012 +0100 +++ b/app/main/area/_list.lua Mon Mar 05 11:14:07 2012 +0100 @@ -32,6 +32,38 @@ ui.container{ attr = { class = "area_list" }, content = function() + ui.container{ attr = { class = "area head" }, content = function() + + ui.container{ attr = { class = "phases" }, content = function() + + ui.container{ attr = { class = "admission" }, content = function() + ui.image{ static = "icons/16/new.png" } + end } + + ui.container{ attr = { class = "discussion" }, content = function() + ui.image{ static = "icons/16/comments.png" } + end } + + ui.container{ attr = { class = "verification" }, content = function() + ui.image{ static = "icons/16/lock.png" } + end } + + ui.container{ attr = { class = "voting" }, content = function() + ui.image{ static = "icons/16/email_open.png" } + end } + + ui.container{ attr = { class = "finished" }, content = function() + ui.image{ static = "icons/16/tick.png" } + end } + + ui.container{ attr = { class = "cancelled" }, content = function() + ui.image{ static = "icons/16/cross.png" } + end } + + end } + + end } + for i, area in ipairs(areas_selector:exec()) do ui.container{ attr = { class = "area" }, content = function() @@ -164,7 +196,7 @@ end } - slot.put("
") + slot.put("
") end } end diff -r bf99dcc58f68 -r 2dae61588cee static/style.css --- a/static/style.css Sun Mar 04 19:06:17 2012 +0100 +++ b/static/style.css Mon Mar 05 11:14:07 2012 +0100 @@ -843,24 +843,38 @@ */ .member_area_list { - margin-bottom: 2ex; + margin-bottom: 0ex; } .member_area_list .unit_head { font-size: 120%; font-weight: bold; line-height: 200%; + float: left; + clear: both; } .member_area_list .unit_delegatee { float: left; } +.area_list { + margin-bottom: 4ex; +} .area_list .area { line-height: 28px; clear: both; } +.area_list .area.head { + line-height: 16px; + clear: none; +} + +.area_list .area.head .phases { + margin-top: 2ex; +} + .area_list .area img { vertical-align: middle; } @@ -883,7 +897,6 @@ .area_list .area .phases { float: right; - margin-bottom: 2ex; } .area_list .area .phases div {