From: takezoe <takezoe@871d6764-1e22-0410-b313-a55050885396>
Date: Mon, 29 Aug 2011 23:46:17 +0000 (+0000)
Subject: コラムとNOTEのスタイルを修正。
X-Git-Url: http://git.osdn.net/view?p=fswiki%2Fsandbox.git;a=commitdiff_plain;h=9cbb12c5538882745a575b13be534e2ba747cc3d

コラムとNOTEのスタイルを修正。
---

diff --git a/takezoe/plugin/book/Column.pm b/takezoe/plugin/book/Column.pm
index b29715d..686b6fe 100644
--- a/takezoe/plugin/book/Column.pm
+++ b/takezoe/plugin/book/Column.pm
@@ -31,8 +31,9 @@ sub block {
 	
 	$self->{'count'}++;
 	
-	return '<div class="column-title"><a name="c'.($self->{'count'} - 1).'">¥³¥é¥à: '.Util::escapeHTML($title).'</a></div>'.
-		'<div class="column-body">'.$wiki->process_wiki($content).'</div>';
+	return '<div class="column"><div class="column-title">".
+		"<a name="c'.($self->{'count'} - 1).'">¥³¥é¥à: '.Util::escapeHTML($title).'</a></div>'.
+		'<div class="column-body">'.$wiki->process_wiki($content).'</div></div>';
 }
 
 1;
diff --git a/takezoe/plugin/book/Install.pm b/takezoe/plugin/book/Install.pm
index bfd4fa7..fd02863 100644
--- a/takezoe/plugin/book/Install.pm
+++ b/takezoe/plugin/book/Install.pm
@@ -103,45 +103,40 @@ img {
   border: 1px solid silver;
 }
 
+div.column {
+  border: 1px solid gray;
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-top: 10px;
+  margin-bottom: 20px;
+}
+
 div.column-title {
-  border-top: 1px solid gray;
-  border-left: 1px solid gray;
-  border-right: 1px solid gray;
-  padding: 4px;
   background-color: silver;
   font-weight: bold;
-  margin-left: 20px;
-  margin-right: 20px;
+  padding: 4px;
 }
 
 div.column-body {
-  border-bottom: 1px solid gray;
-  border-left: 1px solid gray;
-  border-right: 1px solid gray;
   padding: 4px;
+}
+
+div.note {
+  border: 2px dotted #FF8888;
+  background-color: #FFEEEE;
+  margin-bottom: 20px;
   margin-left: 20px;
+  margin-top: 10px;
   margin-right: 20px;
-  margin-bottom: 20px;
 }
 
 div.note-title {
-  border-top: 1px dotted gray;
-  border-left: 1px dotted gray;
-  border-right: 1px dotted gray;
-  padding: 4px;
   font-weight: bold;
-  margin-left: 20px;
-  margin-right: 20px;
+  padding: 4px;
 }
 
 div.note-body {
-  border-bottom: 1px dotted gray;
-  border-left: 1px dotted gray;
-  border-right: 1px dotted gray;
   padding: 4px;
-  margin-left: 20px;
-  margin-right: 20px;
-  margin-bottom: 20px;
 }
 
 span.keyword {
diff --git a/takezoe/plugin/book/Note.pm b/takezoe/plugin/book/Note.pm
index 0720a23..5d23bac 100644
--- a/takezoe/plugin/book/Note.pm
+++ b/takezoe/plugin/book/Note.pm
@@ -27,8 +27,8 @@ sub block {
 	my $wiki    = shift;
 	my $content = shift;
 	
-	return '<div class="note-title">Note</div>'.
-		'<div class="note-body">'.$wiki->process_wiki($content).'</div>';
+	return '<div class="note"><div class="note-title">Note</div>'.
+		'<div class="note-body">'.$wiki->process_wiki($content).'</div></div>';
 }
 
 1;