liquid_feedback_frontend
changeset 341:56c13151d0b8
Let delegation drop down box looks more nice
author | bsw |
---|---|
date | Tue Feb 28 19:13:50 2012 +0100 (2012-02-28) |
parents | 65561f115d26 |
children | 55662b5dd92f |
files | app/main/delegation/_show_box.lua static/style.css |
line diff
1.1 --- a/app/main/delegation/_show_box.lua Tue Feb 28 19:02:15 2012 +0100 1.2 +++ b/app/main/delegation/_show_box.lua Tue Feb 28 19:13:50 2012 +0100 1.3 @@ -214,7 +214,7 @@ 1.4 1.5 for i, record in ipairs(delegation_chain) do 1.6 local style 1.7 - local overridden = record.overridden 1.8 + local overridden = (not issue or issue.state ~= 'voting') and record.overridden 1.9 if record.scope_in then 1.10 ui.container{ 1.11 attr = { class = "delegation_info" }, 1.12 @@ -222,12 +222,12 @@ 1.13 if not overridden then 1.14 ui.image{ 1.15 attr = { class = "delegation_arrow" }, 1.16 - static = "delegation_arrow_vertical.jpg" 1.17 + static = "delegation_arrow_24_vertical.png" 1.18 } 1.19 else 1.20 ui.image{ 1.21 attr = { class = "delegation_arrow delegation_arrow_overridden" }, 1.22 - static = "delegation_arrow_vertical.jpg" 1.23 + static = "delegation_arrow_24_vertical.png" 1.24 } 1.25 end 1.26 ui.container{ 1.27 @@ -255,7 +255,7 @@ 1.28 } 1.29 end 1.30 } 1.31 - if record.participation and not record.overridden then 1.32 + if (not issue or issue.state ~= 'voting') and record.participation and not record.overridden then 1.33 ui.container{ 1.34 attr = { class = "delegation_participation" }, 1.35 content = function()
2.1 --- a/static/style.css Tue Feb 28 19:02:15 2012 +0100 2.2 +++ b/static/style.css Tue Feb 28 19:13:50 2012 +0100 2.3 @@ -462,7 +462,7 @@ 2.4 border-radius: 0 5px 5px 5px; 2.5 padding: 1em; 2.6 width: 35em; 2.7 - border: 1px solid #fff; 2.8 + border: 1px solid #5f6675; 2.9 border-top: none; 2.10 } 2.11 2.12 @@ -1363,7 +1363,8 @@ 2.13 .help, 2.14 .use_terms, 2.15 .motd, 2.16 -.ui_filter a.active { 2.17 +.ui_filter a.active, 2.18 +.vote_info .content { 2.19 box-shadow: #777 0px 5px 5px -5px; 2.20 -mox-box-shadow: #777 0px 5px 5px -5px; 2.21 -webkit-box-shadow: #777 0px 5px 5px -5px;