Merge branch 'release-2.9'

Conflicts:
	archetypes/sonar-basic-plugin/pom.xml
	archetypes/sonar-gwt-plugin/pom.xml
	plugins/sonar-checkstyle-plugin/pom.xml
	plugins/sonar-cobertura-plugin/pom.xml
	plugins/sonar-core-gwt/pom.xml
	plugins/sonar-core-plugin/pom.xml
	plugins/sonar-cpd-plugin/pom.xml
	plugins/sonar-dbcleaner-plugin/pom.xml
	plugins/sonar-design-plugin/pom.xml
	plugins/sonar-findbugs-plugin/pom.xml
	plugins/sonar-googleanalytics-plugin/pom.xml
	plugins/sonar-pmd-plugin/pom.xml
	plugins/sonar-squid-java-plugin/pom.xml
	plugins/sonar-surefire-plugin/pom.xml
	pom.xml
	samples/pom.xml
	sonar-application/pom.xml
	sonar-batch-bootstrapper/pom.xml
	sonar-batch-maven-compat/pom.xml
	sonar-batch/pom.xml
	sonar-channel/pom.xml
	sonar-check-api/pom.xml
	sonar-colorizer/pom.xml
	sonar-core-maven-plugin/pom.xml
	sonar-core/pom.xml
	sonar-deprecated/pom.xml
	sonar-duplications/pom.xml
	sonar-graph/pom.xml
	sonar-gwt-api/pom.xml
	sonar-java-api/pom.xml
	sonar-markdown/pom.xml
	sonar-maven-plugin/pom.xml
	sonar-maven3-plugin/pom.xml
	sonar-plugin-api/pom.xml
	sonar-server/pom.xml
	sonar-squid/pom.xml
	sonar-testing-harness/pom.xml
	sonar-ws-client/pom.xml

12 files changed, 128 insertions, 59 deletions

diff --git a/KEYS b/KEYS
new file mode 100644
index 00000000000..6b79d6c9722
--- /dev/null
+++ b/KEYS
@@ -0,0 +1,38 @@
+pub   2048R/45608177 2011-07-17
+uid                  Simon Brandhof (Simon Brandhof at SonarSource) <simon.brandhof@sonarsource.com>
+sig 3        45608177 2011-07-17  Simon Brandhof (Simon Brandhof at SonarSource) <simon.brandhof@sonarsource.com>
+sub   2048R/F1CA697E 2011-07-17
+sig          45608177 2011-07-17  Simon Brandhof (Simon Brandhof at SonarSource) <simon.brandhof@sonarsource.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+mQENBE4jJ4oBCADc5clOnKF3cDS+xflqAntcyCAgzIkk7I4nkoVbdqrPNVhHQoqc
+iujQ2pel0aDllo9znSvWOZ6lJqEc1uMNpYF4EPZHVLoBknjvwq2zIENc5XYqzqtj
+iDu0gT5V2T87HQGpLjdInsp2SbaZQpXwUD7CAnFPOwLliyAKxj8Q4/HnUnvSBFo0
+dnQiooruWhwLZJM6vgIuUP21GmqRZi6eHK1NlTQrw+DSyXh9KBP6HkFHsoerZWBI
+3MF8/jaaExObhv6Sr3FjSXTemeGgMfxYgrBnuS0oerPk4kdcS4ZEV+OsU1BdjsTC
+2Lki2ragEArxiTcKfLmTqaV2G44kjQ9MvtwNABEBAAG0T1NpbW9uIEJyYW5kaG9m
+IChTaW1vbiBCcmFuZGhvZiBhdCBTb25hclNvdXJjZSkgPHNpbW9uLmJyYW5kaG9m
+QHNvbmFyc291cmNlLmNvbT6JATgEEwECACIFAk4jJ4oCGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJENLqiPxFYIF34zwH/0KQFmq/Tr3b/b6tTRk1MOYsgabB
+Al8xwdrW34QCYGIb8zZfDFPzs3dwxl6ztdnhv3vZ1jMVCZPh9o17X4m/dyBVbYxx
+vwGuVzPx0rKrazLoWhTkHegiyleCn850Svr0bISV2tAzB44k5Pvn7sLXl3OlK8iV
+ggH42ydxreD7Xr6MjOxllEFxpyVoA3oQ0H03iMWYPZlKTepQIsBA4fp9gFoGDJ50
+MquuIRZjkxA//GdC+Kuc2AsyYy5j84SVb8jUgm7DJdadQribISNNNfgIasEySwrq
+BWzAGQP2rV4cNOBAwgIqm/1Lrip4IDdHRdoDna+lfJk39EO/xtPZReveVbO5AQ0E
+TiMnigEIALCgeSpYETLBw5rTd/UV7pJn/pDHmBmXUYl1XHc04bhdo4Igi6bMhw+l
+plfW2v+uLayzNkLPypYQD0dhlFwvGpJUAGxkQ+qJ4BGaOU4iQkE2GPO/Z3TJ/U7G
+xElggB/3P/8OJXArYAfw6ZJuwKVukCvUBw2d7FDvIfqGLw2qcduMLYvUWEfxkGGX
+IclPZEYBNoagjJiRuYBDcP6XGTFEOYWU8xzHvhUiNVB3LtzuQB6G8F47v3sgqncH
+ZN//G1X4pCWj8D6o0ApC0ybdAVr7UgSY+Npv3MpAauWPwVY/bl9ZqK982aublQjX
+mwDvrjsaGDrk8994aM27FQr1CEmnPSkAEQEAAYkBHwQYAQIACQUCTiMnigIbDAAK
+CRDS6oj8RWCBdz1zCACrGcVL/Dwvv3QQojK8iTK750UTJSNR9o7B9djrI6nzWQBF
+FBom1ltS6AsVrCg2Ay0+QHh8Gsbt2BbnwHsRP6mm9BRh+L31UqHmmKEObPXjxHTJ
+EeVMzxWZTc7m2nKHWiLRSI3EKNR2aLKBNdEZfrBu03yDEHQC6YfdpN7uBOrXERYY
+3Z889ki3IBCqsDazQy6fdnSY+VLULNazSysAfxhF8Y54mh7HkfVILEH20EzSZwM9
+jag/kY7+eBcE1PMEnbTThxEjgkP8MQxlXKAKYK+uQZ8W3nhoTAJ3gOvC+vRyqdJN
+CaXXlN+Kg2r0u1wfB2HMck/nXevBwFFneBc6zx7l
+=U0nu
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/pom.xml b/pom.xml
index 9e0ef8dbe45..670a1365265 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,13 +64,13 @@
 
   <distributionManagement>
     <repository>
