Merge remote-tracking branch 'friendica/master' into randomerror

[friendica.git] / view / theme / quattro / quattro.less

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 8fcf7f8171e69d50053fbf401fc354b69d9dcc0a..27c48f195223f3e83b298c223a44da11a1a762c3 100755 (executable)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -309,16 +309,99 @@ 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,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
+       float: right;
+       margin-right: 50px;
+        .drophide {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            opacity: 0.3;
+            position: relative;
+            top: -50px;
+        }
+        .drop {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            position: relative;
+            top: -50px;
+        }
+}
+/*
+#group-members {
+       margin-top: 20px;
+       padding: 10px;
+       height: 250px;
+       overflow: auto;
+       border: 1px solid #ddd;
+}
+#group-members-end {
+       clear: both;
+}
+#group-all-contacts {
+       padding: 10px;
+       height: 450px;
+       overflow: auto;
+       border: 1px solid #ddd;
+}
+#group-all-contacts-end {
+       clear: both;
+       margin-bottom: 10px;
+}
+.contact-block-div {
+       float: left;
+       width: 60px;
+       height: 60px;
+}*/
+ 
 /* widget */
 .widget {
        margin-bottom: 2em;
@@ -472,6 +555,8 @@ section {
 
 }
 
+.shiny { border-right:10px solid @ShinyBorderColor; }
+#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; }
 
 
 .wall-item-tags { padding-top: 5px; }
@@ -503,7 +588,14 @@ section {
 }
 .wwto .contact-photo { width: 25px; height: 25px; }
 
-/* contacts menu */
+
+#pause {
+ position: fixed;
+ bottom: 5px;
+ right: 5px;
+}
+
+
 .contact-photo-wrapper { position: relative; }
 .contact-photo { 
        width: 48px; height: 48px;
@@ -520,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; }
@@ -541,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 {
@@ -788,6 +890,31 @@ ul.tabs {
 }
 
 
+/** group editor **/
+#group-edit-desc { margin-top: 1em; color: @FieldHelpColor; }
+#group-update-wrapper{
+       height: auto; overflow: auto;
+       #group {
+               width:300px; 
+               float:left;
+               margin-right:20px;
+       }
+       #contacts {
+               width:300px;
+               float:left;
+       }
+       #group-separator { display: none; }
+       .contact_list {
+               height: 300px;
+               border: 1px solid @MenuBorder;
+               overflow: auto;
+               .contact-block-div  {
+                       width: 50px; height: 50px;
+                       float: left;
+               }
+       }
+}
+
 /**
  * Form fields
  */
@@ -811,7 +938,7 @@ ul.tabs {
        .field_help {
                display: block;
                margin-left: 200px;
-               color: #666666;
+               color: @FieldHelpColor;
                
        }
 
@@ -852,6 +979,58 @@ ul.tabs {
 
 #profile-edit-links li {
        list-style: none;
+        margin-top: 10px;
+}
+
+#profile-edit-default-desc {
+       color: #FF0000;
+       border: 1px solid #FF8888;
+       background-color: #FFEEEE;
+       padding: 7px;
+}
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-with-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-gender-select,
+#profile-edit-homepage-label {
+       float: left;
+       width: 175px;
+        padding-top: 7px;
+}
+#profile-edit-profile-name,
+#profile-edit-name,
+#gender-select, 
+#profile-edit-pdesc,
+#profile-edit-gender,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#profile-edit-marital,
+#profile-edit-with,
+#profile-edit-sexual,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-edit-homepage {
+    margin-top: 5px;
 }
 
 /* oauth */
@@ -910,3 +1089,4 @@ footer { height: 100px; display: table-row; }
     margin-top: 25px;
     clear: both;
 }
+