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 17, 2017
commit 94512890760a5f84ebb33848af19b78daf4c8fb5
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,10 @@ import angular from 'angular'
} else if(width >= 1010) {
// desktop
buildCarouselSlide(5)
} else if(width < 1010 && width >= 768) {
// tablet
} else if(width < 1010) {
// tablet & mobile
buildCarouselSlide(4)
} else {
// we don't need to build carousel for mobile as we show horizontal scroll
// phone
buildCarouselSlide(3)
}
}
}


Expand Down
61 changes: 41 additions & 20 deletions assets/css/directives/responsive-carousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,30 @@
margin: 0 auto;
@media only screen and (max-width: 767px) {
display: none;
width: auto;
}
&[slide-count="1"] {
width: 170px;
}
&[slide-count="2"] {
width: 340px;
}
&[slide-count="3"] {
width: 510px;
}
&[slide-count="4"] {
width: 680px;
}
&[slide-count="5"] {
width: 850px;
}
&[slide-count="6"] {
width: 1020px;
}
&[slide-count="7"] {
width: 1190px;
@media only screen and (min-width: 768px) {
&[slide-count="1"] {
width: 170px;
}
&[slide-count="2"] {
width: 340px;
}
&[slide-count="3"] {
width: 510px;
}
&[slide-count="4"] {
width: 680px;
}
&[slide-count="5"] {
width: 850px;
}
&[slide-count="6"] {
width: 1020px;
}
&[slide-count="7"] {
width: 1190px;
}
}

li {
Expand Down Expand Up @@ -125,6 +128,24 @@
}
}
}


ul[slide-count="3"] {
@media only screen and (min-width: 575px) {
.slide {
display: inline-block;

&:not(:first-child) {
.carousel-elem:before {
top: 32px;
left: -18px;
@include forward-slash(1px, 60px, 0, 2px, 30deg);
}
}
}
}
}

.carousel-elem {
position: relative;
display: inline-block;
Expand Down
1 change: 1 addition & 0 deletions assets/css/profile/subtrack.scss
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@

> li {
position: relative;
text-align: center;

.slide {
text-align: center;
Expand Down