[geeklog-hg] geeklog: Fixed css and template bug that style of admin block wi...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Sep 26 10:12:41 EDT 2012
changeset 8832:f3a0a93c2ea5
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f3a0a93c2ea5
user: dengen
date: Wed Sep 26 23:11:38 2012 +0900
description:
Fixed css and template bug that style of admin block will be lost when you put it to the light bar. Also user block and section block.
diffstat:
public_html/layout/denim/blockheader-list.thtml | 4 ++--
public_html/layout/denim/css_ltr/style.css | 9 ++++++---
public_html/layout/denim/css_rtl/style.css | 9 ++++++---
public_html/layout/denim/javascript/script.js | 1 +
public_html/layout/modern_curve/blockheader-list.thtml | 4 ++--
public_html/layout/modern_curve/css/block.css | 8 ++++++++
public_html/layout/professional_css/blockheader-list.thtml | 4 ++--
public_html/layout/professional_css/css/block.css | 8 ++++++++
8 files changed, 35 insertions(+), 12 deletions(-)
diffs (246 lines):
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/denim/blockheader-list.thtml
--- a/public_html/layout/denim/blockheader-list.thtml Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/denim/blockheader-list.thtml Wed Sep 26 23:11:38 2012 +0900
@@ -1,9 +1,9 @@
<!-- blockheader-list.thtml { -->
-<div class="block-left">
+<div class="block-list">
<h2 class="block-title">{block_title}{block_help}</h2>
- <div class="block-left-content">
+ <div class="block-list-content">
<ul class="noliststyle">
<!-- } blockheader-list.thtml -->
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/denim/css_ltr/style.css
--- a/public_html/layout/denim/css_ltr/style.css Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/denim/css_ltr/style.css Wed Sep 26 23:11:38 2012 +0900
@@ -1434,7 +1434,8 @@
/* Block */
.block-left,
-.block-right {
+.block-right,
+.block-list {
margin: 0 8px 0.5em 8px;
padding: 8px 0;
font-size: 95%;
@@ -3431,7 +3432,8 @@
}
.block-left,
- .block-right {
+ .block-right,
+ .block-list {
font-size: 100%;
margin: 0 10px;
padding: 0;
@@ -3498,7 +3500,8 @@
}
.block-left-content,
- .block-right-content {
+ .block-right-content,
+ .block-list-content {
padding: 10px 0;
text-shadow: 0 1px 0 #FFF;
}
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/denim/css_rtl/style.css
--- a/public_html/layout/denim/css_rtl/style.css Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/denim/css_rtl/style.css Wed Sep 26 23:11:38 2012 +0900
@@ -1434,7 +1434,8 @@
/* Block */
.block-left,
-.block-right {
+.block-right,
+.block-list {
margin: 0 8px 0.5em 8px;
padding: 8px 0;
font-size: 95%;
@@ -3431,7 +3432,8 @@
}
.block-left,
- .block-right {
+ .block-right,
+ .block-list {
font-size: 100%;
margin: 0 10px;
padding: 0;
@@ -3498,7 +3500,8 @@
}
.block-left-content,
- .block-right-content {
+ .block-right-content,
+ .block-list-content {
padding: 10px 0;
text-shadow: 0 1px 0 #FFF;
}
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/denim/javascript/script.js
--- a/public_html/layout/denim/javascript/script.js Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/denim/javascript/script.js Wed Sep 26 23:11:38 2012 +0900
@@ -122,6 +122,7 @@
obj.addClass("show");
$(".block-left-content").css("display", "none");
$(".block-right-content").css("display", "none");
+ $(".block-list-content").css("display", "none");
obj.live('touchstart', function() {
this.touched = true;
});
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/modern_curve/blockheader-list.thtml
--- a/public_html/layout/modern_curve/blockheader-list.thtml Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/modern_curve/blockheader-list.thtml Wed Sep 26 23:11:38 2012 +0900
@@ -1,9 +1,9 @@
<!-- blockheader-list.thtml { -->
-<div class="block-left">
+<div class="block-list">
<h2>{block_title}{block_help}</h2>
- <div class="block-left-content">
+ <div class="block-list-content">
<ul>
<!-- } blockheader-list.thtml -->
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/modern_curve/css/block.css
--- a/public_html/layout/modern_curve/css/block.css Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/modern_curve/css/block.css Wed Sep 26 23:11:38 2012 +0900
@@ -191,6 +191,7 @@
margin-{right}: 8px;
}
+div#leftblocks div.block-list,
div#leftblocks div.block-left {
margin-bottom: 12px;
border-top: 1px solid #aaa;
@@ -203,6 +204,7 @@
}
/* Block Title */
+div#leftblocks div.block-list h2,
div#leftblocks div.block-left h2 {
margin: 0 0 0.5em 0;
padding: 0 0 0.1em 0;
@@ -211,11 +213,13 @@
}
/* Help Icon */
+div#leftblocks div.block-list h2 img,
div#leftblocks div.block-left h2 img {
vertical-align: middle;
}
/* Block Content */
+div#leftblocks div.block-list div.block-list-content,
div#leftblocks div.block-left div.block-left-content {
margin: 0;
padding: 0;
@@ -234,6 +238,7 @@
margin-{left}: 8px;
}
+div#rightblocks div.block-list,
div#rightblocks div.block-right {
margin-bottom: 12px;
border-top: 1px solid #aaa;
@@ -246,6 +251,7 @@
}
/* Block Title */
+div#rightblocks div.block-list h2,
div#rightblocks div.block-right h2 {
margin: 0 0 0.5em 0;
padding: 0 0 0.1em 0;
@@ -254,11 +260,13 @@
}
/* Help Icon */
+div#rightblocks div.block-list h2 img,
div#rightblocks div.block-right h2 img {
vertical-align: middle;
}
/* Block Content */
+div#rightblocks div.block-list div.block-list-content,
div#rightblocks div.block-right div.block-right-content {
margin: 0;
padding: 0;
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/professional_css/blockheader-list.thtml
--- a/public_html/layout/professional_css/blockheader-list.thtml Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/professional_css/blockheader-list.thtml Wed Sep 26 23:11:38 2012 +0900
@@ -1,9 +1,9 @@
<!-- blockheader-list.thtml { -->
-<div class="block-left">
+<div class="block-list">
<h2>{block_title}{block_help}</h2>
- <div class="block-left-content">
+ <div class="block-list-content">
<ul>
<!-- } blockheader-list.thtml -->
diff -r d617abaca465 -r f3a0a93c2ea5 public_html/layout/professional_css/css/block.css
--- a/public_html/layout/professional_css/css/block.css Tue Sep 25 22:17:29 2012 +0900
+++ b/public_html/layout/professional_css/css/block.css Wed Sep 26 23:11:38 2012 +0900
@@ -169,12 +169,14 @@
--------------------------------------*/
/* Block */
+div#leftblocks div.block-list,
div#leftblocks div.block-left {
margin: 0 8px 0.5em 8px;
padding: 8px 0;
}
/* Block Title */
+div#leftblocks div.block-list h2,
div#leftblocks div.block-left h2 {
margin: 0 0 0.5em 0;
padding: 0 0 0.1em 0;
@@ -184,11 +186,13 @@
}
/* Help Icon */
+div#leftblocks div.block-list h2 img,
div#leftblocks div.block-left h2 img {
vertical-align: middle;
}
/* Block Content */
+div#leftblocks div.block-list div.block-list-content,
div#leftblocks div.block-left div.block-left-content {
margin: 0;
padding: 0;
@@ -201,12 +205,14 @@
--------------------------------------*/
/* Block */
+div#rightblocks div.block-list,
div#rightblocks div.block-right {
margin: 0 8px 0.5em 8px;
padding: 8px 0;
}
/* Block Title */
+div#rightblocks div.block-list h2,
div#rightblocks div.block-right h2 {
margin: 0 0 0.5em 0;
padding: 0 0 0.1em 0;
@@ -216,11 +222,13 @@
}
/* Help Icon */
+div#rightblocks div.block-list h2 img,
div#rightblocks div.block-right h2 img {
vertical-align: middle;
}
/* Block Content */
+div#rightblocks div.block-list div.block-list-content,
div#rightblocks div.block-right div.block-right-content {
margin: 0;
padding: 0;
More information about the geeklog-cvs
mailing list