1.1 --- a/static/style.css	Tue Apr 17 00:07:04 2012 +0200
     1.2 +++ b/static/style.css	Fri May 18 19:07:07 2012 +0200
     1.3 @@ -179,6 +179,7 @@
     1.4    font-weight: bold;
     1.5  }
     1.6  
     1.7 +.topbar .instance_name,
     1.8  .topbar a {
     1.9    color: #eee;
    1.10    line-height: 30px;
    1.11 @@ -194,12 +195,13 @@
    1.12    line-height: 200%;
    1.13  }
    1.14  
    1.15 -.navigation img {
    1.16 +.topbar img {
    1.17    margin-right: 0.5em;
    1.18    vertical-align: middle;
    1.19  }
    1.20  
    1.21 -.navigation a {
    1.22 +.topbar a,
    1.23 +.topbar .member_menu span {
    1.24    padding: 0 0.5em;
    1.25    float: left;
    1.26    display: block;
    1.27 @@ -210,79 +212,159 @@
    1.28    display: inline;
    1.29  }
    1.30  
    1.31 -.topbar .member_info {
    1.32 +.topbar .navigation_right {
    1.33    float: right;
    1.34    padding-right: 1%;
    1.35  }
    1.36  
    1.37 +.member_menu {
    1.38 +  float: right;
    1.39 +}
    1.40 +
    1.41 +#member_menu {
    1.42 +  position: absolute;
    1.43 +  right: 20px;
    1.44 +  top: 19px;
    1.45 +}
    1.46 +
    1.47 +#member_menu {
    1.48 +  display: none;
    1.49 +}
    1.50 +
    1.51 +.member_menu:hover #member_menu {
    1.52 +  display: block;
    1.53 +}
    1.54 +
    1.55 +#member_menu ul {
    1.56 +  list-style: none;
    1.57 +}
    1.58 +
    1.59 +#member_menu li span {
    1.60 +  background-color: #333;
    1.61 +  line-height: 200%;
    1.62 +  display: block;
    1.63 +  width: 15em;
    1.64 +  color: #fff;
    1.65 +}
    1.66 +
    1.67 +  
    1.68 +
    1.69 +#member_menu li a {
    1.70 +  background-color: #333;
    1.71 +  line-height: 200%;
    1.72 +  display: block;
    1.73 +  width: 15em;
    1.74 +}
    1.75 +
    1.76 +#member_menu a:hover {
    1.77 +  background-color: #eee;
    1.78 +  color: #000;
    1.79 +}
    1.80 +
    1.81 +
    1.82  /*************************************************************************
    1.83   * Title of current page including path and actions
    1.84   */
    1.85  
    1.86 -.title,
    1.87 -.title2,
    1.88 -.actions {
    1.89 -  background-color: #f2f2f2;
    1.90 -  margin-left: 1%;
    1.91 -  margin-right: 1%;
    1.92 -  border-left: 1px solid #bbb;
    1.93 -  border-right: 1px solid #bbb;
    1.94 +.slot_title {
    1.95 +  font-size: 120%;
    1.96 +  font-weight: bold;
    1.97 +  margin-left: 10px;
    1.98 +  margin-right: 10px;
    1.99 +  margin-top: 1ex;
   1.100 +}
   1.101 +
   1.102 +.slot_actions {
   1.103 +  margin-left: 10px;
   1.104 +  margin-top: 0.5ex;
   1.105 +  margin-bottom: 1ex;
   1.106 +}
   1.107 +
   1.108 +.page_head {
   1.109 +  background-color: #fff;
   1.110 +  margin: 0px 10px 0 10px;
   1.111 +  border: 1px solid #aaa;
   1.112 +  border-radius: 0 0 8px 8px;
   1.113 +  box-shadow: #777 0px 5px 5px -5px;
   1.114  }
   1.115  
   1.116 -.actions {
   1.117 -  border-bottom: 1px solid #bbb;
   1.118 +
   1.119 +.page_head .area_head,
   1.120 +.page_head .issue {
   1.121 +  border-top: 1px solid #000;
   1.122  }
   1.123  
   1.124 -.initiative_head .actions {
   1.125 -  border: none;
   1.126 -  box-shadow: none;
   1.127 -  -moz-box-shadow: none;
   1.128 -  -webkit-box-shadow: none;
   1.129 +.page_head .unit_head .title,
   1.130 +.page_head .area_head .title,
   1.131 +.issue .context,
   1.132 +.issue .title,
   1.133 +.initiative_head .title {
   1.134 +  margin: 8px;
   1.135 +}
   1.136 +
   1.137 +.page_head .unit_head .content,
   1.138 +.page_head .area_head .content,
   1.139 +.issue .content,
   1.140 +.initiative_head .content {
   1.141 +  margin: 0px 8px 8px 8px;
   1.142 +}
   1.143 +
   1.144 +.issue .content.actions {
   1.145 +  margin-bottom: 2.5ex;
   1.146  }
   1.147  
   1.148  
   1.149 -.slot_initiatives_list {
   1.150 -  margin-top: 1ex;
   1.151 -  margin-left: 1%;
   1.152 -  margin-right: 1%;
   1.153 -  background-color: #fcfcfc;
   1.154 -  border-radius: 8px;
   1.155 -  clear: left;
   1.156 -  border: 1px solid #aaa;
   1.157 -  padding-top: 1ex;
   1.158 -  padding-bottom: 1ex;
   1.159 +
   1.160 +.page_head .unit_head .title,
   1.161 +.page_head .area_head .title,
   1.162 +.issue .title,
   1.163 +.initiative_head .title {
   1.164 +  font-weight: bold;
   1.165 +  font-size: 120%;
   1.166  }
   1.167  
   1.168 -.title {
   1.169 -  box-shadow: inset #888 0px 5px 6px -5px;
   1.170 -  -moz-box-shadow: inset #888 0px 5px 6px -5px;;
   1.171 -  -webkit-box-shadow: inset #888 0px 5px 6px -5px;;
   1.172 +.page_head .unit_head .title .extra,
   1.173 +.page_head .area_head .title .extra,
   1.174 +.issue .title .extra {
   1.175 +  margin-left: 0.7em;
   1.176 +  font-size: 75%;
   1.177 +}
   1.178 +
   1.179 +
   1.180 +.initiative_head {
   1.181 +  margin-top: 10px;
   1.182  }
   1.183  
   1.184 -.title {
   1.185 -  color: #000;
   1.186 -  padding: 1.5ex 1ex 0 1ex;
   1.187 +
   1.188 +.delegation_info {
   1.189 +  float: right;
   1.190 +  text-decoration: none;
   1.191 +  padding: 5px;
   1.192 +  border-radius: 0px 5px 0px 5px;
   1.193  }
   1.194  
   1.195 -.title div {
   1.196 -  font-size: 125%;
   1.197 -  line-height: 110%;
   1.198 +.delegation_arrow {
   1.199 +  vertical-align: middle;
   1.200  }
   1.201  
   1.202 -.title a {
   1.203 -  color: #000;
   1.204 +.delegation_info .link {
   1.205 +  text-decoration: underline;
   1.206 +  color: #aaa;
   1.207 +}
   1.208 +
   1.209 +.delegation_info:hover {
   1.210 +  background-color: #ddd;
   1.211  }
   1.212  
   1.213 -.title .member_image {
   1.214 -  margin-right: 0.7em;
   1.215 -  vertical-align: middle;
   1.216 -  border-radius: 7px;
   1.217 +.delegation_info .micro_avatar {
   1.218 +  border: 2px solid #fff;
   1.219  }
   1.220  
   1.221 -.slot_title2 {
   1.222 -  padding: 1ex 1ex 0 1ex;
   1.223 +.delegation_info .micro_avatar.highlighted {
   1.224 +  border: 2px solid #fa0;
   1.225  }
   1.226  
   1.227 +
   1.228  .member_list .member_image_avatar {
   1.229    float: left;
   1.230    margin-right: 0.5em;
   1.231 @@ -294,66 +376,6 @@
   1.232    vertical-align: middle;
   1.233  }
   1.234  
   1.235 -.actions {
   1.236 -  font-size: 75%;
   1.237 -  line-height: 220%;
   1.238 -  padding-top: 2ex;
   1.239 -  padding-bottom: 1ex;
   1.240 -}
   1.241 -
   1.242 -.actions {
   1.243 -  border-radius: 0 0 8px 8px;
   1.244 -}
   1.245 -
   1.246 -.actions .interest,
   1.247 -.actions .delegation,
   1.248 -.actions a {
   1.249 -  margin-left: 1ex;
   1.250 -}
   1.251 -
   1.252 -.actions a {
   1.253 -  margin-top: 1px;
   1.254 -  margin-bottom: 1px;
   1.255 -}
   1.256 -
   1.257 -.actions .interest a,
   1.258 -.actions .delegation a {
   1.259 -  margin: 0;
   1.260 -}
   1.261 -
   1.262 -.initiative_head .actions {
   1.263 -  background-color: #fff;
   1.264 -  margin: 0px;
   1.265 -}
   1.266 -
   1.267 -.actions a {
   1.268 -  padding-right: 0.3em;
   1.269 -}
   1.270 -
   1.271 -.slot_initiative_head  {
   1.272 -  margin-left: 1%;
   1.273 -  margin-right: 1%;
   1.274 -  margin-top: 2ex;
   1.275 -}
   1.276 -
   1.277 -.initiative_name {
   1.278 -  font-weight: bold;
   1.279 -  font-size: 125%;
   1.280 -}
   1.281 -.actions a {
   1.282 -  float: left;
   1.283 -}
   1.284 -
   1.285 -.actions a:hover {
   1.286 -  background-color: #d7d7d7;
   1.287 -}
   1.288 -
   1.289 -.actions img {
   1.290 -  padding-left: 0.2em;
   1.291 -  padding-right: 0.2em;
   1.292 -  vertical-align: middle;
   1.293 -}
   1.294 -
   1.295  .logo { 
   1.296    float: right;
   1.297    margin-right: 1%;
   1.298 @@ -365,153 +387,6 @@
   1.299  }
   1.300  
   1.301  /*************************************************************************
   1.302 - * vote info / delegation 
   1.303 - */
   1.304 -
   1.305 -.interest,
   1.306 -.slot_support,
   1.307 -.delegation {
   1.308 -  float: left;
   1.309 -  position: relative;
   1.310 -  z-index: 1;
   1.311 -}
   1.312 -
   1.313 -.interest img,
   1.314 -.slot_support img,
   1.315 -.delegation img {
   1.316 -  padding-left: 0.2em;
   1.317 -  padding-right: 0.2em;
   1.318 -}
   1.319 -.actions .supporter,
   1.320 -.actions .potential_supporter,
   1.321 -.vote_info .head {
   1.322 -  float: left;
   1.323 -}
   1.324 -
   1.325 -.actions .supporter,
   1.326 -.actions .potential_supporter,
   1.327 -.actions .interest .head {
   1.328 -  padding-right: 0.3em;
   1.329 -}
   1.330 -
   1.331 -.delegation .head_active,
   1.332 -.interest .head_active,
   1.333 -.actions .supporter,
   1.334 -.actions .potential_supporter {
   1.335 -  border-radius: 5px;
   1.336 -  border: 1px solid #5f6675;
   1.337 -}
   1.338 -
   1.339 -.delegation .head_active,
   1.340 -.interest .head_active {
   1.341 -  background-color: #cdf;
   1.342 -}
   1.343 -
   1.344 -.actions .supporter {
   1.345 -  background-color: #cdf;
   1.346 -}
   1.347 -
   1.348 -.actions .potential_supporter {
   1.349 -  background-color: #cdf;
   1.350 -}
   1.351 -
   1.352 -.slot_support .head_initiator {
   1.353 -  background-color: #f2f2f2;
   1.354 -  border-radius: 5px;
   1.355 -}
   1.356 -
   1.357 -.delegation .change_delegation {
   1.358 -  margin-bottom: 2ex;
   1.359 -}
   1.360 -
   1.361 -.delegation .change_delegation a {
   1.362 -  display: inline;
   1.363 -  float: none;
   1.364 -  padding: 1ex;
   1.365 -}
   1.366 -
   1.367 -.delegation .delegation_participation {
   1.368 -  margin-left: 20.5em;
   1.369 -  margin-top: 3ex;
   1.370 -  font-style: italic;
   1.371 -  font-size: 80%;
   1.372 -}
   1.373 -
   1.374 -.slot_actions .change_delegation {
   1.375 -  float: left;
   1.376 -}
   1.377 -
   1.378 -.vote_info .close {
   1.379 -  position: absolute;
   1.380 -  top: 0;
   1.381 -  right: 0;
   1.382 -  padding: 1ex;
   1.383 -  display: block;
   1.384 -}
   1.385 -
   1.386 -.vote_info .content {
   1.387 -  font-size: 133%;
   1.388 -  line-height: 100%;
   1.389 -  top: 2.8ex;
   1.390 -  display: none;
   1.391 -  position: absolute;
   1.392 -  z-index: 10;
   1.393 -  background-color: #cdf;
   1.394 -  border-radius: 0 5px 5px 5px;
   1.395 -  padding: 1em;
   1.396 -  width: 35em;
   1.397 -  border: 1px solid #5f6675;
   1.398 -  border-top: none;
   1.399 -}
   1.400 -
   1.401 -.delegation_arrow {
   1.402 -  vertical-align: middle;
   1.403 -}
   1.404 -
   1.405 -.vote_info .delegation_arrow {
   1.406 -  margin-top: 1ex;
   1.407 -  margin-bottom: 1ex;
   1.408 -}
   1.409 -
   1.410 -.vote_info .delegation_arrow_overridden {
   1.411 -  opacity: 0.4;
   1.412 -}
   1.413 -
   1.414 -.vote_info .delegation_scope_overridden {
   1.415 -  color: #777;
   1.416 -}
   1.417 -
   1.418 -.vote_info .delegation_scope {
   1.419 -  display: inline;
   1.420 -}
   1.421 -
   1.422 -.vote_info .delegation_info {
   1.423 -}
   1.424 -
   1.425 -.vote_info a {
   1.426 -  padding-right: 0;
   1.427 -}
   1.428 -
   1.429 -.vote_info .member_thumb {
   1.430 -  clear: left;
   1.431 -  background: #fff;
   1.432 -}
   1.433 -
   1.434 -.delegation_overridden .member_thumb {
   1.435 -  opacity: 0.4;
   1.436 -}
   1.437 -
   1.438 -.delegation .revoke {
   1.439 -  margin: 0.5ex;
   1.440 -  float: right;
   1.441 -}
   1.442 -
   1.443 -.delegation .revoke img {
   1.444 -  vertical-align: middle;
   1.445 -}
   1.446 -
   1.447 -
   1.448 -/*************************************************************************
   1.449   * Main content
   1.450   */
   1.451  
   1.452 @@ -1000,26 +875,26 @@
   1.453  }
   1.454  
   1.455  .issues .issue {
   1.456 +  margin-top: 10px;
   1.457    background-color: #fcfcfc;
   1.458    overflow: hidden;
   1.459 -  margin-bottom: 2ex;
   1.460    border: 1px solid #aaa;
   1.461    border-radius: 8px;
   1.462  }
   1.463  
   1.464 -.issues .issue.interested,
   1.465 -.issues .issue.interest_by_delegation {
   1.466 +.issue.interested,
   1.467 +.issue.interest_by_delegation {
   1.468    border: 1px solid #b2cdff;
   1.469  }
   1.470  
   1.471 -.issues .issue .issue_info {
   1.472 +.issue .issue_info {
   1.473    padding: 1ex 1ex 0.3ex 1ex;
   1.474    line-height: 140%;
   1.475    margin-bottom: 1ex;
   1.476  }
   1.477  
   1.478 -.issues .issue.interested .issue_info,
   1.479 -.issues .issue.interested_by_delegation .issue_info  {
   1.480 +.issue.interested .issue_info,
   1.481 +.issue.interested_by_delegation .issue_info  {
   1.482    background-color: #dfeaff;
   1.483    background-image: linear-gradient(top, #dfeaff 0%, #fcfcfc 66%);
   1.484    background-image: -o-linear-gradient(top, #dfeaff 0%, #fcfcfc 66%);
   1.485 @@ -1029,11 +904,11 @@
   1.486  }
   1.487  
   1.488  .event_list .event .issue_id,
   1.489 -.issues .issue .issue_info .issue_id {
   1.490 +.issue .issue_info .issue_id {
   1.491    font-size: 125%;
   1.492  }
   1.493  
   1.494 -.issues .issue .suggestion {
   1.495 +.issue .suggestion {
   1.496    margin-left: 1ex;
   1.497    margin-bottom: 1ex;
   1.498    font-weight: bold;
   1.499 @@ -1051,11 +926,11 @@
   1.500    vertical-align: middle;
   1.501  }
   1.502  
   1.503 -.issues .issue .interest_by_delegation {
   1.504 +.issue .interest_by_delegation {
   1.505    float: right;
   1.506  }
   1.507  
   1.508 -.issues .issue .initiative_list a {
   1.509 +.issue .initiative_list a.highlighted {
   1.510    font-weight: bold;
   1.511  }
   1.512  
   1.513 @@ -1111,7 +986,7 @@
   1.514    margin-bottom: 1ex;
   1.515  }
   1.516  
   1.517 -.issues tr tr {
   1.518 +.issue tr tr {
   1.519    border: none;
   1.520    background: none;
   1.521  }
   1.522 @@ -1311,10 +1186,10 @@
   1.523  .public_access_issue_head {
   1.524    background-color: #fffbce;
   1.525    padding: 1ex;
   1.526 -  margin-top: 2ex;
   1.527 +  margin-top: 1ex;
   1.528    margin-bottom: 2ex;
   1.529 -  border-radius: 8px;
   1.530 -  border: 1px solid #ffe900;
   1.531 +  border-top: 1px solid #ffe900;
   1.532 +  border-bottom: 1px solid #ffe900;
   1.533  }
   1.534  
   1.535  .suggestion_fulfilled {
   1.536 @@ -1492,7 +1367,7 @@
   1.537    cursor: pointer;
   1.538  }
   1.539  
   1.540 -#voting .grabber {
   1.541 +#voting .movable {
   1.542    vertical-align: middle;
   1.543    cursor: move;
   1.544  }
   1.545 @@ -1547,10 +1422,13 @@
   1.546  
   1.547  /* shadows */
   1.548  
   1.549 -.box,
   1.550 -.slot_initiative_head {
   1.551 +.initiative_head,
   1.552 +.box {
   1.553    border: 1px solid #aaa;
   1.554    border-radius: 8px;
   1.555 +}
   1.556 +
   1.557 +.box {
   1.558    padding: 1ex;
   1.559  }
   1.560  
   1.561 @@ -1560,8 +1438,6 @@
   1.562  }
   1.563  
   1.564  .slot_initiatives_list,
   1.565 -.actions,
   1.566 -.issues .issue,
   1.567  .ui_tabs_links a,
   1.568  .draft_content,
   1.569  .help,
   1.570 @@ -1570,11 +1446,11 @@
   1.571  .ui_filter a.active,
   1.572  .vote_info .content,
   1.573  .member_area_list,
   1.574 -.box,
   1.575 -.slot_initiative_head {
   1.576 +.box {
   1.577    box-shadow: #777 0px 5px 5px -5px;
   1.578    -mox-box-shadow: #777 0px 5px 5px -5px;
   1.579    -webkit-box-shadow: #777 0px 5px 5px -5px;
   1.580 +  clear: both;
   1.581  }
   1.582  
   1.583  .member_area_list .box {