# HG changeset patch # User bsw # Date 1330943487 -3600 # Node ID b155ca3744c574d7e500c9da343518265fd7c3a9 # Parent 99cb2d8e2f46a17f3ebedf84e44c27293ebeae81 Rearanged delegatee icons in area list to make everything fit better diff -r 99cb2d8e2f46 -r b155ca3744c5 app/main/area/_list.lua --- a/app/main/area/_list.lua Mon Mar 05 11:16:41 2012 +0100 +++ b/app/main/area/_list.lua Mon Mar 05 11:31:27 2012 +0100 @@ -83,6 +83,17 @@ end end } + ui.container{ attr = { class = "name" }, content = function() + ui.link{ + text = area.name, + module = "area", + view = "show", + id = area.id + } + slot.put(" ") + ui.tag{ content = "" } + end } + if not hide_membership then ui.container{ attr = { class = "membership" }, content = function() if area.is_member then @@ -96,7 +107,7 @@ end end } end - + ui.container{ attr = { class = "delegatee" }, content = function() if area.trustee_member_id then local trustee_member = Member:by_id(area.trustee_member_id) @@ -121,17 +132,6 @@ end end } - ui.container{ attr = { class = "name" }, content = function() - ui.link{ - text = area.name, - module = "area", - view = "show", - id = area.id - } - slot.put(" ") - ui.tag{ content = "" } - end } - ui.container{ attr = { class = "phases" }, content = function() ui.container{ attr = { class = "admission" }, content = function() diff -r 99cb2d8e2f46 -r b155ca3744c5 static/style.css --- a/static/style.css Mon Mar 05 11:16:41 2012 +0100 +++ b/static/style.css Mon Mar 05 11:31:27 2012 +0100 @@ -862,7 +862,7 @@ margin-bottom: 4ex; } .area_list .area { - line-height: 28px; + line-height: 32px; clear: both; } @@ -907,12 +907,15 @@ @media screen and (max-width: 480px) { .area_list .area .name { - xdisplay: block; - xfloat: left; + display: block; } - .area_list .area .bar, - .area_list .area .membership, - .area_list .area .delegatee { + + .area_list .area .delegatee, + .area_list .area .membership { + float: left; + white-space: nowrap; + } + .area_list .area .bar { display: none; } }