-      <id>codehaus.org</id>
+      <id>codehaus-releases</id>
+      <name>Codehaus Release Repository</name>
       <url>dav:https://dav.codehaus.org/repository/sonar</url>
-      <uniqueVersion>false</uniqueVersion>
     </repository>
     <snapshotRepository>
-      <id>codehaus.org</id>
-      <url>dav:https://dav.codehaus.org/snapshots.repository/sonar</url>
+      <id>sonar-snapshots</id>
+      <url>${sonar.snapshotRepository.url}</url>
       <uniqueVersion>false</uniqueVersion>
     </snapshotRepository>
   </distributionManagement>
@@ -98,14 +98,15 @@
     -->
     <derby.version>10.7.1.1</derby.version>
     <jetty.version>6.1.24</jetty.version>
-    <sonar.skippedModules>sonar-deprecated,sonar-gwt-api,sonar-core-gwt,sonar-testing-harness,sonar-samples</sonar.skippedModules>
+    <sonar.skippedModules>sonar-deprecated,sonar-gwt-api,sonar-core-gwt,sonar-testing-harness,sonar-samples
+    </sonar.skippedModules>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.min.version>2.0</maven.min.version>
     <jdk.min.version>1.5</jdk.min.version>
 
     <!-- default GWT configuration. It's overridden by the profile 'dev' to speed up compilation in dev environments-->
     <gwt.permutationSuffix/>
     <gwt.extraJvmArgs>-Xmx512m -Xss1024k</gwt.extraJvmArgs>
+    <sonar.snapshotRepository.url>dav:https://dav.codehaus.org/snapshots.repository/sonar</sonar.snapshotRepository.url>
   </properties>
 
   <build>
@@ -183,6 +184,11 @@
           <version>2.9</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.1</version>
+        </plugin>
+        <plugin>
           <!-- not thread safe -->
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>gwt-maven-plugin</artifactId>
@@ -221,7 +227,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.1</version>
+          <version>2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -336,9 +342,8 @@
             <configuration>
               <rules>
                 <requireMavenVersion>
-                  <message>To build this project Maven ${maven.min.version} (or upper) is required. Please install it.
-                  </message>
-                  <version>${maven.min.version}</version>
+                  <version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
+                  <message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -375,9 +380,12 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>
+          <tagNameFormat>@{project.version}</tagNameFormat>
           <autoVersionSubmodules>true</autoVersionSubmodules>
           <localCheckout>true</localCheckout>
           <pushChanges>false</pushChanges>
+          <releaseProfiles>release</releaseProfiles>
+          <goals>deploy</goals>
         </configuration>
       </plugin>
       <plugin>
