Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Promote to prod - Bug Bash 3 #1096

Merged
merged 14 commits into from
Mar 22, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix #995 - Stats row in the dashboard (mobile view)
  • Loading branch information
shizhouxing committed Mar 15, 2017
commit 88ffd7db77b25c9ab1cf4a883670bf2e3e518c25
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import angular from 'angular'
} else {
// we don't need to build carousel for mobile as we show horizontal scroll
// phone
buildCarouselSlide(2)
buildCarouselSlide(3)
}
}

Expand Down
13 changes: 11 additions & 2 deletions assets/css/directives/responsive-carousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@

.slide {
display: inline-block;

@media only screen and (max-width: 767px) {
display: block;
}
}

// .carousel-elem-list {
Expand All @@ -107,12 +111,17 @@
position: absolute;
top: 32px;
left: -30px;
@include forward-slash(1px, 60px, 0, 2px, 30deg);
background-color: $gray-light;
@media only screen and (min-width: 768px) {
top: 32px;
left: -18px;
@include forward-slash(1px, 60px, 0, 2px, 30deg);
}
@media only screen and (max-width: 767px) {
top: -30px;
left: 60px;
@include forward-slash(1px, 70px, 0, 2px, 90deg);
}
}
}
}
Expand All @@ -121,8 +130,8 @@
display: inline-block;
margin-right: 65px;
padding: 20px 0;
width: 130px;
@media only screen and (min-width: 768px) {
width: 130px;
margin-right: 35px;
padding: 30px 20px;

Expand Down
47 changes: 42 additions & 5 deletions assets/css/profile/subtrack.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
margin: 30px auto 40px;

.nav-right {
padding-top: 15px;
padding-top: 10px;
padding-left: 15px;
i:hover {
cursor: pointer;
Expand Down Expand Up @@ -108,6 +108,13 @@
}
}

.page-state-header {
.page-info {
display: flex;
justify-content: center;
}
}

.subtrack-stats {
// @include module-l;
width: 100%;
Expand Down Expand Up @@ -183,15 +190,15 @@
h2.detailed {
margin: 30px auto 0;
text-align: center;
@include sofia-pro-medium;
font-size: 18px;
line-height: 21px;
font-weight: bold;
@include sofia-pro-regular;
font-size: 24px;
line-height: 30px;
text-transform: uppercase;
}
ul.vertical-stats {
width: 90%;
margin: 0 auto;
margin-top: 30px;
li {
@include sofia-pro-regular;
font-size: 15px;
Expand Down Expand Up @@ -329,10 +336,20 @@
}
}
}

@media (min-width: 768px) {
.profile-subtrack-container {

.content {
.page-info {
display: flex;
justify-content: center;
}

.nav-right {
padding-top: 15px;
}

.nav {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -544,3 +561,23 @@
}

}

@media only screen and (max-width: 767px) {
.profile-subtrack-container {
.content {
.tc-carousel ul {
display: block;
height: auto;
padding-bottom: 40px;

> li {
position: relative;

.slide {
text-align: center;
}
}
}
}
}
}