aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornehls@b2ef00c0-3703-41da-baef-cfe82387ac0c <none@none>2010-02-03 17:29:03 +0000
committernehls@b2ef00c0-3703-41da-baef-cfe82387ac0c <none@none>2010-02-03 17:29:03 +0000
commit7917c8e5eb4dc8cc5de772f717159d4785f10b4e (patch)
tree6484b5cb72d18f49d7541f3f564a777cfb51afc4
parentcbe5e22bae15b860454bcb8abd261182d4954ec5 (diff)
downloadetherpad-7917c8e5eb4dc8cc5de772f717159d4785f10b4e.tar.gz
etherpad-7917c8e5eb4dc8cc5de772f717159d4785f10b4e.tar.xz
etherpad-7917c8e5eb4dc8cc5de772f717159d4785f10b4e.zip
Added spline Pad [beta] branding
--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4025
-rw-r--r--etherpad/src/static/css/broadcast.css8
-rw-r--r--etherpad/src/static/css/pad2_ejs.css32
-rw-r--r--etherpad/src/static/img/jun09/pad/padtop5.gifbin8964 -> 0 bytes
-rw-r--r--etherpad/src/static/img/jun09/pad/padtop5.pngbin0 -> 18850 bytes
-rw-r--r--etherpad/src/static/img/jun09/pad/padtop5.xcfbin0 -> 68361 bytes
-rw-r--r--etherpad/src/static/img/jun09/pad/protop.gifbin3374 -> 0 bytes
-rw-r--r--etherpad/src/static/img/jun09/pad/protop.pngbin0 -> 6768 bytes
-rw-r--r--etherpad/src/static/img/jun09/pad/protop.xcfbin0 -> 16565 bytes
-rw-r--r--etherpad/src/static/img/pro/header/pro-header-logo.pngbin2213 -> 5527 bytes
-rw-r--r--etherpad/src/static/img/pro/header/pro-header-logo.xcfbin0 -> 13274 bytes
10 files changed, 20 insertions, 20 deletions
diff --git a/etherpad/src/static/css/broadcast.css b/etherpad/src/static/css/broadcast.css
index 9114f8e..44bf97f 100644
--- a/etherpad/src/static/css/broadcast.css
+++ b/etherpad/src/static/css/broadcast.css
@@ -20,9 +20,9 @@ body, textarea { font-family: Arial, sans-serif; }
background: url(/static/img/jun09/pad/padtop4.gif) no-repeat right top; width: 5px; }
-.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.gif) repeat-x 0 -25px; }
-.propad #topbarleft { background: url(/static/img/jun09/pad/protop.gif) no-repeat left top; }
-.propad #topbarright { background: url(/static/img/jun09/pad/protop.gif) no-repeat right top; }
+.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.png) repeat-x 0 -25px; }
+.propad #topbarleft { background: url(/static/img/jun09/pad/protop.png) no-repeat left top; }
+.propad #topbarright { background: url(/static/img/jun09/pad/protop.png) no-repeat right top; }
a#backtoprosite, #accountnav {
display: block; position: absolute; height: 15px; line-height: 15px;
@@ -37,7 +37,7 @@ a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width:
position: relative; top: 3px; height: 0; padding-top: 20px;
background: url(/static/img/jun09/pad/padtop4.gif) no-repeat -397px -3px; overflow: hidden; }
-.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.gif) no-repeat -397px -3px; }
+.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.png) no-repeat -397px -3px; }
#padmain {
margin: 7px;
diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css
index cd6ea0a..9d68fe1 100644
--- a/etherpad/src/static/css/pad2_ejs.css
+++ b/etherpad/src/static/css/pad2_ejs.css
@@ -20,23 +20,23 @@ body.squish2width #padpage { width: 700px; }
position: relative; }
#topbarleft { float: left; height: 100%; overflow: hidden;
- background: url(/static/img/jun09/pad/padtop5.gif) no-repeat left top; width: 5px; }
+ background: url(/static/img/jun09/pad/padtop5.png) no-repeat left top; width: 5px; }
#topbarright { float: right; height: 100%; overflow: hidden;
- background: url(/static/img/jun09/pad/padtop5.gif) no-repeat right top; width: 5px; }
+ background: url(/static/img/jun09/pad/padtop5.png) no-repeat right top; width: 5px; }
-.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.gif) repeat-x 0 -25px; }
-.propad #topbarleft { background: url(/static/img/jun09/pad/protop.gif) no-repeat left top; }
-.propad #topbarright { background: url(/static/img/jun09/pad/protop.gif) no-repeat right top; }
+.propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.png) repeat-x 0 -25px; }
+.propad #topbarleft { background: url(/static/img/jun09/pad/protop.png) no-repeat left top; }
+.propad #topbarright { background: url(/static/img/jun09/pad/protop.png) no-repeat right top; }
/*
a#topbarnewpad { display: block; float: left; position: relative; top: 4px; width: 94px;
height: 0; padding-top: 26px; overflow: hidden;
- background: url(/static/img/jun09/pad/padtop5.gif) no-repeat -5px -4px; }
+ background: url(/static/img/jun09/pad/padtop5.png) no-repeat -5px -4px; }
a#topbarnewpad:focus { outline: 0; }
a#topbarfullwidth { display: block; float: right; position: relative; top: 2px; width: 107px;
height: 0; padding-top: 27px; overflow: hidden;
- background: url(/static/img/jun09/pad/padtop5.gif) no-repeat -788px -2px; }
+ background: url(/static/img/jun09/pad/padtop5.png) no-repeat -788px -2px; }
a#topbarfullwidth:focus { outline: 0; }
*/
@@ -47,15 +47,15 @@ a#backtoprosite, #accountnav {
a#backtoprosite, #accountnav a { color: #cde7ff; text-decoration: underline; }
a#backtoprosite { padding-left: 20px; left: 6px;
- background: url(/static/img/jun09/pad/protop.gif) no-repeat -5px -6px; }
+ background: url(/static/img/jun09/pad/protop.png) no-repeat -5px -6px; }
#accountnav { right: 10px; color: #fff; }
#topbarcenter { margin-left: 150px; margin-right: 150px; }
a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width: 103px;
position: relative; top: 3px; height: 0; padding-top: 20px;
- background: url(/static/img/jun09/pad/padtop5.gif) no-repeat -397px -3px; overflow: hidden; }
+ background: url(/static/img/jun09/pad/padtop5.png) no-repeat -397px -3px; overflow: hidden; }
-.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.gif) no-repeat -397px -3px; }
+.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.png) no-repeat -397px -3px; }
#specialkeyarea { top: 5px; left: 250px; color: yellow; font-weight: bold;
font-size: 1.5em; position: absolute; }
@@ -80,14 +80,14 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
#docbarleft { position: absolute; left: 0; top: 0; height: 100%;
overflow: hidden;
- background: url(/static/img/jun09/pad/padtop5.gif) no-repeat left -31px; width: 7px; }
+ background: url(/static/img/jun09/pad/padtop5.png) no-repeat left -31px; width: 7px; }
<% function docbarButton(name, width, imgleft, posright, hoverimgleft, openimgleft) {
return ("#docbar$name$-outer { width: "+width+"px; position: absolute; height: 30px; top: 0; right: "+posright+"px; "+
- "background: url(/static/img/jun09/pad/padtop5.gif) no-repeat "+(-imgleft)+"px -31px; "+
+ "background: url(/static/img/jun09/pad/padtop5.png) no-repeat "+(-imgleft)+"px -31px; "+
"/* avoid IE flicker using double background */ }"+
"a#docbar$name$ { display: block; height: 0; padding-top: 30px; position: absolute; width: 100%; "+
- "overflow: hidden; background: url(/static/img/jun09/pad/padtop5.gif) no-repeat "+(-imgleft)+"px -31px; "+
+ "overflow: hidden; background: url(/static/img/jun09/pad/padtop5.png) no-repeat "+(-imgleft)+"px -31px; "+
"z-index: 53; /* > .dbpanel-wrapper */} "+
"a#docbar$name$:focus { outline: 0; } "+
"a#docbar$name$:hover { background: url(/static/img/jun09/pad/docbarstates3.png) no-repeat "+(-hoverimgleft)+"px 0; } "+
@@ -109,10 +109,10 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
<%= docbarButton("security", 85, 353, 462, 489, 489) %>
#docbarslider-outer { width: 104px; position: absolute; height: 30px; top: 0; right: 0;
- background: url(/static/img/jun09/pad/padtop5.gif) no-repeat -796px -31px;
+ background: url(/static/img/jun09/pad/padtop5.png) no-repeat -796px -31px;
/* avoid IE flicker using double background */ }
a#docbarslider { display: block; height: 0; padding-top: 30px; position: absolute; width: 100%;
- overflow: hidden; background: url(/static/img/jun09/pad/padtop5.gif) no-repeat -796px -31px; z-index: 53; /* > .dbpanel-wrapper */}
+ overflow: hidden; background: url(/static/img/jun09/pad/padtop5.png) no-repeat -796px -31px; z-index: 53; /* > .dbpanel-wrapper */}
<% /* changing the size of the title / rename area means adjusting
the #docbarpadtitle.width, #padtitlebuttons.left,
@@ -132,7 +132,7 @@ a#docbarslider { display: block; height: 0; padding-top: 30px; position: absolut
#docbarrenamelink a:hover { color: #48d; }
#padtitlebuttons { position: absolute; width: 120px; zoom: 1;
height: 22px; top: 4px; left: 223px; display: none;
- background: url(/static/img/jun09/pad/padtop5.gif) -19px -35px; }
+ background: url(/static/img/jun09/pad/padtop5.png) -19px -35px; }
#padtitlesave { position: absolute; display: block;
height: 0; padding-top: 22px; overflow: hidden;
width: 49px; left: 0; top: 0; }
diff --git a/etherpad/src/static/img/jun09/pad/padtop5.gif b/etherpad/src/static/img/jun09/pad/padtop5.gif
deleted file mode 100644
index ce41dcb..0000000
--- a/etherpad/src/static/img/jun09/pad/padtop5.gif
+++ /dev/null
Binary files differ
diff --git a/etherpad/src/static/img/jun09/pad/padtop5.png b/etherpad/src/static/img/jun09/pad/padtop5.png
new file mode 100644
index 0000000..6546509
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/padtop5.png
Binary files differ
diff --git a/etherpad/src/static/img/jun09/pad/padtop5.xcf b/etherpad/src/static/img/jun09/pad/padtop5.xcf
new file mode 100644
index 0000000..9821e8c
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/padtop5.xcf
Binary files differ
diff --git a/etherpad/src/static/img/jun09/pad/protop.gif b/etherpad/src/static/img/jun09/pad/protop.gif
deleted file mode 100644
index 9171646..0000000
--- a/etherpad/src/static/img/jun09/pad/protop.gif
+++ /dev/null
Binary files differ
diff --git a/etherpad/src/static/img/jun09/pad/protop.png b/etherpad/src/static/img/jun09/pad/protop.png
new file mode 100644
index 0000000..740d903
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/protop.png
Binary files differ
diff --git a/etherpad/src/static/img/jun09/pad/protop.xcf b/etherpad/src/static/img/jun09/pad/protop.xcf
new file mode 100644
index 0000000..4f3abfd
--- /dev/null
+++ b/etherpad/src/static/img/jun09/pad/protop.xcf
Binary files differ
diff --git a/etherpad/src/static/img/pro/header/pro-header-logo.png b/etherpad/src/static/img/pro/header/pro-header-logo.png
index c1a003c..b36daa8 100644
--- a/etherpad/src/static/img/pro/header/pro-header-logo.png
+++ b/etherpad/src/static/img/pro/header/pro-header-logo.png
Binary files differ
diff --git a/etherpad/src/static/img/pro/header/pro-header-logo.xcf b/etherpad/src/static/img/pro/header/pro-header-logo.xcf
new file mode 100644
index 0000000..524c00f
--- /dev/null
+++ b/etherpad/src/static/img/pro/header/pro-header-logo.xcf
Binary files differ