aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-12-22 20:45:31 +0000
committerThomas Willingham <founder@kakste.com>2013-12-22 20:45:31 +0000
commit3502a2e86b1d4924fea3b0eac6c3ce499eea2f16 (patch)
tree823970af414e5c17ca660fc9cb8d5e6fefa8356d /view/css
parent7ac00d02d110ec2f2d33779d8316e17c13cda149 (diff)
parent7e7b5bfa4930493a8feae10b0550e29797956c70 (diff)
downloadvolse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.gz
volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.bz2
volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/css')
-rw-r--r--view/css/conversation.css10
-rw-r--r--view/css/mod_mail.css100
2 files changed, 109 insertions, 1 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5bf6a3607..8125b6278 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -110,7 +110,7 @@
/* conversation */
-.thread-wrapper .toplevel_item {
+.thread-wrapper.toplevel_item {
width: 92%;
}
@@ -125,6 +125,14 @@
position: relative;
}
+.wall-item-content-wrapper .wall-item-delete-wrapper {
+ opacity: 0;
+}
+
+.wall-item-content-wrapper:hover .wall-item-delete-wrapper {
+ opacity: 1;
+}
+
.wall-item-info {
display: block;
float: left;
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
new file mode 100644
index 000000000..c278f4d53
--- /dev/null
+++ b/view/css/mod_mail.css
@@ -0,0 +1,100 @@
+/* message */
+
+#mail-list-wrapper {
+ border-top: 1px solid #ccc;
+ padding: 5px 5px 5px 5px;
+}
+
+span.mail-list {
+ float: left;
+ width: 20%;
+}
+
+img.mail-list-sender-photo {
+ height: 24px;
+ width: 24px;
+ float: left;
+ margin-right: 30px;
+}
+
+.mail-list-remove {
+ width: 5% !important;
+}
+
+/* message/new */
+
+#prvmail-to-label,
+#prvmail-subject-label,
+#prvmail-expires-label,
+#prvmail-message-label {
+ margin-bottom: 10px;
+ margin-top: 20px;
+}
+
+#prvmail-submit {
+ float: left;
+ margin-top: 10px;
+ margin-right: 30px;
+}
+
+#prvmail-upload-wrapper,
+#prvmail-attach-wrapper,
+#prvmail-link-wrapper,
+#prvmail-expire-wrapper,
+#prvmail-encrypt-wrapper,
+#prvmail-rotator-wrapper {
+ float: left;
+ margin-top: 10px;
+ margin-right: 10px;
+ width: 24px;
+ cursor: pointer;
+}
+
+#prvmail-end {
+ clear: both;
+}
+
+/* message/id */
+
+.mail-conv-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+ float: left;
+}
+
+.mail-conv-detail {
+ margin-left: 20px;
+ width: 500px;
+}
+
+.mail-conv-subject {
+ font-size: 1.4em;
+ margin: 10px 0;
+}
+
+.mail-conv-delete-wrapper {
+ float: right;
+ margin-right: 30px;
+ margin-top: 15px;
+}
+
+.mail-conv-delete-icon {
+ border: none;
+}
+
+.mail-conv-recall-wrapper {
+ float: right;
+ margin-right: 10px;
+ margin-top: 15px;
+}
+
+.mail-conv-outside-wrapper-end {
+ clear: both;
+}
+
+.mail-conv-break {
+ clear: both;
+}