liquid_feedback_frontend
changeset 378:2dae61588cee
Fixed flaws with area list for smaller screen sizes, added phase icons again
author | bsw |
---|---|
date | Mon Mar 05 11:14:07 2012 +0100 (2012-03-05) |
parents | bf99dcc58f68 |
children | 99cb2d8e2f46 |
files | app/main/area/_list.lua static/style.css |
line diff
1.1 --- a/app/main/area/_list.lua Sun Mar 04 19:06:17 2012 +0100 1.2 +++ b/app/main/area/_list.lua Mon Mar 05 11:14:07 2012 +0100 1.3 @@ -32,6 +32,38 @@ 1.4 1.5 ui.container{ attr = { class = "area_list" }, content = function() 1.6 1.7 + ui.container{ attr = { class = "area head" }, content = function() 1.8 + 1.9 + ui.container{ attr = { class = "phases" }, content = function() 1.10 + 1.11 + ui.container{ attr = { class = "admission" }, content = function() 1.12 + ui.image{ static = "icons/16/new.png" } 1.13 + end } 1.14 + 1.15 + ui.container{ attr = { class = "discussion" }, content = function() 1.16 + ui.image{ static = "icons/16/comments.png" } 1.17 + end } 1.18 + 1.19 + ui.container{ attr = { class = "verification" }, content = function() 1.20 + ui.image{ static = "icons/16/lock.png" } 1.21 + end } 1.22 + 1.23 + ui.container{ attr = { class = "voting" }, content = function() 1.24 + ui.image{ static = "icons/16/email_open.png" } 1.25 + end } 1.26 + 1.27 + ui.container{ attr = { class = "finished" }, content = function() 1.28 + ui.image{ static = "icons/16/tick.png" } 1.29 + end } 1.30 + 1.31 + ui.container{ attr = { class = "cancelled" }, content = function() 1.32 + ui.image{ static = "icons/16/cross.png" } 1.33 + end } 1.34 + 1.35 + end } 1.36 + 1.37 + end } 1.38 + 1.39 for i, area in ipairs(areas_selector:exec()) do 1.40 1.41 ui.container{ attr = { class = "area" }, content = function() 1.42 @@ -164,7 +196,7 @@ 1.43 1.44 end } 1.45 1.46 - slot.put("<br />") 1.47 + slot.put("<br style='clear: right;' />") 1.48 end } 1.49 1.50 end
2.1 --- a/static/style.css Sun Mar 04 19:06:17 2012 +0100 2.2 +++ b/static/style.css Mon Mar 05 11:14:07 2012 +0100 2.3 @@ -843,24 +843,38 @@ 2.4 */ 2.5 2.6 .member_area_list { 2.7 - margin-bottom: 2ex; 2.8 + margin-bottom: 0ex; 2.9 } 2.10 2.11 .member_area_list .unit_head { 2.12 font-size: 120%; 2.13 font-weight: bold; 2.14 line-height: 200%; 2.15 + float: left; 2.16 + clear: both; 2.17 } 2.18 2.19 .member_area_list .unit_delegatee { 2.20 float: left; 2.21 } 2.22 2.23 +.area_list { 2.24 + margin-bottom: 4ex; 2.25 +} 2.26 .area_list .area { 2.27 line-height: 28px; 2.28 clear: both; 2.29 } 2.30 2.31 +.area_list .area.head { 2.32 + line-height: 16px; 2.33 + clear: none; 2.34 +} 2.35 + 2.36 +.area_list .area.head .phases { 2.37 + margin-top: 2ex; 2.38 +} 2.39 + 2.40 .area_list .area img { 2.41 vertical-align: middle; 2.42 } 2.43 @@ -883,7 +897,6 @@ 2.44 2.45 .area_list .area .phases { 2.46 float: right; 2.47 - margin-bottom: 2ex; 2.48 } 2.49 2.50 .area_list .area .phases div {