Merge branch 'dev-canned-responses'

Conflicts (resolved):
	skins/classic/includes/settingstabs.html
	skins/larry/includes/settingstabs.html

1 files changed, 36 insertions, 3 deletions

diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 7b5e61d48..2929713e1 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1440,6 +1440,20 @@ body.iframe .footerleft.floating:before,
 	font-size: 12px;
 }
 
+.propform div.prop {
+	margin-bottom: 0.5em;
+}
+
+.propform div.prop.block label {
+	display: block;
+	margin-bottom: 0.3em;
+}
+
+.propform div.prop.block input,
+.propform div.prop.block textarea {
+	width: 95%;
+}
+
 fieldset.floating {
 	float: left;
 	margin-right: 10px;
@@ -1817,7 +1831,11 @@ ul.proplist li {
 }
 
 .toolbar a.button.download {
-	background-position: center -1906px;
+	background-position: center -1892px;
+}
+
+.toolbar a.button.responses {
+	background-position: center -1932px;
 }
 
 a.menuselector {
@@ -1924,6 +1942,7 @@ select.decorated option {
 }
 
 ul.toolbarmenu,
+ul.toolbarmenu ul,
 #rcmKSearchpane ul {
 	margin: 0;
 	padding: 0;
@@ -1943,13 +1962,13 @@ ul.toolbarmenu li,
 }
 
 .googie_list tr:first-child td,
-ul.toolbarmenu li:first-child,
+ul.toolbarmenu > li:first-child,
 select.decorated option:first-child {
 	border-top: 0;
 }
 
 .googie_list tr:last-child td,
-ul.toolbarmenu li:last-child,
+ul.toolbarmenu > li:last-child,
 select.decorated option:last-child {
 	border-bottom: 0;
 }
@@ -2003,6 +2022,11 @@ ul.toolbarmenu li label {
 	text-shadow: 0px 1px 1px #333;
 }
 
+ul.toolbarmenu li.separator label {
+	color: #bbb;
+	font-style: italic;
+}
+
 ul.toolbarmenu li a.icon {
 	color: #eee;
 	padding: 2px 6px;
@@ -2081,6 +2105,15 @@ ul.toolbarmenu li span.conversation {
 	background-position: 0 -1532px;
 }
 
+#snippetslist {
+	max-width: 200px;
+}
+
+#snippetslist li a {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 #rcmKSearchpane {
 	border-radius: 0 0 4px 4px;
 	border-top: 0;