Changeset 1827 for trunk

Timestamp:

08/24/2010 10:19:29 AM (21 months ago)

Author:

Xiping.Wang

Message:

[trunk] merge omcollab_ui

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)
• common/skins/mike2/common.css (modified) (1 diff)
• home (modified) (1 prop)
• home/mylinks.php (modified) (1 prop)
• w (modified) (1 prop)
• w/skins/Mike2.php (modified) (1 diff)
• w/skins/mike2/main.css (modified) (3 diffs)

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

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

trunk/bookmarks/scuttle.css

@@ -16 +16 @@
 div.meta { color: #666666; font-size: 10px; padding-left: 20px; margin-bottom: 5px;}
 div.meta span { color: #F00; }
-.xfolkentry { border-bottom: 1px dotted #AAA; margin-bottom: 0; padding: 1em 0em; overflow: hidden;}
+.xfolkentry { border-bottom: 1px dotted #AAA; margin-bottom: 0; padding: 1em 0em; overflow: hidden; list-style: none;}
 .xfolkentry .link {overflow: hidden;}
 .xfolkentry .deleted { opacity: 0.5; }

trunk/common/skins/mike2/common.css

@@ -117 +117 @@
 
 .rtl #content { text-align: right; }
-.ltr #content { text-align: left; }
+.ltr #content { text-align: justify; }
 #content h2{ padding: 6px 10px 0 0; }
 

trunk/w/skins/Mike2.php

@@ -187 +187 @@
                         <!-- start content -->
                         <?php $this->html('bodytext') ?>
-                        <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
+                        <?php if ($this->data['catlinks']) { ?><div id="catlinks"><?php $this->html('catlinks') ?></div><?php } ?>
                         <!-- end content -->
                         <div class="visualClear"></div>

trunk/w/skins/mike2/main.css

@@ -186 +186 @@
 
 /* emulate center */
-.center {
-    width: 100%;
-    text-align: center;
-}
 *.center * {
     margin-left: auto;
@@ -288 +284 @@
     padding: 3px !important;
     background-color: #f9f9f9;
-    font-size: 94%;
     text-align: center;
     overflow: hidden;
@@ -297 +292 @@
 html .thumbcaption {
     border: none;
-    text-align: left;
     line-height: 1.4em;
     padding: 3px !important;
-    font-size: 94%;
 }
 div.magnify {