diff options
author | zottel <github@zottel.net> | 2012-03-30 09:03:43 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-30 09:03:43 +0200 |
commit | 2212e6931096d188be2dea27bcb4877f16c5c2f8 (patch) | |
tree | a0a6b3cec6b1b4108c62ff689e8842d49226b982 /view/theme/quattro-green | |
parent | 953840cf822718cba66a0727b576c674c6e44875 (diff) | |
parent | d22b3a1d9c295f5545cc20e1af786cb79e6553a5 (diff) | |
download | volse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.tar.gz volse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.tar.bz2 volse-hubzilla-2212e6931096d188be2dea27bcb4877f16c5c2f8.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/quattro-green')
-rwxr-xr-x | view/theme/quattro-green/colors.less | 8 | ||||
-rwxr-xr-x | view/theme/quattro-green/style.css | 149 |
2 files changed, 128 insertions, 29 deletions
diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro-green/colors.less index 9eee19f4c..bc78c3fda 100755 --- a/view/theme/quattro-green/colors.less +++ b/view/theme/quattro-green/colors.less @@ -98,3 +98,11 @@ @JotLoadingBackgroundColor: @Grey1; @JotPreviewBackgroundColor: @Green4; +@MessageNewBackgroundColor: @Blue1; +@MessageNewBorderColor: @Blue3; +@MessageNewColor: @Grey1; + +@MailListBackgroundColor: #f6f7f8; + +@MailDisplaySubjectColor: @Grey5; +@MailDisplaySubjectBackgroundColor: #f6f7f8; diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro-green/style.css index 2f463c96c..8e3ddd9b8 100755 --- a/view/theme/quattro-green/style.css +++ b/view/theme/quattro-green/style.css @@ -626,35 +626,6 @@ aside #profiles-menu { width: 48px; height: 48px; } -/* mail view */ -.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-break { - clear: both; -} -.mail-conv-delete-icon { - border: none; -} /* group member */ #contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { float: right; @@ -1355,6 +1326,9 @@ ul.tabs li .active { .field input, .field textarea { width: 400px; } +.field input[type="checkbox"], .field input[type="radio"] { + width: auto; +} .field textarea { height: 100px; } @@ -1503,6 +1477,123 @@ ul.tabs li .active { left: 0px; top: 63px; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +/* mail view */ +/* +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +*/ /* page footer */ footer { height: 100px; |