svn commit: r1737275 [1/3] - in /jmeter/trunk: build.xml xdocs/css/new-style.css xdocs/images/logo.svg xdocs/stylesheets/project.xml xdocs/stylesheets/website-style.xsl

[fschumacher]

Author: fschumacher
Date: Thu Mar 31 19:04:59 2016
New Revision: 1737275

URL: http://svn.apache.org/viewvc?rev=1737275&view=rev
Log:
Replace JMeter logo and put social media links into own div for website.

Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/xdocs/css/new-style.css
    jmeter/trunk/xdocs/images/logo.svg
    jmeter/trunk/xdocs/stylesheets/project.xml
    jmeter/trunk/xdocs/stylesheets/website-style.xsl

Modified: jmeter/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1737275&r1=1737274&r2=1737275&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Mar 31 19:04:59 2016
@@ -2293,7 +2293,7 @@ run JMeter unless all the JMeter jars ar
       <param name="year" expression="${year}" />
     </xslt>
     <copy todir="${dest.docs}/images" overwrite="${docs.force}">
-      <fileset dir="${src.images}" excludes="logo.xcf,logo.svg"/>
+      <fileset dir="${src.images}" excludes="logo.xcf"/>
     </copy>
     <copy todir="${dest.docs}/css" overwrite="${docs.force}">
       <fileset dir="${src.css}"/>

Modified: jmeter/trunk/xdocs/css/new-style.css
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/css/new-style.css?rev=1737275&r1=1737274&r2=1737275&view=diff
==============================================================================
--- jmeter/trunk/xdocs/css/new-style.css (original)
+++ jmeter/trunk/xdocs/css/new-style.css Thu Mar 31 19:04:59 2016
@@ -38,6 +38,10 @@ img {
   height: auto;
 }
 
+img.logo {
+  max-height: 88px;
+}
+
 .menu, h1, h2, h3, h4, h5, .go-top, .title {
   font-family: "Merriweather";
 }
@@ -386,7 +390,17 @@ table {
   display: block;
   background: white;
 }
- .main {
+
+.social > div {
+  display: inline-block;
+  margin-right: 0.2em;
+}
+
+.social div img {
+  vertical-align: inherit !important;
+}
+
+.main {
  width: auto;
  max-width: 95%;
  margin: 0.5rem;