Merge pull request #1059 from appirio-tech/dev

Promote additional bug bash II updates

Author: ajefts

assets/css/directives/challenge-tile.scss

@@ -281,12 +281,6 @@ challenge-tile .challenge.tile-view {
   }
 
 
-  @media only screen and (max-width: 768px) {
-    .active-challenge {
-      height: auto;
-      margin: auto;
-    }
-  }
   .completed-challenge {
     height: 390px;
     display: flex;
@@ -378,6 +372,13 @@ challenge-tile .challenge.tile-view {
     }
   }
 
+  @media only screen and (max-width: 768px) {
+    .active-challenge, .completed-challenge {
+      height: auto;
+      margin: auto;
+    }
+  }
+
   .past-design-details {
     img {
       height: 200px;

assets/css/layout/header.scss

@@ -183,7 +183,6 @@
 }
 
 .user-menu {
-  max-height: 54px;
   .user-avatar {
     height: 31px;
     width: 31px;
@@ -215,8 +214,10 @@
   text-transform: uppercase;
 }
 
-.user-menu .submenu {
-  padding-top: 5px;
+@media only screen and (max-width: 1024px) {
+  .user-menu .submenu {
+    padding-top: 5px;
+  }
 }
 
 .submenu {
@@ -341,6 +342,10 @@
 }
 
 @media only screen and (min-width : 1025px) {
+  .user-menu {
+    max-height: 54px;
+  }
+
   .header-wrapper {
     background: #fff;
     position: relative;

assets/css/my-challenges/my-challenges.scss

@@ -179,11 +179,9 @@
             margin-bottom: 13px;
             @media only screen and (max-width: 767px) {
               display: inline-block;
-              margin-left: 15px;
-
-              &:first-child {
-                margin-left: 0;
-              }
+              margin-left: auto;
+              margin-right: auto;
+              margin-bottom: 15px;
             }
             @media only screen and (min-width: 768px) {
               &:nth-child(2n + 1) {

assets/css/my-dashboard/my-challenges.scss

@@ -171,10 +171,8 @@
         margin-bottom: 15px;
         @media only screen and (max-width: 767px) {
           display: inline-block;
-
-          &:first-child {
-            margin-left: 0;
-          }
+          margin-left: auto;
+          margin-right: auto;
         }
         @media only screen and (min-width: 768px) {
           &:nth-child(2n + 1) {