Commit f71edcbb authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

Updated for 3.6.0 release.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10776 b35dd754-fafc-0310-a699-88a17e54d16e
parent 34a68512
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<property name="version.major" value="3"/> <property name="version.major" value="3"/>
<property name="version.minor" value="6"/> <property name="version.minor" value="6"/>
<property name="version.revision" value="0"/> <property name="version.revision" value="0"/>
<property name="version.extra" value="alpha"/> <!-- For 'beta' or 'alpha' --> <property name="version.extra" value=""/> <!-- For 'beta' or 'alpha' -->
<property name="dist.prefix" value="openfire"/> <property name="dist.prefix" value="openfire"/>
<property file="${basedir}/build/build.properties"/> <property file="${basedir}/build/build.properties"/>
......
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
body { body {
font-size : 100%; font-size : 100%;
background-color : #d3d6d9; background-color : #d3d6d9;
padding: 0px; padding: 0;
margin: 0px 0px 30px 0px; margin: 0 0 30px 0;
} }
body, td, th { body, td, th {
font-family : arial, helvetica, sans-serif; font-family : arial, helvetica, sans-serif;
font-size : 10pt; font-size : 10pt;
} }
pre, tt, code { pre, tt, code {
font-family : courier new, monospaced; font-family : courier new, monospaced, sans-serif;
font-size : 9pt; font-size : 9pt;
} }
#pageContainer { #pageContainer {
...@@ -36,11 +36,11 @@ pre, tt, code { ...@@ -36,11 +36,11 @@ pre, tt, code {
background-color: #e7eaee; background-color: #e7eaee;
border: 1px solid #cccccc; border: 1px solid #cccccc;
border-bottom: none; border-bottom: none;
-moz-border-radius: 5px 5px 0px 0px; -moz-border-radius: 5px 5px 0 0;
margin: 10px 0px 0px 0px; margin: 10px 0 0 0;
} }
#pageBody { #pageBody {
margin: 0px 18px 0px 20px; margin: 0 18px 0 20px;
} }
...@@ -73,12 +73,12 @@ a:active { ...@@ -73,12 +73,12 @@ a:active {
color: #ffffff; color: #ffffff;
font-size: 11px; font-size: 11px;
line-height: 18px; line-height: 18px;
padding: 0px 0px 0px 0px; padding: 0 0 0 0;
margin: 0px 0px 25px 0px; margin: 0 0 25px 0;
overflow: hidden; overflow: hidden;
} }
.navigation a { .navigation a {
margin: 0px 20px 0px 20px; margin: 0 20px 0 20px;
} }
.navigation a:link { color: #ffffff; } .navigation a:link { color: #ffffff; }
.navigation a:visited { color: #ffffff; } .navigation a:visited { color: #ffffff; }
...@@ -94,21 +94,21 @@ h1 { ...@@ -94,21 +94,21 @@ h1 {
font-size : 1.7em; font-size : 1.7em;
font-weight : bold; font-weight : bold;
color: #670e15; color: #670e15;
padding: 0px; padding: 0;
margin: 30px 0px 0px 20px; margin: 30px 0 0 20px;
} }
h2 { h2 {
font-size : 1.3em; font-size : 1.3em;
font-weight : bold; font-weight : bold;
margin: 40px 0px 6px 0px; margin: 40px 0 6px 0;
padding: 0px; padding: 0;
color: #335588; color: #335588;
} }
h3 { h3 {
font-size : 1.0em; font-size : 1.0em;
font-weight : bold; font-weight : bold;
margin: 25px 0px 3px 0px; margin: 25px 0 3px 0;
padding: 0px; padding: 0;
color: #334466; color: #334466;
} }
...@@ -116,17 +116,17 @@ h3 { ...@@ -116,17 +116,17 @@ h3 {
/* general elements */ /* general elements */
p { p {
margin: 0px 0px 15px 0px; margin: 0 0 15px 0;
} }
ul { ul {
margin: 5px 0px 15px 35px; margin: 5px 0 15px 35px;
} }
li { li {
padding-bottom : 4px; padding-bottom : 4px;
} }
tt { tt {
font-family : courier new; font-family : courier new, sans-serif;
font-weight : bold; font-weight : bold;
color : #060; color : #060;
} }
...@@ -135,7 +135,7 @@ hr { ...@@ -135,7 +135,7 @@ hr {
height: 1px; height: 1px;
background-color: #999999; background-color: #999999;
border: none; border: none;
margin: 40px 0px 20px 0px; margin: 40px 0 20px 0;
} }
.footer { .footer {
......
This diff is collapsed.
...@@ -304,7 +304,7 @@ public class XMPPServer { ...@@ -304,7 +304,7 @@ public class XMPPServer {
Log.warn("Unable to determine local hostname.", ex); Log.warn("Unable to determine local hostname.", ex);
} }
version = new Version(3, 6, 0, Version.ReleaseStatus.Alpha, -1); version = new Version(3, 6, 0, Version.ReleaseStatus.Release, -1);
if ("true".equals(JiveGlobals.getXMLProperty("setup"))) { if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
setupMode = false; setupMode = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment