liquid_feedback_frontend
changeset 623:8478b5027817
Optical enhancements, going to blue
author | bsw |
---|---|
date | Mon Jun 25 16:26:53 2012 +0200 (2012-06-25) |
parents | cc542ac26edc |
children | 0c756a7fb8e7 |
files | app/main/index/_member_home.lua app/main/issue/_show.lua static/style.css |
line diff
1.1 --- a/app/main/index/_member_home.lua Mon Jun 25 15:27:23 2012 +0200 1.2 +++ b/app/main/index/_member_home.lua Mon Jun 25 16:26:53 2012 +0200 1.3 @@ -115,24 +115,25 @@ 1.4 } 1.5 } 1.6 end 1.7 - end 1.8 - 1.9 + end 1.10 + 1.11 if area_count == 0 and member:has_voting_right_for_unit_id(unit.id) or 1.12 more_area_count > 0 then 1.13 1.14 - ui.container{ attr = { class = "area" }, content = function() 1.15 - ui.container{ attr = { class = "content" }, content = function() 1.16 - if more_area_text then 1.17 - ui.link{ module = "unit", view = "show", id = unit.id, text = more_area_text } 1.18 - end 1.19 - if delegated_text then 1.20 - slot.put(" · ") 1.21 - ui.tag{ content = delegated_text } 1.22 - end 1.23 - end } 1.24 - end } 1.25 end 1.26 end } 1.27 + ui.container{ attr = { class = "area", style="margin-top: 1ex; margin-left: 10px;" }, content = function() 1.28 + ui.container{ attr = { class = "title" }, content = function() 1.29 + if more_area_text then 1.30 + ui.link{ module = "unit", view = "show", id = unit.id, text = more_area_text } 1.31 + end 1.32 + if delegated_text then 1.33 + slot.put(" · ") 1.34 + ui.tag{ content = delegated_text } 1.35 + end 1.36 + end } 1.37 + end } 1.38 + slot.put("<br />") 1.39 end 1.40 end 1.41
2.1 --- a/app/main/issue/_show.lua Mon Jun 25 15:27:23 2012 +0200 2.2 +++ b/app/main/issue/_show.lua Mon Jun 25 16:26:53 2012 +0200 2.3 @@ -239,5 +239,6 @@ 2.4 } 2.5 } 2.6 end } 2.7 + slot.put("<br />") 2.8 end } 2.9
3.1 --- a/static/style.css Mon Jun 25 15:27:23 2012 +0200 3.2 +++ b/static/style.css Mon Jun 25 16:26:53 2012 +0200 3.3 @@ -362,7 +362,6 @@ 3.4 font-size: 75%; 3.5 } 3.6 3.7 -.page_head .unit_head .content, 3.8 .page_head .area_head .content, 3.9 .page_head .area_head .content a, 3.10 .page_head .issue .content.actions, 3.11 @@ -374,35 +373,35 @@ 3.12 color: #000; 3.13 } 3.14 3.15 -x.page_head .unit_head .title, 3.16 -x.page_head .area_head .title, 3.17 -x.issue .title { 3.18 - background-color: #eee; 3.19 - background-image: linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); 3.20 - background-image: -o-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); 3.21 - background-image: -moz-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); 3.22 - background-image: -webkit-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); 3.23 - background-image: -ms-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); 3.24 + 3.25 +.unit_head { 3.26 + background-color: #44a; 3.27 + background-image: -webkit-linear-gradient(top, #67d, #23a); 3.28 } 3.29 -/* 3.30 -.unit_head { 3.31 - background-color: #cdf; 3.32 - background-image: -webkit-linear-gradient(top, #abf 0%, #cdf 20%, #f0f7ff 100%); 3.33 + 3.34 +.unit_head:last-child { 3.35 + border-radius: 0 0 8px 8px; 3.36 +} 3.37 + 3.38 +.area_head:last-child { 3.39 + border-radius: 0 0 8px 8px; 3.40 } 3.41 3.42 -.area_head { 3.43 - background-color: #def; 3.44 - background-image: -webkit-linear-gradient(top, #bef 0%, #def 20%, #f7faff 100%); 3.45 +.unit_head .content, .unit_head a { 3.46 + color: #fff; 3.47 +} 3.48 +.area_head, 3.49 +.area_list .area_head { 3.50 + background-color: #abf; 3.51 + background-image: -webkit-linear-gradient(top, #cdf, #bcf); 3.52 } 3.53 3.54 +.area_list .area > .content, 3.55 .issue { 3.56 - background-color: #f0f7ff; 3.57 - background-image: -webkit-linear-gradient(top, #f0faff 0%, #f0f7ff 20%, #fff 100%); 3.58 + background-color: #e0e9ff; 3.59 + background-image: -webkit-linear-gradient(top, #f7faff, #e0e9ff); 3.60 } 3.61 -*/ 3.62 -.issue .initiative_list { 3.63 - background: #fff; 3.64 -} 3.65 + 3.66 3.67 x { 3.68 background-image: linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); 3.69 @@ -412,11 +411,6 @@ 3.70 background-image: -ms-linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%); 3.71 } 3.72 3.73 -.page_head .area_head .title, 3.74 -.page_head .issue .title { 3.75 - border-top: 1px solid #ddd; 3.76 -} 3.77 - 3.78 3.79 .delegation_info { 3.80 float: right; 3.81 @@ -443,7 +437,7 @@ 3.82 } 3.83 3.84 .delegation_info .micro_avatar.highlighted { 3.85 - border: 2px solid #fa0; 3.86 + border: 2px solid #fc0; 3.87 } 3.88 3.89 3.90 @@ -497,13 +491,12 @@ 3.91 font-weight: bold; 3.92 } 3.93 3.94 -.ui_tabs_links a:hover { 3.95 - box-shadow: 0px 0px 5px 0px #fc0; 3.96 - text-decoration: none; 3.97 +.ui_tabs_links a:hover, 3.98 +.ui_tabs_links a.selected { 3.99 + box-shadow: 0px 0px 5px 3px #fc0; 3.100 } 3.101 3.102 .ui_tabs_links a.selected { 3.103 - box-shadow: 0px 0px 3px 3px #fc0; 3.104 text-decoration: none; 3.105 } 3.106 3.107 @@ -777,25 +770,32 @@ 3.108 * Area list 3.109 */ 3.110 .area_list { 3.111 - border: 1px solid #aaa; 3.112 - border-radius: 8px; 3.113 + border: 1px solid #54c; 3.114 + border-radius: 10px; 3.115 margin-top: 2ex; 3.116 } 3.117 3.118 -.area_list .unit_head, 3.119 .area_list .area { 3.120 - border-bottom: 1px solid #aaa; 3.121 + border-top: 1px solid #44a; 3.122 +} 3.123 + 3.124 +.area_list .area:first-child { 3.125 + border-top: none; 3.126 } 3.127 3.128 .area_list .unit_head { 3.129 border-radius: 8px 8px 0 0; 3.130 } 3.131 3.132 -.area_list .area:last-child { 3.133 +.area_list .unit_head:last-child { 3.134 + border-radius: 8px; 3.135 +} 3.136 + 3.137 +.area_list .area:last-child .content:last-child{ 3.138 border-radius: 0 0 8px 8px; 3.139 } 3.140 3.141 -.area_list .area:first-child { 3.142 +.area_list .area:first-child .area_head { 3.143 border-radius: 8px 8px 0 0; 3.144 } 3.145 3.146 @@ -1049,7 +1049,7 @@ 3.147 } 3.148 3.149 .member_thumb.in_delegation_chain { 3.150 - border: 2px solid #fa0; 3.151 + border: 2px solid #fc0; 3.152 } 3.153 3.154 .member_statement,