From 7c5b736f6a9f49b773091691853e92840d66dd7c Mon Sep 17 00:00:00 2001
From: rrandom <emanonhere@qq.com>
Date: Tue, 21 Feb 2017 20:25:45 +0800
Subject: [PATCH 1/2] fix #1046 styling issues in the top nav menu
---
assets/css/layout/header.scss | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/assets/css/layout/header.scss b/assets/css/layout/header.scss
index a59a4029f..23311dd6f 100644
--- a/assets/css/layout/header.scss
+++ b/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;
From d7f81d6429e515eb89973557397d35d7a61c8f5d Mon Sep 17 00:00:00 2001
From: Colin Hunt <colinhunt@gmail.com>
Date: Wed, 22 Feb 2017 00:07:27 +0700
Subject: [PATCH 2/2] Issue 1047: Update dashboard mobile CSS styling
---
assets/css/directives/challenge-tile.scss | 13 +++++++------
assets/css/my-challenges/my-challenges.scss | 8 +++-----
assets/css/my-dashboard/my-challenges.scss | 6 ++----
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/assets/css/directives/challenge-tile.scss b/assets/css/directives/challenge-tile.scss
index 8f8adace9..93d631bdd 100644
--- a/assets/css/directives/challenge-tile.scss
+++ b/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;
diff --git a/assets/css/my-challenges/my-challenges.scss b/assets/css/my-challenges/my-challenges.scss
index cf72fdfb3..e3f523af1 100644
--- a/assets/css/my-challenges/my-challenges.scss
+++ b/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) {
diff --git a/assets/css/my-dashboard/my-challenges.scss b/assets/css/my-dashboard/my-challenges.scss
index 94ae21b52..21d7597c3 100644
--- a/assets/css/my-dashboard/my-challenges.scss
+++ b/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) {