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

[friendica.git] / view / theme / quattro / lilac / style.css

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 5801644952992a74f904c443a976db159429e93d..631b0233d652bdb4dcf32ac64baad4b6ab1a2578 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -544,7 +544,6 @@ header {
   margin: 0;
   padding: 0;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -745,8 +744,12 @@ ul.menu-popup .toolbar a:hover {
 }
 /* autocomplete popup */
 .autocomplete,
-.acpopup {
+.acpopup-mce {
   max-height: 150px;
+}
+.autocomplete,
+.acpopup-mce,
+.acpopup {
   background-color: #ffffff;
   color: #2d2d2d;
   border: 1px solid #364e59;
@@ -775,6 +778,15 @@ ul.menu-popup .toolbar a:hover {
 .acpopupitem.selected {
   background-color: #c0a3c7;
 }
+.textcomplete-item {
+  color: #2d2d2d;
+}
+.textcomplete-item a:hover {
+  color: #2d2d2d;
+}
+.textcomplete-item.active {
+  background-color: #c0a3c7;
+}
 #nav-notifications-menu {
   width: 400px;
   max-height: 550px;
@@ -922,7 +934,6 @@ aside .posted-date-selector-months {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -1004,7 +1015,6 @@ aside .posted-date-selector-months {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
        .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
-
 }
 .widget h3 {
   padding: 0;
@@ -1308,7 +1318,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1447,9 +1456,13 @@ blockquote.shared_content {
 }
 .oembed.video > a.embed_video {
   display: block;
-  float: none;
+  float: left;
+  position: relative;
 }
 .oembed.video > a.embed_video > div {
+  position: absolute;
+  top: 0px;
+  left: 0px;
   background: rgba(255, 255, 255, 0.36) url(../../../images/icons/48/play.png) no-repeat center center !important;
 }
 /* threaded comments */
@@ -1655,6 +1668,9 @@ span[id^="showmore-wrap"] {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+#contact-edit-status-wrapper {
+  border-color: #86608e;
+}
 /* editor */
 .jothidden {
   display: none;
@@ -2113,6 +2129,22 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* manage page */
+.identity-match-photo {
+  position: relative;
+}
+.identity-match-photo .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: #ffffff;
+}
 /* videos page */
 .videos .video-top-wrapper {
   width: 200px;
@@ -2225,7 +2257,6 @@ ul.tabs li .active {
   min-height: 22px;
   padding-top: 6px;
   /* a { display: block;}*/
-
 }
 #photo-caption {
   display: block;