Explorar el Código

Always show .icon-remove for roster contacts

Hovering is not supported on touchscreen devices.
JC Brand hace 8 años
padre
commit
cfd6fad78a
Se han modificado 3 ficheros con 8 adiciones y 14 borrados
  1. 3 6
      css/converse.css
  2. 3 7
      sass/_roster.scss
  3. 2 1
      sass/_variables.scss

+ 3 - 6
css/converse.css

@@ -2200,7 +2200,7 @@
       #conversejs #converse-roster .roster-contacts dd .open-chat {
       #conversejs #converse-roster .roster-contacts dd .open-chat {
         margin: auto;
         margin: auto;
         padding: 0.5em 0em 0 1em;
         padding: 0.5em 0em 0 1em;
-        width: 88%; }
+        width: 85%; }
         #conversejs #converse-roster .roster-contacts dd .open-chat .pulse {
         #conversejs #converse-roster .roster-contacts dd .open-chat .pulse {
           padding: 0;
           padding: 0;
           margin: 0; }
           margin: 0; }
@@ -2320,8 +2320,6 @@
             color: #2A9D8F; }
             color: #2A9D8F; }
       #conversejs #converse-roster .roster-contacts dd:hover {
       #conversejs #converse-roster .roster-contacts dd:hover {
         background-color: #DCF9F6; }
         background-color: #DCF9F6; }
-        #conversejs #converse-roster .roster-contacts dd:hover .remove-xmpp-contact {
-          display: inline-block; }
       #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .request-actions {
       #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .request-actions {
         padding-top: 0.5em;
         padding-top: 0.5em;
         margin-right: 1em;
         margin-right: 1em;
@@ -2329,7 +2327,7 @@
         margin-bottom: 0.3em;
         margin-bottom: 0.3em;
         float: right; }
         float: right; }
       #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .open-chat {
       #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .open-chat {
-        max-width: 75%; }
+        max-width: 70%; }
         #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .open-chat .req-contact-name {
         #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .open-chat .req-contact-name {
           width: 100%; }
           width: 100%; }
       #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .req-contact-name {
       #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .req-contact-name {
@@ -2357,9 +2355,8 @@
       #conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact {
       #conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact {
         float: right;
         float: right;
         margin-right: 1em;
         margin-right: 1em;
-        display: none;
         padding-top: 0.5em;
         padding-top: 0.5em;
-        color: #818479; }
+        color: #A8ABA1; }
   #conversejs #converse-roster span.pending-contact-name {
   #conversejs #converse-roster span.pending-contact-name {
     line-height: 16px;
     line-height: 16px;
     width: 100%; }
     width: 100%; }

+ 3 - 7
sass/_roster.scss

@@ -112,7 +112,7 @@
             .open-chat {
             .open-chat {
                 margin: auto;
                 margin: auto;
                 padding: 0.5em 0em 0 1em;
                 padding: 0.5em 0em 0 1em;
-                width: 88%;
+                width: 85%;
                 .pulse {
                 .pulse {
                     padding: 0;
                     padding: 0;
                     margin: 0;
                     margin: 0;
@@ -201,9 +201,6 @@
 
 
             &:hover {
             &:hover {
                 background-color: $highlight-color;
                 background-color: $highlight-color;
-                .remove-xmpp-contact {
-                    display: inline-block;
-                }
             }
             }
             &.requesting-xmpp-contact {
             &.requesting-xmpp-contact {
                 .request-actions {
                 .request-actions {
@@ -214,7 +211,7 @@
                     float: right;
                     float: right;
                 }
                 }
                 .open-chat {
                 .open-chat {
-                    max-width: 75%;
+                    max-width: 70%;
                     .req-contact-name {
                     .req-contact-name {
                         width: 100%;
                         width: 100%;
                     }
                     }
@@ -252,9 +249,8 @@
                 &.remove-xmpp-contact {
                 &.remove-xmpp-contact {
                     float: right;
                     float: right;
                     margin-right: 1em;
                     margin-right: 1em;
-                    display: none;
                     padding-top: 0.5em;
                     padding-top: 0.5em;
-                    color: $text-color;
+                    color: $subdued-color;
                 }
                 }
             }
             }
         }
         }

+ 2 - 1
sass/_variables.scss

@@ -42,8 +42,8 @@ $toolbar-color: #FFF5EE !default;
 
 
 $moderator-color: #D24E2B !default;
 $moderator-color: #D24E2B !default;
 $online-color: #1A9707 !default;
 $online-color: #1A9707 !default;
-
 $error-color: #D24E2B !default;
 $error-color: #D24E2B !default;
+$subdued-color: #A8ABA1 !default;
 
 
 $chatbox-border-radius: 4px !default;
 $chatbox-border-radius: 4px !default;
 $bottom-gutter-height: 35px !default;
 $bottom-gutter-height: 35px !default;
@@ -60,6 +60,7 @@ $legend-font-size: 16px !default;
 
 
 $line-height:  16px !default;
 $line-height:  16px !default;
 
 
+$controlbox-width: 200px !default;
 $chat-width: 200px !default;
 $chat-width: 200px !default;
 $chat-height: 450px !default;
 $chat-height: 450px !default;
 $chat-gutter: 0.5em !default;
 $chat-gutter: 0.5em !default;