liquid_feedback_frontend
changeset 381:b155ca3744c5
Rearanged delegatee icons in area list to make everything fit better
author | bsw |
---|---|
date | Mon Mar 05 11:31:27 2012 +0100 (2012-03-05) |
parents | 99cb2d8e2f46 |
children | b3e2a4088137 |
files | app/main/area/_list.lua static/style.css |
line diff
1.1 --- a/app/main/area/_list.lua Mon Mar 05 11:16:41 2012 +0100 1.2 +++ b/app/main/area/_list.lua Mon Mar 05 11:31:27 2012 +0100 1.3 @@ -83,6 +83,17 @@ 1.4 end 1.5 end } 1.6 1.7 + ui.container{ attr = { class = "name" }, content = function() 1.8 + ui.link{ 1.9 + text = area.name, 1.10 + module = "area", 1.11 + view = "show", 1.12 + id = area.id 1.13 + } 1.14 + slot.put(" ") 1.15 + ui.tag{ content = "" } 1.16 + end } 1.17 + 1.18 if not hide_membership then 1.19 ui.container{ attr = { class = "membership" }, content = function() 1.20 if area.is_member then 1.21 @@ -96,7 +107,7 @@ 1.22 end 1.23 end } 1.24 end 1.25 - 1.26 + 1.27 ui.container{ attr = { class = "delegatee" }, content = function() 1.28 if area.trustee_member_id then 1.29 local trustee_member = Member:by_id(area.trustee_member_id) 1.30 @@ -121,17 +132,6 @@ 1.31 end 1.32 end } 1.33 1.34 - ui.container{ attr = { class = "name" }, content = function() 1.35 - ui.link{ 1.36 - text = area.name, 1.37 - module = "area", 1.38 - view = "show", 1.39 - id = area.id 1.40 - } 1.41 - slot.put(" ") 1.42 - ui.tag{ content = "" } 1.43 - end } 1.44 - 1.45 ui.container{ attr = { class = "phases" }, content = function() 1.46 1.47 ui.container{ attr = { class = "admission" }, content = function()
2.1 --- a/static/style.css Mon Mar 05 11:16:41 2012 +0100 2.2 +++ b/static/style.css Mon Mar 05 11:31:27 2012 +0100 2.3 @@ -862,7 +862,7 @@ 2.4 margin-bottom: 4ex; 2.5 } 2.6 .area_list .area { 2.7 - line-height: 28px; 2.8 + line-height: 32px; 2.9 clear: both; 2.10 } 2.11 2.12 @@ -907,12 +907,15 @@ 2.13 2.14 @media screen and (max-width: 480px) { 2.15 .area_list .area .name { 2.16 - xdisplay: block; 2.17 - xfloat: left; 2.18 + display: block; 2.19 } 2.20 - .area_list .area .bar, 2.21 - .area_list .area .membership, 2.22 - .area_list .area .delegatee { 2.23 + 2.24 + .area_list .area .delegatee, 2.25 + .area_list .area .membership { 2.26 + float: left; 2.27 + white-space: nowrap; 2.28 + } 2.29 + .area_list .area .bar { 2.30 display: none; 2.31 } 2.32 }