Changeset 12080

Timestamp:

05/10/2018 07:28:05 PM (7 years ago)

Author:

djpaul

Message:

Templates, Nouveau: fix group invites subnav to horizontal when group nav is set to vertical in customizer.

Fixes #7794

Props mercime

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• common-styles/_bp_filters.scss (modified) (1 diff)
• css/buddypress-rtl.css (modified) (3 diffs)
• css/buddypress.css (modified) (3 diffs)
• sass/_nouveau_invites.scss (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/common-styles/_bp_filters.scss

@@ -190 +190 @@
     }
 
+    .group-subnav-filters {
+
+        .group-invites-search {
+            margin-bottom: 1em;
+        }
+
+        .last {
+            text-align: center;
+        }
+    }
+
 } // close .buddypress-wrap

trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css

@@ -800 +800 @@
 }
 
+.buddypress-wrap .group-subnav-filters .group-invites-search {
+    margin-bottom: 1em;
+}
+
+.buddypress-wrap .group-subnav-filters .last {
+    text-align: center;
+}
+
 /**
 *----------------------------------------------------------
@@ -2649 +2657 @@
 }
 
-@media screen and (min-width: 37.5em) {
-    .buddypress-wrap #group-invites-container {
+@media screen and (min-width: 46.8em) {
+    :not(.vertical) + .item-body #group-invites-container {
         display: -ms-grid;
         display: grid;
@@ -2657 +2665 @@
         grid-template-areas: "group-invites-nav group-invites-column";
     }
-    .buddypress-wrap #group-invites-container .bp-invites-nav {
+    :not(.vertical) + .item-body #group-invites-container .bp-invites-nav {
         -ms-grid-row: 1;
         -ms-grid-column: 1;
         grid-area: group-invites-nav;
     }
-    .buddypress-wrap #group-invites-container .bp-invites-nav li {
+    :not(.vertical) + .item-body #group-invites-container .bp-invites-nav li {
         display: block;
         float: none;
     }
-    .buddypress-wrap #group-invites-container .group-invites-column {
+    :not(.vertical) + .item-body #group-invites-container .group-invites-column {
         -ms-grid-row: 1;
         -ms-grid-column: 2;

trunk/src/bp-templates/bp-nouveau/css/buddypress.css

@@ -800 +800 @@
 }
 
+.buddypress-wrap .group-subnav-filters .group-invites-search {
+    margin-bottom: 1em;
+}
+
+.buddypress-wrap .group-subnav-filters .last {
+    text-align: center;
+}
+
 /**
 *----------------------------------------------------------
@@ -2649 +2657 @@
 }
 
-@media screen and (min-width: 37.5em) {
-    .buddypress-wrap #group-invites-container {
+@media screen and (min-width: 46.8em) {
+    :not(.vertical) + .item-body #group-invites-container {
         display: -ms-grid;
         display: grid;
@@ -2657 +2665 @@
         grid-template-areas: "group-invites-nav group-invites-column";
     }
-    .buddypress-wrap #group-invites-container .bp-invites-nav {
+    :not(.vertical) + .item-body #group-invites-container .bp-invites-nav {
         -ms-grid-row: 1;
         -ms-grid-column: 1;
         grid-area: group-invites-nav;
     }
-    .buddypress-wrap #group-invites-container .bp-invites-nav li {
+    :not(.vertical) + .item-body #group-invites-container .bp-invites-nav li {
         display: block;
         float: none;
     }
-    .buddypress-wrap #group-invites-container .group-invites-column {
+    :not(.vertical) + .item-body #group-invites-container .group-invites-column {
         -ms-grid-row: 1;
         -ms-grid-column: 2;

trunk/src/bp-templates/bp-nouveau/sass/_nouveau_invites.scss

@@ -149 +149 @@
 }
 
-@media screen and (min-width: 37.5em) {
+@include medium-up() {
 
-    .buddypress-wrap {
+    :not(.vertical) + .item-body #group-invites-container {
 
-        #group-invites-container {
-            display: -ms-grid;
-            display: grid;
-            -ms-grid-columns: 25% auto;
-            grid-template-columns: 25% auto;
-            grid-template-areas: "group-invites-nav group-invites-column";
+        display: -ms-grid;
+        display: grid;
+        -ms-grid-columns: 25% auto;
+        grid-template-columns: 25% auto;
+        grid-template-areas: "group-invites-nav group-invites-column";
 
-            .bp-invites-nav {
-                -ms-grid-row: 1;
-                -ms-grid-column: 1;
-                grid-area: group-invites-nav;
+        .bp-invites-nav {
+            -ms-grid-row: 1;
+            -ms-grid-column: 1;
+            grid-area: group-invites-nav;
 
-                li {
-                    display: block;
-                    float: none;
-                }
-            }
-
-            .group-invites-column {
-                -ms-grid-row: 1;
-                -ms-grid-column: 2;
-                grid-area: group-invites-column;
+            li {
+                display: block;
+                float: none;
             }
         }
+
+        .group-invites-column {
+            -ms-grid-row: 1;
+            -ms-grid-column: 2;
+            grid-area: group-invites-column;
+        }
     }
-
 }