From 0d56f82efa0273f5c05edb2b4222e600f076f087 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Tue, 9 Oct 2012 09:44:56 -0600
Subject: [PATCH] frost style improvements; various tweaks

---
 view/theme/frost-mobile/style.css          | 14 ++-
 view/theme/frost-mobile/theme.php          |  2 +-
 view/theme/frost/default.php               |  2 -
 view/theme/frost/style.css                 | 99 ++++++++++++----------
 view/theme/frost/theme.php                 |  2 +-
 view/theme/frost/threaded_conversation.tpl | 22 +++++
 6 files changed, 90 insertions(+), 51 deletions(-)
 create mode 100644 view/theme/frost/threaded_conversation.tpl

diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 40aa5768e3..15b9fa8d6e 100644
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -1140,8 +1140,11 @@ input#dfrn-url {
 	margin-top: 10px;
 }
 
+.toplevel_item {
+	margin-bottom: 60px;
+}
+
 .wall-item-content-wrapper {
-	margin-top: 60px;
 	padding-top: 30px;
 	border-top: 2px solid #AAAAAA;
 	position: relative;
@@ -1238,9 +1241,6 @@ input#dfrn-url {
     top: 80px;
 /*    z-index: 100;*/
 }
-.wall-item-wrapper {
-	margin-left:10px;
-}
 .wall-item-lock {
 	margin-top: 30px;
 	left: 105px;
@@ -1395,6 +1395,7 @@ input#dfrn-url {
 .wall-item-body {
 	text-align: justify;
 	float: left;
+	clear: left;
 /*	width: 300px;*/
 	overflow: hidden;
 	margin-top: 10px;
@@ -3289,6 +3290,11 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
+.filesavetags, .categorytags {
+	display: block;
+	clear: left;
+}
+
 .body-tag, .filesavetags, .categorytags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 7d95fc8884..b934522c6d 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -4,7 +4,7 @@
  * Name: Frost--mobile version
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.14
+ * Version: Version 0.2.15
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
diff --git a/view/theme/frost/default.php b/view/theme/frost/default.php
index cf30e1fcab..06ca40c174 100644
--- a/view/theme/frost/default.php
+++ b/view/theme/frost/default.php
@@ -28,11 +28,9 @@
 		<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
 		<div class='main-content-container'>
 		<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
-		<div class='section-wrapper'>
 		<section><?php if(x($page,'content')) echo $page['content']; ?>
 			<div id="page-footer"></div>
 		</section>
-		</div>
 		<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
 		<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
 		</div>
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index de454ce745..c12e14de74 100644
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -78,9 +78,10 @@ blockquote {
 }
 
 .hide-comments-outer {
-	margin-left: 0px;
+	margin-left: 75px;
 	font-weight: 700;
 	opacity: 0.4;
+	border-bottom: 1px solid #AAA;
 }
 .hide-comments-outer:hover {
 	opacity: 1.0;
@@ -297,37 +298,29 @@ aside {
 }
 
 /* section */
-div.section-wrapper {
+section {
 	width: 565px;
 
-	margin-left: auto;
-	margin-right: auto;
-
-	padding-right:2em;
-
 	display: block;
 
-	background-color: #ffffff;
-	background-image: url(border.jpg);
-	background-position: top right;
-	background-repeat: no-repeat;
-}
-
-section {
-	margin: 0px 0px 0px 0px;
-
-	width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 0px;
+	margin-bottom: 0px;
 
 	padding-left: 1em;
 	padding-right: 1em;
 	padding-top: 1em;
 
-	background-image: url(border.jpg);
+	background-color: #ffffff;
+/*	background-image: url(border.jpg);
 	background-position: top left;
-	background-repeat: no-repeat;
+	background-repeat: no-repeat;*/
 
 	min-height: 112px;
-	border-top: 1px solid #babdb6;	
+	border-top: 1px solid #babdb6;
+	border-left: 1px dotted #AAA;
+	border-right: 1px dotted #AAA;
 }
 
 .tabs {
@@ -1104,8 +1097,11 @@ input#dfrn-url {
 	margin-top: 10px;
 }
 
+.toplevel_item {
+	margin-bottom: 40px;
+}
+
 .wall-item-content-wrapper {
-	margin-top: 60px;
 	padding-top: 30px;
 	border-top: 2px solid #AAA;
 	position: relative;
@@ -1114,8 +1110,8 @@ input#dfrn-url {
 
 .wall-item-content-wrapper.comment {
 	margin-top: 10px;
-	padding-top: none;
-	margin-left: 50px;
+	padding-top: 0px;
+	margin-left: 75px;
 	border: none;
 }
 
@@ -1124,12 +1120,18 @@ input#dfrn-url {
 	margin-left: 0px;
 	opacity: 0.4;
 }
+.wall-item-dislike {
+	margin-bottom: 15px;
+}
 .wall-item-like:hover, .wall-item-dislike:hover {
 	opacity: 1.0;
 }
 
 .wall-item-like.comment, .wall-item-dislike.comment {
-	margin-left: 50px;
+	margin-left: 75px;
+}
+.wall-item-dislike.comment {
+	margin-bottom: 0px;
 }
 
 .wall-item-info {
@@ -1176,8 +1178,8 @@ input#dfrn-url {
 .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
 
-.comment .wall-item-photo-menu-button {	/*top: 44px;*/ top: 64px;}
-.comment .wall-item-photo-menu { /*top: 60px;*/ top: 80px; }
+.comment .wall-item-photo-menu-button {	/*top: 44px;*/ top: 34px;}
+.comment .wall-item-photo-menu { /*top: 60px;*/ top: 50px; }
 
 .wallwall .wwto {
     left: 50px;
@@ -1201,9 +1203,6 @@ input#dfrn-url {
     top: 70px;
     z-index: 100;
 }
-.wall-item-wrapper {
-	margin-left:10px;
-}
 .wall-item-lock {
 	margin-top: 30px;
 	left: 105px;
@@ -1212,6 +1211,7 @@ input#dfrn-url {
 }
 .comment .wall-item-lock {
 	left: 65px;
+	margin-top: 0px;
 }
 
 .wall-item-ago {
@@ -1349,6 +1349,7 @@ input#dfrn-url {
 .wall-item-body {
 	text-align: justify;
 	float: left;
+	clear: left;
 	/*width: 450px;*/
 	width: 100%;
 	margin-top: 10px;
@@ -1364,28 +1365,23 @@ input#dfrn-url {
 
 .wall-item-tools {
 	clear: both;
-/*	background-image: url("head.jpg");
-	background-position: 0 -20px;
-	background-repeat: repeat-x;*/
+
 	margin-top: 10px;
 	margin-left: 0px;
-	margin-bottom: 7px;
-/*   	padding: 5px 10px 0px;*/
-	padding: 5px 10px 0px 2px;
-	height: 28px;
+	padding: 10px 10px 0px 2px;
+
+	height: 22px;
+
 	border-bottom: 1px solid #ddd;
 }
 .wall-item-author {
-/*	margin-top: 10px;*/
 	margin-top: 0px;
 }
 
 .comment .wall-item-tools {
-/*	background:none;*/
-/*	background-image: url("head.jpg");
-	background-position: 0 -20px;
-	background-repeat: repeat-x;*/
 	margin-left: 0px;
+	margin-top: 0px;
+	padding-top: 0px;
 } 
 
 .comment-edit-wrapper {
@@ -1398,7 +1394,7 @@ input#dfrn-url {
 	display: block;
 	margin-top: 15px;
 	background: #f3f3f3;
-	margin-left: 50px;
+	margin-left: 75px;
 }
 
 .comment-wwedit-wrapper.comment {
@@ -3098,6 +3094,11 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
+.filesavetags, .categorytags {
+	display: block;
+	clear: left;
+}
+
 .body-tag, .filesavetags, .categorytags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
@@ -3121,8 +3122,20 @@ aside input[type='text'] {
 }
 
 
-#item-delete-selected {
+#item-delete-selected-top {
 	margin-top: 30px;
+	padding-bottom: 1.5em;
+}
+#item-delete-selected-top-icon, #item-delete-selected-top-desc {
+	float: left;
+	margin-right: 5px;
+}
+#item-delete-selected-top-desc:hover {
+	text-decoration: underline;
+}
+
+#item-delete-selected {
+	margin-top: 0px;
 }
 
 #item-delete-selected-end {
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index 4ab6519886..a3d4b0ac96 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -4,7 +4,7 @@
  * Name: Frost
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.12
+ * Version: Version 0.3
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl
new file mode 100644
index 0000000000..1e77f91c2c
--- /dev/null
+++ b/view/theme/frost/threaded_conversation.tpl
@@ -0,0 +1,22 @@
+{{ if $dropping }}
+<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-top-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-top-desc" >$dropping</div>
+</div>
+{{ endif }}
+
+$live_update
+
+{{ for $threads as $item }}
+{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}