[geeklog-cvs] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Apr 23 19:08:25 EDT 2012
changeset 8617:514dcef28b9e
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/514dcef28b9e
user: dengen
date: Tue Apr 24 07:51:07 2012 +0900
description:
Merged with upstream
diffstat:
public_html/javascript/fix_tooltips.js | 63 ++++++------
public_html/layout/newpro/css/admin/common.css | 7 +-
public_html/layout/newpro/css/admin/configuration.css | 8 +-
public_html/layout/newpro/css/admin/group.css | 6 +-
public_html/layout/newpro/css/admin/lists.css | 2 +-
public_html/layout/newpro/css/admin/moderation.css | 2 +-
public_html/layout/newpro/css/admin/topic.css | 2 +-
public_html/layout/newpro/css/admin/user.css | 5 +-
public_html/layout/newpro/css/article/article.css | 3 +-
public_html/layout/newpro/css/block.css | 2 +-
public_html/layout/newpro/css/comment/comment.css | 41 ++++---
public_html/layout/newpro/css/common.css | 12 +-
public_html/layout/newpro/css/compatible.css | 77 +++++++-------
public_html/layout/newpro/css/default.css | 6 +-
public_html/layout/newpro/css/navbar/navbar.css | 11 +-
public_html/layout/newpro/css/preferences/preferences.css | 4 +-
public_html/layout/newpro/css/search/search.css | 5 +-
public_html/layout/newpro/css/stats/stats.css | 2 +-
public_html/layout/newpro/css/tooltips/tooltips.css | 40 +++++--
public_html/layout/newpro/css/users/users.css | 16 +-
public_html/lib-common.php | 18 +-
21 files changed, 181 insertions(+), 151 deletions(-)
diffs (truncated from 952 to 300 lines):
diff -r 1328b5de4429 -r 514dcef28b9e public_html/javascript/fix_tooltips.js
--- a/public_html/javascript/fix_tooltips.js Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/javascript/fix_tooltips.js Tue Apr 24 07:51:07 2012 +0900
@@ -1,32 +1,33 @@
/* Prevents the tooltips from disappearing outside the viewport */
-$(document).ready(function() {
- var fix_tooltips = function() {
- // fix each tooltip
- $('.gl-tooltip').each(function() {
- // size of the viewport
- var $w = $(window);
- var viewport_height = parseInt($w.height());
- var viewport_width = parseInt($w.width());
- // cache the tooltip element
- var $s = $(this).find('span');
- // estimate the bottom and right coordinates of the tooltip
- var tooltip_bottom = parseInt($(this).offset().top + $s.outerHeight() - $w.scrollTop() + 30);
- var tooltip_right = parseInt($(this).offset().left + $s.outerWidth() - $w.scrollLeft() + 30);
- // move the element around as necessary
- if (tooltip_bottom >= viewport_height) {
- var top = parseInt(($s.outerHeight() + 22) * -1) + 'px';
- $s.css('top', top);
- } else {
- $s.css('top', '2.2em');
- }
- if (tooltip_right >= viewport_width) {
- var left = parseInt($s.width() * -1) + 'px';
- $s.css('left', left);
- } else {
- $s.css('left', '2.2em');
- }
- });
- };
- // repeat all of the above every 200 mS
- setInterval(fix_tooltips, 200);
-});
+var fix_tooltips = function() {
+console.log(1);
+ var $w = $(window);
+ // fix each tooltip
+ $('a.gl-tooltip').each(function() {
+ // size of the viewport
+ var viewport_height = parseInt($w.height());
+ var viewport_width = parseInt($w.width());
+ // cache the tooltip element
+ var $s = $(this).find('span');
+ // estimate the bottom and right coordinates of the tooltip
+ var tooltip_bottom = parseInt($(this).offset().top + $s.outerHeight() - $w.scrollTop() + 30);
+ var tooltip_right = parseInt($(this).offset().left + $s.outerWidth() - $w.scrollLeft() + 30);
+ // move the element around as necessary
+ if (tooltip_bottom >= viewport_height) {
+ var top = parseInt(($s.outerHeight() + 22) * -1) + 'px';
+ $s.css('top', top);
+ } else {
+ $s.css('top', '2.2em');
+ }
+ if (tooltip_right >= viewport_width) {
+ var left = parseInt($s.width() * -1) + 'px';
+ $s.css('left', left);
+ } else {
+ $s.css('left', '2.2em');
+ }
+ });
+};
+// Bind tooltip-fixing function to relevant events
+$(document).ready(fix_tooltips);
+$(window).resize(fix_tooltips);
+$(window).scroll(fix_tooltips);
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/admin/common.css
--- a/public_html/layout/newpro/css/admin/common.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/admin/common.css Tue Apr 24 07:51:07 2012 +0900
@@ -35,8 +35,9 @@
/* Icon */
div#admin-instructions img {
- float: left;
- margin: 0 8px 8px 0;
+ float: {left};
+ margin: 0 0 8px 0;
+ margin-{right}: 8px;
padding: 0;
width: 48px;
height: 48px;
@@ -74,7 +75,7 @@
padding: 4px;
border: 1px solid #ffffff;
background: #dae0ed;
- text-align: left;
+ text-align: {left};
}
table#admin-permissions td {
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/admin/configuration.css
--- a/public_html/layout/newpro/css/admin/configuration.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/admin/configuration.css Tue Apr 24 07:51:07 2012 +0900
@@ -70,9 +70,9 @@
/* Left Menu */
div#config_menu {
- float: left;
+ float: {left};
width: 160px;
- margin-left: -6px;
+ margin-{left}: -6px;
padding: 0;
background: #F7F7F7;
}
@@ -88,7 +88,7 @@
/* Center Block */
div#config_main {
- float: left;
+ float: {left};
width: 620px;
- padding: 0 0 0 8px;
+ padding-{left}: 8px;
}
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/admin/group.css
--- a/public_html/layout/newpro/css/admin/group.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/admin/group.css Tue Apr 24 07:51:07 2012 +0900
@@ -57,7 +57,7 @@
}
form#admin-groupmembers dl {
- float: left;
+ float: {left};
width: 30%;
margin: 0 0 1em 0;
padding: 0;
@@ -81,7 +81,7 @@
form#admin-groupmembers ul.move {
list-style-position: outside;
list-style-type: none;
- float: left;
+ float: {left};
width: 40%;
margin: 3.5em 0 0 0;
padding: 0;
@@ -94,6 +94,6 @@
}
form#admin-groupmembers ul.submit {
- clear: left;
+ clear: {left};
text-align: center;
}
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/admin/lists.css
--- a/public_html/layout/newpro/css/admin/lists.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/admin/lists.css Tue Apr 24 07:51:07 2012 +0900
@@ -93,7 +93,7 @@
table.admin-list tr th {
margin: 0;
padding: 2px;
- text-align: left;
+ text-align: {left};
}
table.admin-list tr td {
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/admin/moderation.css
--- a/public_html/layout/newpro/css/admin/moderation.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/admin/moderation.css Tue Apr 24 07:51:07 2012 +0900
@@ -37,7 +37,7 @@
/* } Win IE 6(Adjust floating element) */
ul#admin-moderation li {
- float: left;
+ float: {left};
width: 20%;
height: 8em;
margin: 0;
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/admin/topic.css
--- a/public_html/layout/newpro/css/admin/topic.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/admin/topic.css Tue Apr 24 07:51:07 2012 +0900
@@ -38,7 +38,7 @@
/* } Win IE 6(Adjust floating element) */
ul#admin-topiclist li {
- float: left;
+ float: {left};
width: 20%;
height: 8em;
margin: 0;
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/admin/user.css
--- a/public_html/layout/newpro/css/admin/user.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/admin/user.css Tue Apr 24 07:51:07 2012 +0900
@@ -14,9 +14,10 @@
/* User Images */
form#admin-edituser dl dd.user_photo {
- float: left;
+ float: {left};
width: 75%;
- margin: 0 0 0.5em 25%;
+ margin: 0 0 0.5em 0;
+ margin-{left}: 25%;
padding: 0;
}
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/article/article.css
--- a/public_html/layout/newpro/css/article/article.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/article/article.css Tue Apr 24 07:51:07 2012 +0900
@@ -14,7 +14,8 @@
/* Related Information */
ul.list-whats-related {
list-style-type: disc;
- margin: 0 0 0 8px;
+ margin: 0;
+ margin-{left}: 8px;
padding: 0;
}
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/block.css
--- a/public_html/layout/newpro/css/block.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/block.css Tue Apr 24 07:51:07 2012 +0900
@@ -18,7 +18,7 @@
div#leftblocks ol,
div#rightblocks ul,
div#rightblocks ol {
- padding-left: 0;
+ padding-{left}: 0;
}
diff -r 1328b5de4429 -r 514dcef28b9e public_html/layout/newpro/css/comment/comment.css
--- a/public_html/layout/newpro/css/comment/comment.css Tue Apr 24 01:53:21 2012 +0900
+++ b/public_html/layout/newpro/css/comment/comment.css Tue Apr 24 07:51:07 2012 +0900
@@ -97,7 +97,7 @@
list-style-type: none;
margin: 0 0 0.5em 0;
padding: 0;
- text-align: left;
+ text-align: {left};
}
/* Individual Comment (Tree) Title */
@@ -110,7 +110,8 @@
/* Individual Comment (Tree) Auther */
div.comments ul.thread li.author {
display: inline;
- margin: 0 0 0 8px;
+ margin: 0;
+ margin-{left}: 8px;
padding: 0;
}
@@ -121,59 +122,59 @@
/* Individual Comment Level(Nested | Tree) */
div.comments div.level-25,
div.comments ul.level-25 {
- margin-left: 0;
+ margin-{left}: 0;
}
div.comments div.level-25,
div.comments ul.level-25 {
- margin-left: 16px;
+ margin-{left}: 16px;
}
div.comments div.level-50,
div.comments ul.level-50 {
- margin-left: 32px;
+ margin-{left}: 32px;
}
div.comments div.level-100,
div.comments ul.level-100 {
- margin-left: 48px;
+ margin-{left}: 48px;
}
div.comments div.level-125,
div.comments ul.level-125 {
- margin-left: 64px;
+ margin-{left}: 64px;
}
div.comments div.level-150
div.comments ul.level-150 {
- margin-left: 80px;
+ margin-{left}: 80px;
}
div.comments div.level-175
div.comments ul.level-175 {
- margin-left: 96px;
+ margin-{left}: 96px;
}
div.comments div.level-200,
div.comments ul.level-200 {
- margin-left: 112px;
+ margin-{left}: 112px;
}
div.comments div.level-225,
div.comments ul.level-225 {
- margin-left: 128px;
+ margin-{left}: 128px;
}
More information about the geeklog-cvs
mailing list