diff options
author | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
commit | 0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (patch) | |
tree | c677adb7c0e8140bdb1e115a95d1aa23fdf734ed /view/theme/quattro/quattro.less | |
parent | 311e35731c52102cbce3befc6343f179080ad38c (diff) | |
parent | 8cacff69858c2ad097bafb80c93405e79c311edf (diff) | |
download | volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.gz volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.bz2 volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.zip |
Merge remote branch 'upstream/master'
Conflicts:
include/bbcode.php
Diffstat (limited to 'view/theme/quattro/quattro.less')
-rwxr-xr-x | view/theme/quattro/quattro.less | 71 |
1 files changed, 61 insertions, 10 deletions
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index ac84e0eff..9d2608261 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -309,14 +309,51 @@ aside { .allcontact-link { float: right; margin: 5px 0px; } .contact-block-content { clear: both; - overflow: auto; height: auto; + overflow: hidden; + height: auto; } + /*.contact-block-div { width:60px; height: 60px; }*/ .contact-block-link { float: left; margin: 0px 2px 2px 0px; - img { widht: 48px; height: 58px; } + img { 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, @@ -338,6 +375,7 @@ aside { top: -50px; } } +/* #group-members { margin-top: 20px; padding: 10px; @@ -360,9 +398,10 @@ aside { } .contact-block-div { float: left; - width: 52px; - height: 52px; -} + width: 60px; + height: 60px; +}*/ + /* widget */ .widget { margin-bottom: 2em; @@ -516,6 +555,8 @@ section { } +.shiny { border-right:10px solid @ShinyBorderColor; } +#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; } .wall-item-tags { padding-top: 5px; } @@ -554,7 +595,7 @@ section { right: 5px; } -/* contacts menu */ + .contact-photo-wrapper { position: relative; } .contact-photo { width: 48px; height: 48px; @@ -571,9 +612,14 @@ section { .contact-wrapper { float: left; - width: 90px; + width: 300px; height: 90px; - margin-bottom: 15px; + padding-right: 10px; + margin: 0 10px 10px 0px; + .contact-photo-wrapper { + float: left; + margin-right: 10px; + } .contact-photo { width: 80px; height: 80px; img { width: 80px; height: 80px; } @@ -592,8 +638,13 @@ section { img { width: 175px; height: 175px; } } } -.contact-name { text-align: center; font-weight: bold; } -.contact-details { color: @Grey3;} +.contact-name { font-weight: bold; padding-top: 15px; } +.contact-details { + color: @Grey3; white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + /* editor */ .jothidden { display: none; } #jot { |