Skip to content

Commit

Permalink
Various changes to multiple perspectives page:
Browse files Browse the repository at this point in the history
- fixed 'play all' bug where last media not auto playing
- moved some responsive text css from perspectives.css to main responsivetext.css
- made thumbnail captions slightly smaller
  • Loading branch information
FayCross committed Mar 15, 2018
1 parent e0007e7 commit 19cf1f8
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 24 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ $pagecontentslarge:2.5vmin;//previously 3vmin
$pagecontentsmedium:2vmin;//previously 2.5vmin
$pagecontentssmall:1.5vmin;//previously 1.2vmin
$resultsHolderwidth:8vmin;//previously 8vmin
$perspectiveslarge:7.5vmin;
$perspectivesmedium:5.2vmin;
$perspectivessmall:3.1vmin;

// --@media TABLETS and above--------------------------------------------------------------
@media (min-width: 768px) {
Expand Down Expand Up @@ -177,6 +180,24 @@ table {
#hint {
font-size: $pagecontentsmedium;
}
#thumbBar #thumbHolder .thumbBox h3 {
font-size: $pagecontentsmedium;
}
#thumbBar.large #thumbHolder .thumbBox h3 {
font-size: $pagecontentslarge;
}
#gridBack {
font-size: $pagecontentslarge;
}
#thumbHolder .playAll h3 {
font-size: $perspectivesmedium !important;
}
#thumbBar.small #thumbHolder .playAll h3 {
font-size: $perspectivessmall !important;
}
#thumbBar.large #thumbHolder .playAll h3 {
font-size: $perspectiveslarge !important;
}
//--end of text size changes-----------------------------------------
}
//--end of TABLETS and above-----------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
}

#thumbHolder .thumbBox h3 {
font-size: 0.8em;
text-align: center;
overflow: hidden;
margin-bottom: 5px;
Expand Down Expand Up @@ -196,35 +197,21 @@


/* RESPONSIVE STYLES */

/* font-size stuff is in responsivetext.css */

@media (min-width: 768px) {
.x_responsive #thumbBar:not(.grid):not(.hidden) { height: 20.0vmin !important; }
.x_responsive #thumbBar.small:not(.grid):not(.hidden) { height: 12.5vmin !important; }
.x_responsive #thumbBar.large:not(.grid):not(.hidden) { height: 27.5vmin !important; }

.x_responsive #thumbHolder .thumbBox h3 {
font-size: 2.5vmin;
}
.x_responsive #thumbHolder .thumbBox { width: 18.0vmin !important; height: 18.0vmin !important; }
.x_responsive #thumbBar.small #thumbHolder .thumbBox { width: 9.7vmin !important; height: 9.7vmin !important; }
.x_responsive #thumbBar.large #thumbHolder .thumbBox { width: 26.3vmin !important; height: 26.3vmin !important; }

.x_responsive #thumbBar button {
width: 12.5vmin;
height: 12.5vmin;
margin: 3.75vmin;
}
.x_responsive #thumbBar button .ui-icon {
font-size: 12.5vmin;
}
.x_responsive #thumbBar button { width: 12.5vmin; height: 12.5vmin; margin: 3.75vmin; }
.x_responsive #thumbBar.small button { width: 7.9vmin; height: 7.9vmin; margin: 2.3vmin; }
.x_responsive #thumbBar.large button { width: 17.5vmin; height: 17.5vmin; margin: 5vmin; }
.x_responsive #thumbBar button .ui-icon { font-size: 12.5vmin; }
.x_responsive #thumbBar.small button .ui-icon { font-size: 7.9vmin; }
.x_responsive #thumbBar.large button .ui-icon { font-size: 17.5vmin; }

.x_responsive #gridBack {
font-size: 2.5vmin;
}

.x_responsive #thumbHolder .playAll h3 { font-size: 5.2vmin; }
.x_responsive #thumbBar.small #thumbHolder .playAll h3 { font-size: 3.1vmin; }
.x_responsive #thumbBar.large #thumbHolder .playAll h3 { font-size: 7.5vmin; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
.click(function(e, playAll) {
var $this = $(this);

playAll = playAll && $this.data("index") + 2 < $("#thumbHolder .thumbBox").length ? true : false;
playAll = playAll && $this.data("index") + 2 <= $("#thumbHolder .thumbBox").length ? true : false;
if (playAll == false) { $(".playAll").removeClass("playing"); }
$("#pageContents").data("playAll", playAll);

Expand Down Expand Up @@ -589,7 +589,11 @@
this.mediaFunct = function(mediaElement) {
mediaElement.addEventListener("ended", function(e) {
if ($("#pageContents").data("playAll") == true) {
$("#thumbHolder .thumbBox:eq(" + ($("#mainInfoHolder").data("index") + 2) + ")").trigger("click", true);
if ($("#thumbHolder .thumbBox:eq(" + ($("#mainInfoHolder").data("index") + 2) + ")").length > 0) {
$("#thumbHolder .thumbBox:eq(" + ($("#mainInfoHolder").data("index") + 2) + ")").trigger("click", true);
} else {
$("#pageContents").data("playAll", false);
}
}
});
}
Expand Down

0 comments on commit 19cf1f8

Please sign in to comment.