liquid_feedback_frontend
changeset 431:9ce4da0e0783
Set maximum width of application
| author | bsw |
|---|---|
| date | Sat Mar 10 20:28:57 2012 +0100 (2012-03-10) |
| parents | 1437fba776b9 |
| children | 85b6ff17d728 |
| files | app/main/_layout/default.html app/main/initiative/_show.lua static/style.css |
line diff
1.1 --- a/app/main/_layout/default.html Sat Mar 10 19:18:25 2012 +0100 1.2 +++ b/app/main/_layout/default.html Sat Mar 10 20:28:57 2012 +0100 1.3 @@ -12,62 +12,66 @@ 1.4 </head> 1.5 <body> 1.6 <div class="topbar"> 1.7 - <div class="logout_button" id="logout_button"> 1.8 - <!-- WEBMCP SLOT logout_button --> 1.9 - </div> 1.10 - <div class="searchbox" id="searchbox"> 1.11 - <!-- WEBMCP SLOT searchbox --> 1.12 - </div> 1.13 - <div class="navigation" id="navigation"> 1.14 - <!-- WEBMCP SLOT navigation --> 1.15 + <div class="topbar_content"> 1.16 + <div class="logout_button" id="logout_button"> 1.17 + <!-- WEBMCP SLOT logout_button --> 1.18 + </div> 1.19 + <div class="searchbox" id="searchbox"> 1.20 + <!-- WEBMCP SLOT searchbox --> 1.21 + </div> 1.22 + <div class="navigation" id="navigation"> 1.23 + <!-- WEBMCP SLOT navigation --> 1.24 + </div> 1.25 + <br style="clear: both;" /> 1.26 </div> 1.27 - <br style="clear: both;" /> 1.28 - </div> 1.29 - <div class="layout_notice" id="layout_notice" onclick="document.getElementById('layout_notice').style.display='none';"> 1.30 - <!-- WEBMCP SLOT notice --> 1.31 - </div> 1.32 - <div class="layout_warning" id="layout_warning" onclick="document.getElementById('layout_warning').style.display='none';"> 1.33 - <!-- WEBMCP SLOT warning --> 1.34 - </div> 1.35 - <div class="layout_error" id="layout_error" onclick="document.getElementById('layout_error').style.display='none';"> 1.36 - <!-- WEBMCP SLOT error --> 1.37 - </div> 1.38 - <div class="logo" id="logo"> 1.39 - <!-- WEBMCP SLOT logo --> 1.40 - </div> 1.41 - <div class="help_hidden" id="help_hidden"> 1.42 - <!-- WEBMCP SLOT help_hidden --> 1.43 </div> 1.44 - <div class="title" id="title"> 1.45 - <!-- WEBMCP SLOT title --> 1.46 - </div> 1.47 - <div class="title2" id="title2"> 1.48 - <!-- WEBMCP SLOT title2 --> 1.49 - </div> 1.50 - <div class="actions" id="actions"> 1.51 - <div class="interest vote_info" id="interest"> 1.52 - <!-- WEBMCP SLOT interest --> 1.53 + <div class="page"> 1.54 + <div class="layout_notice" id="layout_notice" onclick="document.getElementById('layout_notice').style.display='none';"> 1.55 + <!-- WEBMCP SLOT notice --> 1.56 + </div> 1.57 + <div class="layout_warning" id="layout_warning" onclick="document.getElementById('layout_warning').style.display='none';"> 1.58 + <!-- WEBMCP SLOT warning --> 1.59 + </div> 1.60 + <div class="layout_error" id="layout_error" onclick="document.getElementById('layout_error').style.display='none';"> 1.61 + <!-- WEBMCP SLOT error --> 1.62 + </div> 1.63 + <div class="logo" id="logo"> 1.64 + <!-- WEBMCP SLOT logo --> 1.65 + </div> 1.66 + <div class="help_hidden" id="help_hidden"> 1.67 + <!-- WEBMCP SLOT help_hidden --> 1.68 + </div> 1.69 + <div class="title" id="title"> 1.70 + <!-- WEBMCP SLOT title --> 1.71 + </div> 1.72 + <div class="title2" id="title2"> 1.73 + <!-- WEBMCP SLOT title2 --> 1.74 </div> 1.75 - <!-- WEBMCP SLOT actions --> 1.76 - <div style="clear: left;"></div> 1.77 - </div> 1.78 - <div class="initiatives_list" id="initiatives_list"> 1.79 - <!-- WEBMCP SLOT initiatives_list --> 1.80 - </div> 1.81 - <div class="initiative_head" id="initiative_head"> 1.82 - <!-- WEBMCP SLOT initiative_head --> 1.83 - </div> 1.84 - <div class="support vote_info" id="support"> 1.85 - <!-- WEBMCP SLOT support --> 1.86 - </div> 1.87 - <div class="initiative_main" id="initiative_main"> 1.88 - <!-- WEBMCP SLOT initiative_main --> 1.89 - </div> 1.90 - <div class="main" id="default"> 1.91 - <!-- WEBMCP SLOT default --> 1.92 - </div> 1.93 - <div class="footer" id="footer"> 1.94 - <!-- WEBMCP SLOT footer --> 1.95 + <div class="actions" id="actions"> 1.96 + <div class="interest vote_info" id="interest"> 1.97 + <!-- WEBMCP SLOT interest --> 1.98 + </div> 1.99 + <!-- WEBMCP SLOT actions --> 1.100 + <div style="clear: left;"></div> 1.101 + </div> 1.102 + <div class="initiatives_list" id="initiatives_list"> 1.103 + <!-- WEBMCP SLOT initiatives_list --> 1.104 + </div> 1.105 + <div class="initiative_head" id="initiative_head"> 1.106 + <!-- WEBMCP SLOT initiative_head --> 1.107 + </div> 1.108 + <div class="support vote_info" id="support"> 1.109 + <!-- WEBMCP SLOT support --> 1.110 + </div> 1.111 + <div class="initiative_main" id="initiative_main"> 1.112 + <!-- WEBMCP SLOT initiative_main --> 1.113 + </div> 1.114 + <div class="main" id="default"> 1.115 + <!-- WEBMCP SLOT default --> 1.116 + </div> 1.117 + <div class="footer" id="footer"> 1.118 + <!-- WEBMCP SLOT footer --> 1.119 + </div> 1.120 </div> 1.121 <div class="layout_trace" id="layout_trace" style="xdisplay: none"> 1.122 <div id="trace_show" onclick="document.getElementById('trace_content').style.display='block';this.style.display='none';">TRACE</div>
2.1 --- a/app/main/initiative/_show.lua Sat Mar 10 19:18:25 2012 +0100 2.2 +++ b/app/main/initiative/_show.lua Sat Mar 10 20:28:57 2012 +0100 2.3 @@ -304,6 +304,7 @@ 2.4 } 2.5 2.6 if initiative.issue.snapshot then 2.7 + slot.put("<br />") 2.8 ui.field.timestamp{ label = _"Last snapshot:", value = initiative.issue.snapshot } 2.9 end 2.10
3.1 --- a/static/style.css Sat Mar 10 19:18:25 2012 +0100 3.2 +++ b/static/style.css Sat Mar 10 20:28:57 2012 +0100 3.3 @@ -60,6 +60,16 @@ 3.4 margin: 0; 3.5 } 3.6 3.7 +.page { 3.8 + max-width: 1130px; 3.9 + margin: 0 auto; 3.10 +} 3.11 + 3.12 +.topbar_content { 3.13 + max-width: 1104px; 3.14 + margin: 0 auto; 3.15 +} 3.16 + 3.17 table { 3.18 margin-top: 1ex; 3.19 } 3.20 @@ -159,7 +169,6 @@ 3.21 color-stop(0%, #888), color-stop(25%,#333) 3.22 ); 3.23 font-size: 90%; 3.24 - padding-left: 1%; 3.25 box-shadow: #aaa 0 0 5px; 3.26 overflow: hidden; 3.27 -mox-box-shadow: #aaa 0 0 5px; 3.28 @@ -167,6 +176,7 @@ 3.29 } 3.30 3.31 .topbar .logolf { 3.32 + margin-left: 1%; 3.33 font-weight: bold; 3.34 } 3.35 3.36 @@ -201,39 +211,7 @@ 3.37 3.38 .topbar .member_info { 3.39 float: right; 3.40 -} 3.41 - 3.42 -.searchbox { 3.43 - margin: 0; 3.44 - padding: 0.1ex 1em 0ex 1em; 3.45 - float: right; 3.46 -} 3.47 - 3.48 -.searchbox form { 3.49 - float: left; 3.50 - margin: 0px; 3.51 -} 3.52 - 3.53 -.searchbox div { 3.54 - display: inline; 3.55 -} 3.56 - 3.57 -.searchbox select { 3.58 - margin-left: 0.3em; 3.59 - margin-right: 0.4em; 3.60 - font-size: 100%; 3.61 - width: 8em; 3.62 -} 3.63 - 3.64 -.searchbox input[type=text] { 3.65 - width: 8em; 3.66 - padding: 0.25ex 0.25em 0.25ex 0.25em; 3.67 - margin-right: 0.5em; 3.68 - font-size: 100%; 3.69 -} 3.70 - 3.71 -.searchbox input[type=submit] { 3.72 - font-size: 100%; 3.73 + margin-right: 1%; 3.74 } 3.75 3.76 /************************************************************************* 3.77 @@ -377,7 +355,7 @@ 3.78 3.79 .logo { 3.80 float: right; 3.81 - margin-right: 1em; 3.82 + margin-right: 1%; 3.83 } 3.84 3.85