[geeklog-cvs] geeklog: Merge with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Mar 28 10:41:24 EDT 2012
changeset 8563:70cfe34bff56
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/70cfe34bff56
user: Tom <websitemaster at cogeco.net>
date: Wed Mar 28 10:40:29 2012 -0400
description:
Merge with upstream
diffstat:
public_html/layout/newpro/css/block.css | 53 ++++++++--
public_html/layout/newpro/css/compatible.css | 9 +-
public_html/layout/newpro/css/form.css | 11 +-
public_html/layout/newpro/css/layout.css | 31 +++--
public_html/layout/newpro/css/users/users.css | 14 +--
public_html/layout/newpro/functions.php | 2 +-
public_html/layout/newpro/header.thtml | 2 +-
public_html/layout/newpro/images/css/block_bg.png | Bin
public_html/layout/newpro/images/css/search-left.png | Bin
public_html/layout/newpro/images/css/search-right.png | Bin
public_html/layout/newpro/images/css/search.png | Bin
public_html/layout/newpro/style.css.php | 23 ++++-
public_html/layout/newpro/users/loginform.thtml | 2 +-
public_html/lib-common.php | 88 +++++++++---------
system/classes/scripts.class.php | 8 +
system/lib-security.php | 3 +-
system/lib-topic.php | 2 +-
17 files changed, 153 insertions(+), 95 deletions(-)
diffs (truncated from 595 to 300 lines):
diff -r 9e4a9637ab5e -r 70cfe34bff56 public_html/layout/newpro/css/block.css
--- a/public_html/layout/newpro/css/block.css Wed Mar 28 10:26:19 2012 -0400
+++ b/public_html/layout/newpro/css/block.css Wed Mar 28 10:40:29 2012 -0400
@@ -41,7 +41,7 @@
--------------------------------------*/
div#centerblocks div#block-message {
- margin: 2em 0;
+ margin: 1.2em 0;
padding: 0;
border: 1px solid #939490;
@@ -112,11 +112,20 @@
Center Block
--------------------------------------*/
+div#centerblocks {
+ margin-bottom: 12px;
+ border-top: 1px solid #aaa;
+ background: #fff url("./images/css/block_bg.png") repeat-x scroll 0 0;
+
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+}
+
/* Welcome Message */
div#centerblocks p.welcome_msg {
- margin: 0 0 2em 0;
- padding: 1em 0;
- border-bottom: 1px solid #CCC;
+ margin: 0 0 1.2em 0;
+ padding: 10px 8px;
}
/* Welcome Message Link */
@@ -178,18 +187,28 @@
--------------------------------------*/
/* Block */
+div#leftblocks {
+ margin-{right}: 8px;
+}
+
div#leftblocks div.block-left {
- margin: 0 8px 0.5em 8px;
- padding: 8px 0;
+ margin-bottom: 12px;
+ border-top: 1px solid #aaa;
+ padding: 8px;
+ background: #fff url("./images/css/block_bg.png") repeat-x scroll 0 0;
+
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
}
/* Block Title */
div#leftblocks div.block-left h2 {
margin: 0 0 0.5em 0;
padding: 0 0 0.1em 0;
- border-bottom: 1px solid #CCCCCC;
font-size: 110%;
font-weight: bold;
+ text-decoration: underline;
}
/* Help Icon */
@@ -203,25 +222,37 @@
padding: 0;
}
-
+div#leftblocks ul {
+ margin: 0.8em 0;
+}
/*--------------------------------------
Right Block
--------------------------------------*/
/* Block */
+div#rightblocks {
+ margin-{left}: 8px;
+}
+
div#rightblocks div.block-right {
- margin: 0 8px 0.5em 8px;
- padding: 8px 0;
+ margin-bottom: 12px;
+ border-top: 1px solid #aaa;
+ padding: 8px;
+ background: #fff url("./images/css/block_bg.png") repeat-x scroll 0 0;
+
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
}
/* Block Title */
div#rightblocks div.block-right h2 {
margin: 0 0 0.5em 0;
padding: 0 0 0.1em 0;
- border-bottom: 1px solid #CCCCCC;
font-size: 110%;
font-weight: bold;
+ text-decoration: underline;
}
/* Help Icon */
diff -r 9e4a9637ab5e -r 70cfe34bff56 public_html/layout/newpro/css/compatible.css
--- a/public_html/layout/newpro/css/compatible.css Wed Mar 28 10:26:19 2012 -0400
+++ b/public_html/layout/newpro/css/compatible.css Wed Mar 28 10:40:29 2012 -0400
@@ -286,16 +286,17 @@
}
.sysmessage {
position: relative;
- margin: 1em 1em 1em 4em;
+ margin: 1em;
+ margin-{left}: 4em;
}
.sysmessage img {
position: absolute;
- left: -3.1em;
+ {left}: -3.1em;
top: -0.3em;
border:none;
- float:left;
+ float:{left};
padding-bottom:3px;
- padding-right:5px;
+ padding-{right}:5px;
}
/* Stats **********************************************************************/
.stats-list-count {
diff -r 9e4a9637ab5e -r 70cfe34bff56 public_html/layout/newpro/css/form.css
--- a/public_html/layout/newpro/css/form.css Wed Mar 28 10:26:19 2012 -0400
+++ b/public_html/layout/newpro/css/form.css Wed Mar 28 10:40:29 2012 -0400
@@ -16,13 +16,14 @@
div#leftblocks div#block-left-search {
margin: 0;
padding: 0;
+ border: 0;
}
/* Form */
div#leftblocks div#block-left-search form#searchform {
position: absolute;
top: 92px;
- right: 26px;
+ {right}: 26px;
margin: 0;
padding: 0;
}
@@ -30,7 +31,7 @@
div#leftblocks div#block-left-search form#searchform div {
margin: 0;
padding: 0;
- background: transparent url('./images/css/search.png') no-repeat 0 0;
+ background: transparent url('./images/css/search-{right}.png') no-repeat 0 0;
width: 180px;
height: 26px;
line-height: 26px;
@@ -46,13 +47,13 @@
/* Form Input Field */
div#leftblocks div#block-left-search form#searchform div input.text {
- float: left;
+ float: {left};
width: 145px;
}
/* Form Button */
div#leftblocks div#block-left-search form#searchform div input.submit {
- float: right;
+ float: {right};
width: 30px;
cursor: pointer;
}
@@ -122,7 +123,7 @@
form.third-party-login div img {
position: absolute;
- left: 6px;
+ {left}: 6px;
top: 6px;
}
diff -r 9e4a9637ab5e -r 70cfe34bff56 public_html/layout/newpro/css/layout.css
--- a/public_html/layout/newpro/css/layout.css Wed Mar 28 10:26:19 2012 -0400
+++ b/public_html/layout/newpro/css/layout.css Wed Mar 28 10:40:29 2012 -0400
@@ -23,7 +23,7 @@
width: 960px; /* Site Width */
margin: 1em auto;
padding: 12px;
- text-align: left;
+ text-align: {left};
border: 1px solid #656663;
background: white;
@@ -64,9 +64,9 @@
/* Site Name */
div#container div#header h1.site_name {
display: inline; /* For Win IE 6(Float Left Right Margin is too wide) */
- margin: 20px 0 0 16px;
+ margin: 20px 16px 0;
padding: 0;
- float: left;
+ float: {left};
}
/* Slogan */
@@ -74,11 +74,9 @@
margin: 0;
padding: 10px 16px 0;
color: #FFFFFF;
- text-align: right;
+ text-align: {right};
}
-
-
/*--------------------------------------
Gloval Navigation Container
--------------------------------------*/
@@ -87,6 +85,7 @@
background: #dbddd9 url('./images/css/menu_bg.png') repeat-x 0 0;
border: 1px solid #939490;
margin: auto;
+ margin-bottom: 12px;
width: 95%;
-webkit-border-radius: 8px;
@@ -107,19 +106,19 @@
/* Navigation Menu(Normal) */
div#container div#navigation ul li.menuitem {
- float: left;
+ float: {left};
display: block;
}
div#container div#navigation ul li.menuitem a,
div#container div#navigation ul li.menuitem a:link,
div#container div#navigation ul li.menuitem a:visited {
- float: left;
+ float: {left};
display: block;
height: 2.3em;
line-height: 2.2em;
padding: 0 0.8em;
- border-left: 1px dotted #939490;
+ border-{left}: 1px dotted #939490;
text-decoration: none;
color: #2E3436;
font-size: 13px;
@@ -139,8 +138,8 @@
div#container div#navigation ul li.last-child a,
div#container div#navigation ul li.last-child a:link,
div#container div#navigation ul li.last-child a:visited {
- padding-right: 1em;
- border-right: 1px dotted #939490;
+ padding-{right}: 1em;
+ border-{right}: 1px dotted #939490;
}
div#container div#navigation ul li.last-child a:hover,
@@ -159,6 +158,10 @@
width: 100%;
}
+div#container table#wrapper td {
+ padding: 0;
+}
+
div#container div#rightblocks {
width: 180px;
}
@@ -220,7 +223,7 @@
/* Copyright */
div#container div#footer ul.copyright {
- float: left;
+ float: {left};
}
div#container div#footer ul li.copyright_notice {
}
@@ -232,8 +235,8 @@
/* Powered by & Page Execution Time */
div#container div#footer ul.site_info {
- float: right;
- text-align: right;
+ float: {right};
+ text-align: {right};
}
/* Powered by */
diff -r 9e4a9637ab5e -r 70cfe34bff56 public_html/layout/newpro/css/users/users.css
--- a/public_html/layout/newpro/css/users/users.css Wed Mar 28 10:26:19 2012 -0400
More information about the geeklog-cvs
mailing list