Changeset 1824 for trunk

Timestamp:

08/23/2010 01:22:07 PM (21 months ago)

Author:

Xiping.Wang

Message:

[trunk] merge

Location:

trunk

Files:

• . (modified) (1 prop)
• _InstallationResources (modified) (1 prop)
• blogs (modified) (1 prop)
• blogs/wp-content/plugins/wp-page-numbers/default/wp-page-numbers.css (modified) (1 diff)
• blogs/wp-content/themes/mike2 (modified) (1 prop)
• bookmarks/scuttle.css (modified) (1 diff)
• bookmarks/templates_omB/top.inc.php (modified) (1 diff)
• common/skins/mike2/common.css (modified) (1 diff)
• home (modified) (1 prop)
• home/mylinks.php (modified) (1 prop)
• w (modified) (1 prop)

trunk/blogs/wp-content/plugins/wp-page-numbers/default/wp-page-numbers.css

@@ -28 +28 @@
         float: left;
         display: block;
-    padding: 0px;
+    padding: 0px !important;
 }
 

trunk/bookmarks/scuttle.css

@@ -72 +72 @@
 /*             STYLES FOR THE STAR RATER                */      
 .zero-rating{ margin: 0px; padding:0px; width: 12px; height: 12px; position: relative; cursor: hand; border:0px; }
-.unit-rating{ margin-left: 40px; width: 60px; height: 12px; background: url('images/stars.gif') top left repeat-x; margin-bottom: 5px; position: relative;}
-.unit-rating li{float: left; width: 12px; height: 12px; }
+.unit-rating{ margin-left: 40px; width: 60px; height: 12px; background: url('images/stars.gif') top left repeat-x; margin-bottom: 5px; position: relative; list-style: none;}
+.unit-rating li{float: left; width: 12px; height: 12px; list-style: none;}
 .unit-rating li a{ display:block; width:12px; height: 12px; text-decoration: none; z-index: 20; position: absolute;}
 .unit-rating li a:hover{ background: url('images/stars.gif') left center; z-index: 2; left: 0px;}

trunk/bookmarks/templates_omB/top.inc.php

@@ -64 +64 @@
                 </td>
                 <td id="content" class="contentWrapper">
-                        <div id="bodyContent">
+                        <div>
                                 <!-- Removed by zhongzhen according to Ariel's design on 2010-08-14 
                                 <br>Here you can save all your bookmarks online, share them with other people, and see what other people are bookmarking. 

trunk/common/skins/mike2/common.css

@@ -132 +132 @@
 a.new, #p-personal a.new {color: #ba0000 !important;}
 .farm {text-align: right; font-size: 11px; padding-top: 10px;}
-#bodyContent table { border-collapse: collapse;} 
-#bodyContent table td {padding: 5px;}
 #bodyContent li {list-style-position: inside; padding-left: 15px;}
 #bodyContent a.external,