slitaz-forge rev 6

Fix and sync CSS and layout
author Christophe Lincoln <pankso@slitaz.org>
date Mon Jan 31 23:29:53 2011 +0100 (2011-01-31)
parents ae25e2353d3f
children 7775f0e4d0eb
files labs/redmine/app/views/layouts/base.rhtml labs/redmine/themes/slitaz-4.0/logo.png labs/redmine/themes/slitaz-4.0/stylesheets/application.css
line diff
     1.1 --- a/labs/redmine/app/views/layouts/base.rhtml	Thu Jan 27 00:58:15 2011 +0100
     1.2 +++ b/labs/redmine/app/views/layouts/base.rhtml	Mon Jan 31 23:29:53 2011 +0100
     1.3 @@ -4,7 +4,7 @@
     1.4  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     1.5  <title><%=h html_title %></title>
     1.6  <meta name="description" content="<%= Redmine::Info.app_name %>" />
     1.7 -<meta name="keywords" content="slitaz,issue,bug,tracker" />
     1.8 +<meta name="keywords" content="slitaz,issue,bug,tracker,labs" />
     1.9  <%= favicon %>
    1.10  <%= stylesheet_link_tag 'application', :media => 'all' %>
    1.11  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
    1.12 @@ -42,14 +42,6 @@
    1.13          <%= render_project_jump_box %>
    1.14      </div>
    1.15      
    1.16 -    <!-- Header -->
    1.17 -<div id="header">
    1.18 -	<!-- Logo -->
    1.19 -	<a href="http://www.slitaz.org/"><img id="logo"
    1.20 -		src="pics/website/logo.png" 
    1.21 -		title="www.slitaz.org" alt="www.slitaz.org" /></a>
    1.22 -	<p id="titre">#!/page_header_title</p>
    1.23 -</div>
    1.24      <h1><%= page_header_title %></h1>
    1.25      
    1.26      <% if display_main_menu?(@project) %>
    1.27 @@ -74,7 +66,10 @@
    1.28  </div>
    1.29  
    1.30  <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
    1.31 -	
    1.32 +
    1.33 +</div>
    1.34 +</div>
    1.35 +<%= call_hook :view_layouts_base_body_bottom %>
    1.36  
    1.37  <!-- Footer -->
    1.38  <div id="footer">
    1.39 @@ -89,24 +84,18 @@
    1.40  			<li><a href="http://distrowatch.com/slitaz">SliTaz on DistroWatch</a></li>
    1.41  		</ul>
    1.42  	</div>
    1.43 +	<div class="left_box">
    1.44  	<h4>SliTaz Website</h4>
    1.45  	<ul>
    1.46  		<li><a href="#header">Top of the page</a></li>
    1.47  		<li>Copyright &copy; <span class="year"></span>
    1.48  			<a href="http://www.slitaz.org/">SliTaz</a></li>
    1.49 -		<li><a href="about/">About the project</a></li>
    1.50 -		<li><a href="netmap.php">Network Map</a></li>
    1.51 -		<li>Page modified the <?php echo (date( "d M Y", getlastmod())); ?></li>
    1.52 -		<li><a href="http://validator.w3.org/check?uri=referer"><img
    1.53 -		src="pics/website/xhtml10.png" alt="Valid XHTML 1.0"
    1.54 -		title="Code validé XHTML 1.0"
    1.55 -		style="width: 80px; height: 15px; vertical-align: middle;" /></a></li>
    1.56 +		<li><a href="http://www.slitaz.org/en/about/">About the project</a></li>
    1.57 +		<li><a href="http://www.slitaz.org/netmap.php">Network Map</a></li>
    1.58 +		<li>Powered By Redmine</li>
    1.59  	</ul>
    1.60 +	</div>
    1.61  </div>
    1.62  
    1.63 -
    1.64 -</div>
    1.65 -</div>
    1.66 -<%= call_hook :view_layouts_base_body_bottom %>
    1.67  </body>
    1.68  </html>
     2.1 Binary file labs/redmine/themes/slitaz-4.0/logo.png has changed
     3.1 --- a/labs/redmine/themes/slitaz-4.0/stylesheets/application.css	Thu Jan 27 00:58:15 2011 +0100
     3.2 +++ b/labs/redmine/themes/slitaz-4.0/stylesheets/application.css	Mon Jan 31 23:29:53 2011 +0100
     3.3 @@ -1,27 +1,32 @@
     3.4  @import url(../../../stylesheets/application.css);
     3.5  
     3.6 +html { overflow-y: visible;}
     3.7 +
     3.8  body {
     3.9  	background-color:#ffffff;
    3.10  	border-top: 34px solid #f1f1f1;
    3.11 +	margin: 0;
    3.12  }
    3.13  
    3.14  #wrapper {
    3.15 -	background-color: #eeeeee;
    3.16 +	background-color: white;
    3.17  }
    3.18  
    3.19  #top-menu {
    3.20  	position: absolute;
    3.21 -	top: 0;
    3.22 +	top: 4px;
    3.23  	background: transparent;
    3.24  	width: 100%;
    3.25  	font-size: 11px;
    3.26  	color: #000000;
    3.27 +	padding: 0 4px;
    3.28  }
    3.29 -#loggedas { color: #000000; }
    3.30 +#loggedas { color: #351a0a; font-weight: bold; }
    3.31  #top-menu a {
    3.32  	background: transparent;
    3.33  	color: #0F314E;
    3.34  	text-decoration: none;
    3.35 +	margin: 0;
    3.36  }
    3.37  #top-menu a:hover {
    3.38  	color: #b64b22;
    3.39 @@ -36,11 +41,31 @@
    3.40  	border-top: 1px solid black;
    3.41  	border-bottom: 1px solid #999;
    3.42  	margin-bottom: 33px;
    3.43 +	padding: 0;
    3.44 +	
    3.45  }
    3.46  #header h1 { 
    3.47  	color: #f1f1f1;
    3.48 +	padding: 10px;
    3.49 +	font-size: 18px;
    3.50  }
    3.51  
    3.52 +#header h1 a:hover { 
    3.53 +	color: #b64b22;
    3.54 +	text-decoration: none;
    3.55 +}
    3.56 +
    3.57 +#logo {
    3.58 +	position: absolute;
    3.59 +	float: left;
    3.60 +	left: 16px;
    3.61 +	top: -10px;
    3.62 +	width: 200px;
    3.63 +	height: 74px;
    3.64 +}
    3.65 +
    3.66 +#quick-search { padding: 8px; }
    3.67 +
    3.68  #main {
    3.69  	background: white;
    3.70  	margin: 0px 0px 0px 0px;
    3.71 @@ -56,6 +81,8 @@
    3.72  /* Footer */
    3.73  
    3.74  #footer {
    3.75 +	text-align: left;
    3.76 +	font-size: 13px;
    3.77  	margin: 0px 80px 80px 80px;
    3.78  	padding: 10px;
    3.79  	background: #eaeaea;
    3.80 @@ -76,33 +103,51 @@
    3.81  #footer li { padding: 2px; }
    3.82  #footer h4 { margin: 0 20px; font-size: 125%; }
    3.83  
    3.84 +
    3.85 +.right_box { width: 48%; float: right; }
    3.86 +.left_box { width: 48%; float: left; }
    3.87 +
    3.88  /* Headers */
    3.89  h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 {border-bottom: 0px;}
    3.90  
    3.91  h2 {
    3.92 -    color: #DF8F06;
    3.93 -    border-left: 10px solid #F3F3F3;
    3.94 -    padding: 4px 0px 4px 4px;
    3.95 -    margin: 0px 0px 4px 0px;
    3.96 +	color: #b64b22;
    3.97 +	padding: 0;
    3.98 +	margin: 20px 0 5px 0;
    3.99 +	font-size: 130%;
   3.100 +	font-weight: bold;
   3.101 +}
   3.102 +h3 {
   3.103 +	font-weight: bold;
   3.104 +	color: #666666;
   3.105 +	background: transparent;
   3.106  }
   3.107  
   3.108  /* Menu */
   3.109 -#main-menu li a {
   3.110 +
   3.111 +#main-menu {
   3.112 +	position: absolute;
   3.113 +	top: 50px;
   3.114 +	left: 20px;
   3.115  	font-size: 11px;
   3.116  	font-weight: bold;
   3.117 -	color: #3E1220;
   3.118 -	background: inherit;
   3.119 +}
   3.120 +
   3.121 +#main-menu li a {
   3.122  	padding: 0px 4px 6px 4px;
   3.123 +	color: #0F314E;
   3.124  }
   3.125  
   3.126  #main-menu li a:hover {
   3.127  	text-decoration: underline;
   3.128 -	color: #DF8F06;
   3.129 +	color: #b64b22;
   3.130  	background-color: transparent;
   3.131  	text-decoration: none;
   3.132  }
   3.133  
   3.134 -#main-menu li a.selected, #main-menu li a.selected:hover { background-color: transparent; }
   3.135 +#main-menu li a.selected, #main-menu li a.selected:hover {
   3.136 +	color: #351a0a;
   3.137 +	background-color: transparent; }
   3.138  
   3.139  #sidebar{
   3.140  	/* background-color: #eeeeee; */
   3.141 @@ -174,3 +219,19 @@
   3.142  
   3.143  /* Misc */
   3.144  .box { background-color: #fcfcfc; }
   3.145 +
   3.146 +ul.projects div.root { 
   3.147 +	margin-top: 10px;
   3.148 +	background-color: #f8f8f8;
   3.149 +	padding: 5px 10px;
   3.150 +	border-radius: 8px;
   3.151 +	-moz-border-radius: 8px;
   3.152 +	-webkit-border-radius: 8px;
   3.153 +	-moz-box-shadow: 0 1px 3px #666;
   3.154 +	-webkit-box-shadow: 0 1px 3px #666;
   3.155 +	box-shadow: 0 1px 3px #666;
   3.156 +}
   3.157 +
   3.158 +
   3.159 +
   3.160 +