Forráskód Böngészése

Move _minimized_chats.scss into parent dir

updates #1091
JC Brand 7 éve
szülő
commit
539234fa79
5 módosított fájl, 27 hozzáadás és 28 törlés
  1. 24 24
      css/converse.css
  2. 0 1
      mockup/chatroom.html
  3. 1 1
      sass/_minimized_chats.scss
  4. 1 1
      sass/converse.scss
  5. 1 1
      sass/converse/_chatbox.scss

+ 24 - 24
css/converse.css

@@ -7641,47 +7641,47 @@ body.reset {
       height: 100vh;
       box-shadow: none; } }
 #converse-embedded-chat .chat-head,
-#conversejs:not(.fullscreen) .chat-head {
+#conversejs:not(.converse-fullscreen) .chat-head {
   border-top-left-radius: 4px;
   border-top-right-radius: 4px; }
   @media screen and (max-height: 450px) {
     #converse-embedded-chat .chat-head,
-    #conversejs:not(.fullscreen) .chat-head {
+    #conversejs:not(.converse-fullscreen) .chat-head {
       border-top-left-radius: 0;
       border-top-right-radius: 0; } }
   @media screen and (max-width: 480px) {
     #converse-embedded-chat .chat-head,
-    #conversejs:not(.fullscreen) .chat-head {
+    #conversejs:not(.converse-fullscreen) .chat-head {
       border-top-left-radius: 0;
       border-top-right-radius: 0; } }
 #converse-embedded-chat .chatbox,
-#conversejs:not(.fullscreen) .chatbox {
+#conversejs:not(.converse-fullscreen) .chatbox {
   min-width: 250px !important;
   width: 250px; }
   #converse-embedded-chat .chatbox .box-flyout,
-  #conversejs:not(.fullscreen) .chatbox .box-flyout {
+  #conversejs:not(.converse-fullscreen) .chatbox .box-flyout {
     min-width: 250px !important;
     width: 250px; }
   #converse-embedded-chat .chatbox .chat-body .chat-message,
-  #conversejs:not(.fullscreen) .chatbox .chat-body .chat-message {
+  #conversejs:not(.converse-fullscreen) .chatbox .chat-body .chat-message {
     line-height: 20px; }
     #converse-embedded-chat .chatbox .chat-body .chat-message .chat-msg-author,
-    #conversejs:not(.fullscreen) .chatbox .chat-body .chat-message .chat-msg-author {
+    #conversejs:not(.converse-fullscreen) .chatbox .chat-body .chat-message .chat-msg-author {
       line-height: 20px; }
     #converse-embedded-chat .chatbox .chat-body .chat-message .chat-msg-content,
-    #conversejs:not(.fullscreen) .chatbox .chat-body .chat-message .chat-msg-content {
+    #conversejs:not(.converse-fullscreen) .chatbox .chat-body .chat-message .chat-msg-content {
       line-height: 20px; }
       #converse-embedded-chat .chatbox .chat-body .chat-message .chat-msg-content .emojione,
-      #conversejs:not(.fullscreen) .chatbox .chat-body .chat-message .chat-msg-content .emojione {
+      #conversejs:not(.converse-fullscreen) .chatbox .chat-body .chat-message .chat-msg-content .emojione {
         margin-bottom: -5px; }
 #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu,
-#conversejs:not(.fullscreen) .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu {
+#conversejs:not(.converse-fullscreen) .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu {
   min-width: 235px; }
   #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-toolbar,
-  #conversejs:not(.fullscreen) .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-toolbar {
+  #conversejs:not(.converse-fullscreen) .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-toolbar {
     width: 100%; }
     #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-toolbar .emoji-category,
