Merge remote-tracking branch 'upstream/master' into develop

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

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index abbf447cbb7b8a7ea593a1ae4be8cadd5438992b..5d25b0fb4096b2357ad65202b9cda9e1394d3c59 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -265,9 +265,10 @@ ul.menu-popup {
 }
 
 /* autocomplete popup */
+.autocomplete, .acpopup-mce { max-height:150px; }
 .autocomplete,
+.acpopup-mce,
 .acpopup {
-       max-height:150px;
        background-color:@MenuBg;
        color: @Menu;
        border:1px solid @MenuBorder;
@@ -291,6 +292,15 @@ ul.menu-popup {
                background-color: @MenuItemHoverBg;
        }
 }
+.textcomplete-item {
+       color: @MenuItem;
+       a:hover{
+               color: @MenuItem;
+       }
+       &.active{
+               background-color: @MenuItemHoverBg;
+       }
+}
 
 
 #nav-notifications-menu {
@@ -408,19 +418,19 @@ aside {
 .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;
-        }
+       .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 {
@@ -502,7 +512,7 @@ section {
 }
 
 .sparkle {
-  cursor: url('icons/lock.cur'), pointer;
+       cursor: url('icons/lock.cur'), pointer;
 }
 
 /* wall item */
@@ -745,7 +755,7 @@ section {
             margin: 1em 0;
             max-height: 160px;
             overflow: hidden;
-                    padding-left: 1em;
+            padding-left: 1em;
         }
         .oembed {}
 }
@@ -780,8 +790,10 @@ blockquote.shared_content {
 .oembed.video {
        > a.embed_video {
                display: block;
-               float: none;
+               float: left;
+        position: relative;
                > div {
+            position: absolute; top: 0px; left: 0px;
                        background:
                                rgba(255, 255, 255, 0.36)
                                url(../../../images/icons/48/play.png)
@@ -957,6 +969,7 @@ span[id^="showmore-wrap"] {
        text-overflow: ellipsis;
 }
 
+#contact-edit-status-wrapper { border-color: @JotToolsOverBackgroundColor;}
 /* editor */
 .jothidden { display: none; }
 #jot {
@@ -1404,6 +1417,24 @@ ul.tabs {
        width: 50px; float: left;
 }
 
+/* manage page */
+.identity-match-photo {
+       position: relative;
+       .manage-notify {
+               background-color: #19AEFF;
+               border-radius: 5px;
+               font-size: 10px;
+               padding: 1px 3px;
+               min-width: 15px;
+               text-align: right;
+               position: absolute;
+               right: 10px;
+               top: -5px;
+               color: rgb(255, 255, 255);
+       }
+}
+
+
 /* videos page */
 .videos {
        .video-top-wrapper {