@@ -451,7 +459,7 @@
             <id>attach-sources</id>
             <phase>verify</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>jar-no-fork</goal>
             </goals>
           </execution>
         </executions>
@@ -958,7 +966,7 @@
   <scm>
     <connection>scm:git:git@github.com:SonarSource/sonar.git</connection>
     <developerConnection>scm:git:git@github.com:SonarSource/sonar.git</developerConnection>
-    <url>scm:git:git@github.com:SonarSource/sonar.git</url>
+    <url>https://github.com/SonarSource/sonar</url>
   </scm>
 
   <ciManagement>
@@ -1048,6 +1056,19 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 77e45c68e3c..32072863f92 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.sonar</groupId>
@@ -38,8 +37,8 @@
             <phase>package</phase>
             <configuration>
               <target>
-                <checksum file="${project.build.directory}/sonar-${project.version}.zip" algorithm="md5"/>
-                <checksum file="${project.build.directory}/sonar-${project.version}.zip" algorithm="sha"/>
+                <checksum file="${project.build.directory}/sonar-${project.version}.zip" algorithm="md5" />
+                <checksum file="${project.build.directory}/sonar-${project.version}.zip" algorithm="sha" />
               </target>
             </configuration>
             <goals>
diff --git a/sonar-channel/pom.xml b/sonar-channel/pom.xml
index f64345cecfe..8a1fc5925f7 100644
--- a/sonar-channel/pom.xml
+++ b/sonar-channel/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.codehaus.sonar</groupId>
diff --git a/sonar-markdown/pom.xml b/sonar-markdown/pom.xml
index 6db3e2a4807..49eb119a576 100644
--- a/sonar-markdown/pom.xml
+++ b/sonar-markdown/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.codehaus.sonar</groupId>
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index 4b3842e9f02..53441136766 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.sonar</groupId>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 6866a11cd8c..616860899f2 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -95,10 +95,10 @@ module ApplicationHelper
       if mode=='days'
         label = "over %s days" % mode_param
       elsif mode=='version'
-        if !date.nil?
-          label = "since version %s (%s)" % [mode_param]
+        if date
+          label = "since version %s (%s)" % [mode_param, date.strftime("%Y %b %d")]
         else
-          label = "since version %s" % [mode_param, (date.strftime("%Y %b %d"))]
+          label = "since version %s" % mode_param
         end
       elsif mode=='previous_analysis'
         if !date.nil?
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb
index 2ce1a913233..609dc6fcff1 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/cloud/index.html.erb
@@ -20,8 +20,8 @@
 <div>
 <form id="cloudform" action="<%= ApplicationController.root_context -%>/cloud/index/<%= @project.id -%>" method="GET">
   <ul class="headerLine">
-    <li class="first">
-      <span class="note">Color:</span>
+    <li>
+      <span>Color:</span>
       <select name="color" onchange="document.forms['cloudform'].submit()">
         <% if @snapshot.measure('coverage') %>
           <option value="coverage" <%= 'selected' if @color_metric.key=='coverage' -%>>Coverage</option>
@@ -29,6 +29,7 @@
         <option value="violations_density" <%= 'selected' if @color_metric.key=='violations_density' -%>>Rules compliance</option>
       </select>
     </li>
+    <li class="sep"> </li>
     <li>
       <input type="radio" name="size" value="ncloc" <%= 'checked' if @size_metric.key=='ncloc' -%> onclick="document.forms['cloudform'].submit()" id="radio-quick">
       <label for="radio-quick">Quick wins</label></option>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
index 1e6d6f9e9be..6332e6e65be 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
@@ -1,26 +1,28 @@
 <div id="dashboard">
   <%= render :partial => 'dashboard/header', :locals => {:back => false} %>
-
+<div style="width: 100%;display: block; float: none">
   <%
-    columns=@dashboard.column_layout.split('-')
-    for index in 1..columns.size()
+     columns=@dashboard.column_layout.split('-')
+     for index in 1..columns.size()
   %>
