Merge pull request #10 from fedemp/master

Fix display of multi-line paragraphs broken in options page (as seen with locales other than en-us), clean up Charcoal links. Thanks @fedemp!
habari · Nov 30, 2011 · 7da8361 · 7da8361
2 parents b2a8f9c + 5152829
commit 7da8361
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/admin/css/admin.css b/admin/css/admin.css
@@ -1986,7 +1986,9 @@ body.page-themes .currenttheme .thumb {
 /*- OPTIONS PAGE */
 
 body.page-options .container .item {
-	line-height: 34px;
+	line-height: 1.5;
+	padding-top: 1em;
+	padding-bottom: 1em;
 }
 
 body.page-options #title {
@@ -3025,4 +3027,4 @@ ol.tree, ol.tree ol {
 .textmulti_item {
 	display: inline-block;
     margin-top: 5px;
-}
+}
diff --git a/themes/charcoal/style.css b/themes/charcoal/style.css
@@ -207,6 +207,9 @@ li.login a:hover {
 	margin:0;
 	padding:0;
 }
+body.display_home #main-posts {
+	padding:20px 0 0 0;
+}
 .post-nav{
 	margin-top:10px;
 	height:15px;
@@ -383,7 +386,6 @@ li.login a:hover {
 }
 
 #habari-link {
-	margin-top: -10px;
 	margin-right: 0;
 	height: 58px;
 	text-align: right;