Merge branch 'master' of github.com:roundcube/roundcubemail

8 files changed, 41 insertions, 18 deletions

diff --git a/skins/classic/embed.css b/skins/classic/embed.css
new file mode 100644
index 000000000..b9715c77c
--- /dev/null
+++ b/skins/classic/embed.css
@@ -0,0 +1,35 @@
+/**
+ * Roundcube webmail "embedded" stylesheets
+ *
+ * Copyright (c) 2013, The Roundcube Dev Team
+ *
+ * The contents are subject to the Creative Commons Attribution-ShareAlike
+ * License. It is allowed to copy, distribute, transmit and to adapt the work
+ * by keeping credits to the original autors in the README file.
+ * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+ */
+
+.rcmail-inline-message {
+  font-family: sans-serif;
+  font-size: 14px;
+  color: #000;
+  margin-bottom: .8em;
+  min-height: 20px;
+  padding: 10px 10px 6px 46px;
+  background: url(images/display/icons.png) 6px 3px no-repeat #F7FDCB;
+  border: 1px solid #C2D071;
+}
+
+.rcmail-inline-message > button {
+  margin-left: 1em;
+  vertical-align: baseline;
+}
+
+.rcmail-inline-message em {
+  font-size: 90%;
+  color: #666;
+}
+
+.rcmail-inline-buttons {
+  margin-bottom: 0;
+}
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 74bc0d7d8..54fabfa8b 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -8,8 +8,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 #addressview-left {
diff --git a/skins/larry/embed.css b/skins/larry/embed.css
index 8c4e95d42..2c8ba39dc 100644
--- a/skins/larry/embed.css
+++ b/skins/larry/embed.css
@@ -11,11 +11,12 @@
 
 .rcmail-inline-message {
 	font-family: sans-serif;
-	font-size: 14px;
-	color: #333;
+	font-size: 11px;
+	font-weight: bold;
+	color: #996600;
 	border: 1px solid #ffdf0e;
-	background-color: #fef893;
-	padding: 0.6em 1em;
+	background: url("images/messages.png") no-repeat scroll 5px -83px #fef893;
+	padding: 6px 12px 4px 30px;
 	margin-bottom: 0.8em;
 }
 
@@ -26,7 +27,6 @@
 
 .rcmail-inline-message em {
 	font-size: 90%;
-	color: #666;
 }
 
 .rcmail-inline-buttons {
diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
index 357ea220f..871cce4fd 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -7,8 +7,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 input.button {
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 6ad1f7ad1..2e2536a4e 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -8,8 +8,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 #mailview-left {
@@ -987,7 +985,7 @@ div.hide-headers {
 	color: #960;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
-	background-position: 5px -85px;
+	background-position: 5px -83px;
 	padding: 6px 12px 4px 30px;
 	white-space: normal;
 }
diff --git a/skins/larry/print.css b/skins/larry/print.css
index fa256746b..6481ea9e6 100644
--- a/skins/larry/print.css
+++ b/skins/larry/print.css
@@ -7,8 +7,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 body {
 	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index f098c68cb..f7adeba38 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -8,8 +8,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 body {
diff --git a/skins/larry/svggradients.css b/skins/larry/svggradients.css
index 06c6f4732..2172ac31a 100644
--- a/skins/larry/svggradients.css
+++ b/skins/larry/svggradients.css
@@ -7,8 +7,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 input.button {