-    <div class="dashboard-column-wrapper" style="width: <%= columns[index-1] -%>; ">
-    <div class="dashboard-column" id="dashboard-column-<%= index -%>" style="margin: 0px <%= index<columns.size() ? "5px" : "0px" -%> 0px <%= index>1 ? "5px" : "0px" -%>;">
-    <%
-      @dashboard.widgets.select{|widget| widget.column_index==index}.sort_by{|widget| widget.row_index}.each do |widget|
-        widget_definition=@widget_definitions.find{|wd| wd.getId()==widget.widget_key }
-        if widget_definition
-    %>
-        <div class="block" id="block_<%= widget.id -%>">
-          <%= render :partial => 'dashboard/widget', :locals => {:widget => widget,  :definition => widget_definition} %>
+
+      <div class="dashboard-column-wrapper" style="width: <%= columns[index-1] -%>; ">
+        <div class="dashboard-column" id="dashboard-column-<%= index -%>" style="margin: 0px <%= index<columns.size() ? "5px" : "0px" -%> 0px <%= index>1 ? "5px" : "0px" -%>;">
+          <%
+             @dashboard.widgets.select { |widget| widget.column_index==index }.sort_by { |widget| widget.row_index }.each do |widget|
+               widget_definition=@widget_definitions.find { |wd| wd.getId()==widget.widget_key }
+               if widget_definition
+          %>
+              <div class="block" id="block_<%= widget.id -%>">
+                <%= render :partial => 'dashboard/widget', :locals => {:widget => widget, :definition => widget_definition} %>
+              </div>
+            <%
+               end
+               end
+            %>
         </div>
-    <%
-        end
-      end
-    %>
       </div>
-    </div>
   <% end %>
+  </div>
   <div style="clear: both;"></div>
 </div>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
index feb41688e90..a3d3cb61ca4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
@@ -31,7 +31,7 @@
   <% end %>
 </div>
 &nbsp;<!-- keep &nbsp; for IE6 ! -->
-<table id="drilldown" class="width100">
+<table id="drilldown" class="width100" style="clear:left">
 <% if @highlighted_metric!=@metric %>
 <tr>
 <td colspan="<%= @drilldown.columns.size -%>">Drilldown on <b><%= format_measure(@metric.key, :period => @period) -%> <%= @metric.short_name -%></b></td>
diff --git a/sonar-server/src/main/webapp/stylesheets/dashboard.css b/sonar-server/src/main/webapp/stylesheets/dashboard.css
index d48c406b301..7f2c344f15c 100644
--- a/sonar-server/src/main/webapp/stylesheets/dashboard.css
+++ b/sonar-server/src/main/webapp/stylesheets/dashboard.css
@@ -128,7 +128,6 @@
   float: left;
   margin: 0;
   padding: 0;
-  clear: right;
 }
 
 #dashboard .column-handle {
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index b0eac2a9067..32347f77aff 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -77,9 +77,13 @@ div#hd {
   color: #fff;
   padding: 0 0 0 10px;
 }
+#crumbs li {
+  height: 30px;
+  line-height: 30px;
+  vertical-align: middle;
+}
 #crumbs li a, #nav li a {
   color: #fff;
-  vertical-align: middle;
 }
 #crumbs li a:link, #crumbs li a:visited, #nav li a:link, #nav li a:visited {
   text-decoration:none;
@@ -94,14 +98,14 @@ div#hd {
   text-align: left;
   margin: 50px 180px 0;
 }
+div#body {
+  position: relative;
+  width: 100%;
+}
 div#footer {
-  padding-top: 10px;
-  margin: 0 10px;
+  margin: 10px;
   clear: both;
 }
-div#body {
-  height: 100%;
-}
 .with_sidebar {
   margin: 0 10px 0 170px;
 }
@@ -114,8 +118,10 @@ div#content {
 }
 div#sb {
   width: 150px;
-  float: left;
+  position: absolute;
   margin: 0 10px;
+  top: 0;
+  left: 0;
 }
 div#sidebar {
   background-color: #CAE3F2;
@@ -1226,7 +1232,7 @@ div.autocomplete strong {
   float: left;
   vertical-align: top;
   text-align: left;
-  min-width: 60px;
+  
   padding: 0 10px 7px 0;
 }
 
@@ -1258,18 +1264,24 @@ table.header1 td {
 	color: #444;
 	border: 1px solid #DDD;
 	margin: 0 0 10px 0;
-  line-height: 30px;
-  height: 30px;
+  line-height: 28px;
+  height: 28px;
 }
 ul.headerLine li {
   float: left;
   display: block;
   padding: 0 10px 0;
-  background: url("../images/sep12.png") no-repeat scroll 0 50% transparent;
+  height: 28px;
+  vertical-align: middle;
 }
-ul.headerLine li.first {
-  background: none;
+ul.headerLine li.sep {
+  background: url("../images/sep12.png") no-repeat scroll 50% 50% transparent;
+  padding: 0 5px 0 5px;
 }
+ul.headerLine select, ul.headerLine input, ul.headerLine button, ul.headerLine textarea, ul.headerLine span {
+  vertical-align: middle;
+}
+
 select.withIcons option {
 	background-repeat: no-repeat;
 	background-position: 2px 0;