-    #conversejs:not(.fullscreen) .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-toolbar .emoji-category {
+    #conversejs:not(.converse-fullscreen) .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-toolbar .emoji-category {
       float: left; }
 
 @media (max-width: 767.98px) {
@@ -8656,7 +8656,7 @@ body.reset {
 @media screen and (max-width: 767px) {
   #conversejs:not(.converse-embedded) .message.chat-msg .chat-msg-author {
     white-space: normal; } }
-#conversejs:not(.fullscreen) #minimized-chats {
+#conversejs.converse-overlayed #minimized-chats {
   order: 100;
   width: 130px;
   margin-bottom: -1em;
@@ -8665,10 +8665,10 @@ body.reset {
   color: white;
   margin-right: 0.5em;
   padding: 0; }
-  #conversejs:not(.fullscreen) #minimized-chats .badge {
+  #conversejs.converse-overlayed #minimized-chats .badge {
     bottom: 8px;
     border: 1px solid #818479; }
-  #conversejs:not(.fullscreen) #minimized-chats #toggle-minimized-chats {
+  #conversejs.converse-overlayed #minimized-chats #toggle-minimized-chats {
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
     background-color: #578EA9;
@@ -8680,7 +8680,7 @@ body.reset {
     text-overflow: ellipsis;
     display: block;
     height: 45px; }
-  #conversejs:not(.fullscreen) #minimized-chats a.restore-chat {
+  #conversejs.converse-overlayed #minimized-chats a.restore-chat {
     padding: 1px 0 1px 5px;
     color: white;
     line-height: 15px;
@@ -8688,24 +8688,24 @@ body.reset {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap; }
-    #conversejs:not(.fullscreen) #minimized-chats a.restore-chat:hover {
+    #conversejs.converse-overlayed #minimized-chats a.restore-chat:hover {
       text-decoration: none; }
-  #conversejs:not(.fullscreen) #minimized-chats a.restore-chat:visited {
+  #conversejs.converse-overlayed #minimized-chats a.restore-chat:visited {
     color: white; }
-  #conversejs:not(.fullscreen) #minimized-chats .minimized-chats-flyout {
+  #conversejs.converse-overlayed #minimized-chats .minimized-chats-flyout {
     flex-direction: column-reverse;
     bottom: 42px;
     width: 130px; }
-    #conversejs:not(.fullscreen) #minimized-chats .minimized-chats-flyout .chat-head {
+    #conversejs.converse-overlayed #minimized-chats .minimized-chats-flyout .chat-head {
       padding: 0.3em;
       border-radius: 4px;
       height: 35px;
       margin-bottom: 0.2em;
       box-shadow: 1px 3px 5px 3px rgba(0, 0, 0, 0.4);
       width: 100%; }
-    #conversejs:not(.fullscreen) #minimized-chats .minimized-chats-flyout.minimized {
+    #conversejs.converse-overlayed #minimized-chats .minimized-chats-flyout.minimized {
       height: auto; }
-  #conversejs:not(.fullscreen) #minimized-chats .unread-message-count {
+  #conversejs.converse-overlayed #minimized-chats .unread-message-count {
     font-weight: bold;
     background-color: white;
     border: 1px solid;
@@ -8718,8 +8718,8 @@ body.reset {
     position: absolute;
     right: 116px;
     bottom: 10px; }
-  #conversejs:not(.fullscreen) #minimized-chats .unread-message-count-hidden,
-  #conversejs:not(.fullscreen) #minimized-chats .chat-head-message-count-hidden {
+  #conversejs.converse-overlayed #minimized-chats .unread-message-count-hidden,
+  #conversejs.converse-overlayed #minimized-chats .chat-head-message-count-hidden {
     display: none; }
 
 #converse-embedded-chat [hidden],

+ 0 - 1
mockup/chatroom.html

@@ -28,7 +28,6 @@
                             <p class="chatroom-description">Two households, both alike in dignity, In fair Verona, where we lay our scene.</p>
                         </div>
                         <div class="chatbox-buttons row no-gutters">
-                            <a class="chatbox-btn fa fa-minus"></a>
                             <a class="chatbox-btn fa fa-close"></a>
                             <a class="chatbox-btn fa fa-wrench"></a>
                         </div>

+ 1 - 1
sass/converse/_minimized_chats.scss → sass/_minimized_chats.scss

@@ -1,4 +1,4 @@
-#conversejs:not(.fullscreen) {
+#conversejs.converse-overlayed {
     #minimized-chats {
         order: 100;
 

+ 1 - 1
sass/converse.scss

@@ -50,7 +50,7 @@
 @import "chatrooms";
 @import "headline";
 @import "messages";
-@import "converse/minimized_chats";
+@import "minimized_chats";
 @import "bookmarks";
 @import "awesomplete";
 @import "embedded";

+ 1 - 1
sass/converse/_chatbox.scss

@@ -1,5 +1,5 @@
 #converse-embedded-chat,
-#conversejs:not(.fullscreen) {
+#conversejs:not(.converse-fullscreen) {
     .chat-head {
         border-top-left-radius: $chatbox-border-radius;
         border-top-right-radius: $chatbox-border-radius;