[Git][noosfero/noosfero][cherry-pick-6099d65f] Removing nested scss

[Álax Alves]

Álax Alves pushed to branch cherry-pick-6099d65f at Noosfero / noosfero


Commits:
c0720b08 by Alax Alves at 2019-07-19T13:32:32Z
Removing nested scss

- - - - -


3 changed files:

- public/stylesheets/chat.scss
- public/stylesheets/chat/buddy-list.scss
- public/stylesheets/chat/conversation.scss


Changes:

=====================================
public/stylesheets/chat.scss
=====================================
@@ -17,6 +17,9 @@
     height: 100%;
     position: relative;
     #conversations {
+      & {
+        height: 100%;
+      }
       @import "chat/conversation";
     }
     .history {
@@ -103,7 +106,30 @@
   #buddy-list {
     width: 0;
     transition: width 0.3s ease-in;
+    & {
+      background-color: #f9f9f9;
+      top: 0;
+      right: -5px;
+      bottom: 100px;
+      position: absolute;
+      border-left: 1px solid #DCE4E7;
+      border-bottom: 1px solid #DCE4E7;
+      z-index: 2;
+    }
+    &:hover {
+      right: 0;
+      width: 190px;
+      transition: width 0.3s ease-in;
+      .buddies {
+        top: 57px;
+        left: 15px;
+        right: 0;
+        transition: all 0.3s ease-in;
+      }
+    }
+
     @import "chat/buddy-list";
+
   }
   .occupant-list li a:hover {
     background-color: black;


=====================================
public/stylesheets/chat/buddy-list.scss
=====================================
@@ -1,25 +1,3 @@
-& {
-  background-color: #f9f9f9;
-  top: 0;
-  right: -5px;
-  bottom: 100px;
-  position: absolute;
-  border-left: 1px solid #DCE4E7;
-  border-bottom: 1px solid #DCE4E7;
-  z-index: 2;
-}
-&:hover {
-  right: 0;
-  width: 190px;
-  transition: width 0.3s ease-in;
-  .buddies {
-    top: 57px;
-    left: 15px;
-    right: 0;
-    transition: all 0.3s ease-in;
-  }
-}
-
 .buddies {
   position: absolute;
   bottom: 0;
@@ -70,7 +48,7 @@
   padding: 15px;
   transition: top 0.3s ease-in;
 }
-&:hover .body{
+#buddy-list:hover .body{
   top: 45px;
   transition: top 0.3s ease-in;
 }
@@ -84,7 +62,7 @@
   border: 0;
   transition: all 0.2s ease-in;
 }
-&:hover .search{
+#buddy-list:hover .search{
   transition: all 0.3s ease-in 0.3;
   height: 16px;
   padding: 9px;


=====================================
public/stylesheets/chat/conversation.scss
=====================================
@@ -1,7 +1,3 @@
-& {
-  height: 100%;
-}
-
 .header {
   position: absolute;
   top: 0;



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/c0720b08afca7f549a5e59c4ac3b335bb96c7908

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/c0720b08afca7f549a5e59c4ac3b335bb96c7908
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20190722/79d67426/attachment-0001.html>