From f72a984f77904c4995bfee44b1b6d2fb937b2bb6 Mon Sep 17 00:00:00 2001 From: "alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c" Date: Wed, 3 Feb 2010 17:59:05 +0000 Subject: modified background position for spline header logo --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4028 --- etherpad/src/static/css/pad2_ejs.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css index 9d68fe1..eb7b625 100644 --- a/etherpad/src/static/css/pad2_ejs.css +++ b/etherpad/src/static/css/pad2_ejs.css @@ -51,11 +51,11 @@ a#backtoprosite { padding-left: 20px; left: 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.png) no-repeat -397px -3px; overflow: hidden; } +a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width: 127px; + position: relative; top: 0px; height: 0; padding-top: 25px; + background: url(/static/img/jun09/pad/padtop5.png) no-repeat -397px 0px; overflow: hidden; } -.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.png) no-repeat -397px -3px; } +.propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.png) no-repeat -397px 0px; } #specialkeyarea { top: 5px; left: 250px; color: yellow; font-weight: bold; font-size: 1.5em; position: absolute; } -- cgit v1.2.3-1-g7c22 From f45b995bf709caa0d0d5372e2762706a0162362f Mon Sep 17 00:00:00 2001 From: "alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c" Date: Wed, 3 Feb 2010 20:38:33 +0000 Subject: styling of mainpage --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4029 --- etherpad/src/static/css/home-opensource.css | 16 ++++++++++------ etherpad/src/templates/main/home.ejs | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/etherpad/src/static/css/home-opensource.css b/etherpad/src/static/css/home-opensource.css index 41e7996..0d1929d 100644 --- a/etherpad/src/static/css/home-opensource.css +++ b/etherpad/src/static/css/home-opensource.css @@ -1,8 +1,7 @@ - #home { width: 600px; margin: 0 auto; - padding: 2em; + padding: 4em; text-align: center; } @@ -10,17 +9,22 @@ font-size: 3.6em; } -#home a#home-newpad { - display: block; +#home #buttons { + padding-top: 5em; +} + +#home a#home-newpad, #home a#home-newsite { padding: 1em; - margin: 12px 60px; + margin: 12px 40px; font-size: 1.6em; border: 1px solid black; background: #049; color: #fff; + width: 30%; } -#home a#home-newpad:hover { +#home a#home-newpad:hover, #home a#home-newsite:hover { background: #26b; + text-decoration: none; } diff --git a/etherpad/src/templates/main/home.ejs b/etherpad/src/templates/main/home.ejs index 39ac6ee..22ba15c 100644 --- a/etherpad/src/templates/main/home.ejs +++ b/etherpad/src/templates/main/home.ejs @@ -16,10 +16,10 @@ limitations under the License. */ %><% helpers.setHtmlTitle("SplinePad [beta]: O
- SplinePad [beta]: Open-Sourced! + SplinePad
-
+
Create new pad -- cgit v1.2.3-1-g7c22 From cedd37246c4a825d5c5844b1fafc1c665a634220 Mon Sep 17 00:00:00 2001 From: "nehls@b2ef00c0-3703-41da-baef-cfe82387ac0c" Date: Thu, 4 Feb 2010 10:21:46 +0000 Subject: dded branding to padtop4.png (css needs work) --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4030 --- etherpad/src/static/css/broadcast.css | 6 +++--- etherpad/src/static/img/jun09/pad/padtop4.png | Bin 0 -> 17161 bytes etherpad/src/static/img/jun09/pad/padtop4.xcf | Bin 0 -> 41184 bytes etherpad/src/static/img/jun09/pad/padtop5.xcf | Bin 68361 -> 66525 bytes 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 etherpad/src/static/img/jun09/pad/padtop4.png create mode 100644 etherpad/src/static/img/jun09/pad/padtop4.xcf diff --git a/etherpad/src/static/css/broadcast.css b/etherpad/src/static/css/broadcast.css index 44bf97f..6c1dcf8 100644 --- a/etherpad/src/static/css/broadcast.css +++ b/etherpad/src/static/css/broadcast.css @@ -15,9 +15,9 @@ body, textarea { font-family: Arial, sans-serif; } #padpage { margin-left: auto; margin-right: auto; width: 914px; vertical-align: top;} #topbarleft { float: left; height: 100%; overflow: hidden; - background: url(/static/img/jun09/pad/padtop4.gif) no-repeat left top; width: 5px; } + background: url(/static/img/jun09/pad/padtop4.png) no-repeat left top; width: 5px; } #topbarright { float: right; height: 100%; overflow: hidden; - background: url(/static/img/jun09/pad/padtop4.gif) no-repeat right top; width: 5px; } + background: url(/static/img/jun09/pad/padtop4.png) no-repeat right top; width: 5px; } .propad #topbar { background: #2c2c2c url(/static/img/jun09/pad/protop.png) repeat-x 0 -25px; } @@ -35,7 +35,7 @@ a#backtoprosite, #accountnav a { color: #cde7ff; text-decoration: underline; } #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/padtop4.gif) no-repeat -397px -3px; overflow: hidden; } + background: url(/static/img/jun09/pad/padtop4.png) no-repeat -397px -3px; overflow: hidden; } .propad a#topbaretherpad { background: url(/static/img/jun09/pad/protop.png) no-repeat -397px -3px; } diff --git a/etherpad/src/static/img/jun09/pad/padtop4.png b/etherpad/src/static/img/jun09/pad/padtop4.png new file mode 100644 index 0000000..11c4595 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/padtop4.png differ diff --git a/etherpad/src/static/img/jun09/pad/padtop4.xcf b/etherpad/src/static/img/jun09/pad/padtop4.xcf new file mode 100644 index 0000000..1e735aa Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/padtop4.xcf differ diff --git a/etherpad/src/static/img/jun09/pad/padtop5.xcf b/etherpad/src/static/img/jun09/pad/padtop5.xcf index 9821e8c..4abbd02 100644 Binary files a/etherpad/src/static/img/jun09/pad/padtop5.xcf and b/etherpad/src/static/img/jun09/pad/padtop5.xcf differ -- cgit v1.2.3-1-g7c22