aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-03 14:52:03 -0800
committerfriendica <info@friendica.com>2013-12-03 14:52:03 -0800
commit8e1652c5f2ae0afcaaab90653e5c313e129b1fde (patch)
tree415ef993d3d5d502b9f90fe9e927bf75b656040a
parentd96f5e2c081b582a77097b06706416d5ff371211 (diff)
parenta03a198bc1dfd352484f270d0bcd9647b1b33f1c (diff)
downloadvolse-hubzilla-8e1652c5f2ae0afcaaab90653e5c313e129b1fde.tar.gz
volse-hubzilla-8e1652c5f2ae0afcaaab90653e5c313e129b1fde.tar.bz2
volse-hubzilla-8e1652c5f2ae0afcaaab90653e5c313e129b1fde.zip
Merge pull request #221 from git-marijus/master
split out mod_message
-rw-r--r--view/css/mod_message.css100
-rw-r--r--view/theme/redbasic/css/style.css108
-rwxr-xr-xview/tpl/mail_list.tpl2
3 files changed, 114 insertions, 96 deletions
diff --git a/view/css/mod_message.css b/view/css/mod_message.css
new file mode 100644
index 000000000..c278f4d53
--- /dev/null
+++ b/view/css/mod_message.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;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 33e89d3f2..8251db4a2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1590,34 +1590,7 @@ tr.mceLast {
margin-left: 200px;
}
-
-#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;
-}
-
+/* might be obsolete
.mail-list-sender,
.mail-list-detail {
float: left;
@@ -1637,8 +1610,6 @@ a.mail-list-link {
padding: 4px 0;
}
-
-
.mail-list-outside-wrapper-end {
clear: both;
}
@@ -1656,48 +1627,10 @@ a.mail-list-link {
.mail-list-delete-icon {
border: none;
}
+*/
-.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-outside-wrapper-end {
- clear: both;
-}
-
-.mail-conv-outside-wrapper {
- margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
- float: right;
- margin-right: 30px;
- margin-top: 15px;
-}
-.mail-conv-recall-wrapper {
- float: right;
- margin-right: 10px;
- margin-top: 15px;
-}
-
-.mail-conv-break {
- clear: both;
-}
-
-.mail-conv-delete-icon {
- border: none;
-}
+/* might be obsolete
.message-links ul {
list-style-type: none;
padding: 0px;
@@ -1714,6 +1647,7 @@ a.mail-list-link {
.message-links-end {
clear: both;
}
+*/
#sidebar-group-list ul {
list-style-type: none;
@@ -1818,7 +1752,6 @@ a.mail-list-link {
margin-bottom: 15px;
}
-
.group-delete-wrapper {
float: right;
margin-right: 50px;
@@ -3129,34 +3062,12 @@ ul.menu-popup {
.reshared-content { margin-left: 30px; }
.shared_header img { margin-right: 10px; }
-
-#mail-list-wrapper {
-border-top: 1px solid #ccc;
-padding: 5px 5px 5px 5px;
-}
-
-span.mail-list {
-float: left;
-width: 20%;
-}
-
-.mail-list-remove {
-width: 5% !important;
-}
-
+/* might be obsolete
span.mail-delete {
float: left;
width: 30px;
}
-
-img.mail-list-sender-photo {
-height: 24px;
-width: 24px;
-float: left;
-margin-right: 30px;
--moz-border-radius: $radiuspx;
-border-radius: $radiuspx;
-}
+*/
.tag1 {
font-size : 1.0em !important;
@@ -3326,3 +3237,10 @@ text-decoration: none;
color: $toolicon_colour;
margin-right: 10px;
}
+
+/* message */
+
+img.mail-list-sender-photo {
+ -moz-border-radius: $radiuspx;
+ border-radius: $radiuspx;
+}
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 24966ad1d..c96827996 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
<div class="generic-content-wrapper" id="mail-list-wrapper">
<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
<span class="mail-list">{{$from_name}}</span>
- <span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+ <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-list" title="{{$date}}">{{$date}}</span>
<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
<div class="clear">&nbsp;</div>