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

[friendica.git] / view / theme / frost / style.css

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 1054b55c11a0ed2703993579b08ffb2c7ec8fd5d..46eb650ec1db93278ff68c9b1955acd2f18cf26c 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -918,6 +918,7 @@ input#dfrn-url {
 #profile-edit-religion-label,
 #profile-edit-pubkeywords-label,
 #profile-edit-prvkeywords-label,
+#profile-edit-xmpp-label,
 #profile-edit-homepage-label,
 #profile-edit-hometown-label {
        font-weight: 700;
@@ -939,6 +940,7 @@ input#dfrn-url {
 #sexual-select,
 #profile-edit-politic,
 #profile-edit-religion,
+#profile-edit-xmpp,
 #profile-edit-pubkeywords,
 #profile-edit-prvkeywords,
 #profile-in-dir-yes,
@@ -952,6 +954,7 @@ input#dfrn-url {
        float: left;
        margin-bottom: 20px;
 }
+#profile-edit-xmpp,
 #profile-edit-pubkeywords,
 #profile-edit-prvkeywords {
        margin-bottom: 5px;
@@ -1024,6 +1027,7 @@ input#dfrn-url {
 
 
 #profile-edit-pdesc-desc,
+#profile-edit-xmpp-desc,
 #profile-edit-pubkeywords-desc,
 #profile-edit-prvkeywords-desc {
        float: left;
@@ -1039,7 +1043,8 @@ input#dfrn-url {
        float: left;
        margin-bottom: 35px;
 }*/
-#profile-edit-homepage, #profile-edit-hometown {
+#profile-edit-homepage,
+#profile-edit-hometown {
        float: left;
        margin-bottom: 25px;
 }
@@ -1082,6 +1087,7 @@ input#dfrn-url {
 #profile-edit-pubkeywords-end,
 #profile-edit-prvkeywords-end,
 #profile-edit-homepage-end,
+#profile-edit-xmpp-end,
 #profile-edit-hometown-end,
 #profile-in-dir-break,
 #profile-in-dir-end,
@@ -1385,6 +1391,17 @@ input#dfrn-url {
        cursor: pointer;
 }
 
+.wall-item-tools a {
+       border-radius: 4px;
+       padding: 2px;
+       background-position: center;
+       background-size: initial !important;
+}
+
+.wall-item-tools a.active {
+       background-color: rgba(59, 101, 164, 0.5);
+}
+
 .wall-item-share-buttons {
        margin-left: 10px;
        margin-right: 10px;
@@ -1897,6 +1914,7 @@ input#dfrn-url {
 #advanced-profile-marital-wrapper,
 #advanced-profile-sexual-wrapper,
 #advanced-profile-homepage-wrapper,
+#advanced-profile-xmpp-wrapper,
 #advanced-profile-politic-wrapper,
 #advanced-profile-religion-wrapper,
 #advanced-profile-about-wrapper,
@@ -1919,6 +1937,7 @@ input#dfrn-url {
 #advanced-profile-marital-text,
 #advanced-profile-sexual-text,
 #advanced-profile-homepage-text,
+#advanced-profile-xmpp-text,
 #advanced-profile-politic-text,
 #advanced-profile-religion-text,
 #advanced-profile-about-text,
@@ -1942,6 +1961,7 @@ input#dfrn-url {
 #advanced-profile-marital-end,
 #advanced-profile-sexual-end,
 #advanced-profile-homepage-end,
+#advanced-profile-xmpp-end,
 #advanced-profile-politic-end,
 #advanced-profile-religion-end {
        height: 10px;
@@ -1968,6 +1988,7 @@ input#dfrn-url {
 #advanced-profile-marital,
 #advanced-profile-sexual,
 #advanced-profile-homepage,
+#advanced-profile-xmpp,
 #advanced-profile-politic,
 #advanced-profile-religion {
        float: left;
@@ -2912,14 +2933,14 @@ aside input[type='text'] {
        margin-bottom: 25px;
 }
 
-.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
+.location-label, .gender-label, .marital-label, .homepage-label, .ympp-label, .network-label, .xmpp-label {
        float: left;
        text-align: right;
        display: block;
        width: 65px;
 }
 
-.adr, .x-gender, .marital-text, .homepage-url, .x-network {
+.adr, .x-gender, .marital-text, .homepage-url, .x-network, .xmpp-data {
        float: left;
        display: block;
        margin-left: 8px;
@@ -3886,7 +3907,7 @@ aside input[type='text'] {
 .event-maybeattend-icon { background-image: url('images/event-maybeattend-16.png'); }
 .event-dontattend-icon { background-image: url('images/event-dontattend-16.png'); }
 
-.filer-icon:hover {
+.event-icon:hover {
        opacity: 1.0;
 }
 
@@ -4064,13 +4085,15 @@ aside input[type='text'] {
 
 
 /* autocomplete popup */
-.acpopup {
-       max-height:150px;
+.acpopup, .acpopup-mce {
        background-color:#ffffff;
        overflow:auto;
        z-index:100000;
        border:1px solid #cccccc;
 }
+.acpopup-mce {
+       max-height:150px;
+}
 .acpopupitem {
        background-color:#ffffff; padding: 4px;
        clear:left;
@@ -4084,6 +4107,65 @@ aside input[type='text'] {
        color: #FFFFFF; background: #3465A4;
 }
 
+ul.acpopup {
+       list-style: none;
+       float: left;
+       min-width: 160px;
+       padding: 5px 0;
+       margin: 2px 0 0;
+}
+nav .acpopup {
+       width: 290px;
+       margin-left: -35px;
+       max-height: 450px;
+       max-width: 300px;
+       overflow-y: auto;
+       overflow-x: hidden;
+       margin-top: 0px;
+}
+img.acpopup-img {
+       float: left;
+       width: 36px;
+       height: 36px;
+       margin-right: 5px;
+       vertical-align: middle;
+}
+.acpopup-contactname {
+       padding-top: 2px;
+       font-weight: bold;
+       line-height: 1em;
+       white-space: nowrap;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       display: block;
+}
+.acpopup-sub-text {
+       color: #777;
+       font-size: 0.833em;
+       line-height: 1em;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       display: block;
+}
+.textcomplete-item a {
+       color: inherit;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       clear: both;
+       white-space: nowrap;
+       padding: 3px 20px;
+       display: block;
+}
+.textcomplete-item a:hover {
+       text-decoration: none;
+}
+.textcomplete-item.active {
+       color: #FFFFFF; background: #3465A4;
+}
+.active a .acpopup-sub-text {
+       color: #fff;
+}
+
 /* popup notifications */
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;