Map Tour 2.2.3

Esri · Apr 3, 2014 · a262ff3 · a262ff3
1 parent d78ce8d
commit a262ff3
Show file tree

Hide file tree

Showing 41 changed files with 3,780 additions and 123 deletions.
diff --git a/MapTour/package.json b/MapTour/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "StorytellingMapTour",
-	"version": "2.2.2",
+	"version": "2.2.3",
 	"devDependencies": {
 		"grunt": "~0.4.1",
 		"grunt-contrib-clean": "~0.4.0",

diff --git a/MapTour/src/app/maptour-config.js b/MapTour/src/app/maptour-config.js
@@ -25,7 +25,7 @@ APPCFG = {
 	},
 
 	// Header, Picture Panel and Carousel colors
-	COLORS: ["#444", "#797979", "#c2c2c2"],
+	COLORS: ["#444", "#B4B4B4", "#E5E5E5"],
 
 	// Map popup colors
 	POPUP_BACKGROUND_COLOR: "#444444", 
@@ -146,7 +146,7 @@ APPCFG = {
 
 	COLOR_SCHEMES:  [
 		// COLORS is added as the first item at runtime
-		{name: "Black", headerColor: "#000", middleColor: "#797979", footerColor: "#c2c2c2"},
+		{name: "Black", headerColor: "#000", middleColor: "#B4B4B4", footerColor: "#E5E5E5"},
 		{name: "Blue", headerColor: "#0e3867", middleColor: "#5d6f89", footerColor: "#9096a9"},
 		{name: "Green", headerColor: "#1a3606", middleColor: "#737c6c", footerColor: "#a8b09e"}
 	],

diff --git a/MapTour/src/app/storymaps/builder/Builder.css b/MapTour/src/app/storymaps/builder/Builder.css
@@ -85,15 +85,13 @@
 	margin: 1px 0 2px 4px;
 	line-height: 22px;
 	font-weight: normal;
-	font-family:Arial, Helvetica, sans-serif;
 }
 
 #status-bar {
 	display: inline-block;
 	margin-top: 6px;
 	margin-left: 1px;
 	font-size: 12px;
-	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	color: #999;
 }
 

diff --git a/MapTour/src/app/storymaps/builder/SettingsPopupTabExtent.css b/MapTour/src/app/storymaps/builder/SettingsPopupTabExtent.css
@@ -21,7 +21,6 @@
 
 #settings-extent .dateLineError {
 	display: none;
-	font-family:Arial, Helvetica, sans-serif;
 	font-weight:bold;
 	font-size:14px;
 	color:#c43d40;

diff --git a/MapTour/src/app/storymaps/core/Core.css b/MapTour/src/app/storymaps/core/Core.css
@@ -4,13 +4,35 @@ html, body {
 	margin: auto;
 }
 
+@font-face {
+	font-family: 'open_sansregular';
+	src: url('../../../resources/font/OpenSans-Regular-webfont.eot');
+	src: url('../../../resources/font/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+		url('../../../resources/font/OpenSans-Regular-webfont.woff') format('woff'),
+		url('../../../resources/font/OpenSans-Regular-webfont.ttf') format('truetype'),
+		url('../../../resources/font/OpenSans-Regular-webfont.svg#open_sansregular') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'open_sanssemibold';
+	src: url('../../../resources/font/OpenSans-Semibold-webfont.eot');
+	src: url('../../../resources/font/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
+		url('../../../resources/font/OpenSans-Semibold-webfont.woff') format('woff'),
+		url('../../../resources/font/OpenSans-Semibold-webfont.ttf') format('truetype'),
+		url('../../../resources/font/OpenSans-Semibold-webfont.svg#open_sanssemibold') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
 body {
 	position: fixed;
     bottom: 0;
-	background-color:#c2c2c2;
+	background-color:#E5E5E5;
 	color:#333;
 	overflow:hidden;
-	font-family:Georgia, "Times New Roman", Times, serif;
+	font-family: 'open_sansregular', sans-serif;
 }
 
 body.mobile-view {
@@ -48,7 +70,7 @@ textarea {
 	width: 100%;
 	height: 100%;
 	overflow: hidden;
-	background-color: #c2c2c2;
+	background-color: #E5E5E5;
 }
 
 a {
@@ -100,7 +122,6 @@ a:hover{
 
 .modal-tabs, .modal-header{
 	background-color:#848484;
-	font-family:Verdana, Geneva, sans-serif;
 }
 
 .modal-tabs .tab:nth-child(1) {

diff --git a/MapTour/src/app/storymaps/maptour/builder/AddPopup.css b/MapTour/src/app/storymaps/maptour/builder/AddPopup.css
@@ -38,7 +38,6 @@
 #addPopup label {
 	font-weight: bold;
 	display: block;
-	font-family: Arial, Helvetica, sans-serif
 }
 
 #addPopup input {
@@ -60,7 +59,6 @@
 }
 
 .errorList{
-	font-family:Arial, Helvetica, sans-serif;
 	font-weight:bold;
 	font-size:14px;
 	color:#c43d40;
@@ -75,9 +73,6 @@
 /*
  * Picture tab - attachments
  */
-.addImage{
-	font-family:Arial, Helvetica, sans-serif;
-}
 
 #addPopup .imageUploadWrapper {
 	color:#FFFFFF;
@@ -94,7 +89,6 @@
 	bottom: 25px;
 	left: 0px;
 	font-size: 14px;
-	font-family: Verdana, Geneva, sans-serif;
 	font-style: italic;
 	width: 100%;
 	color: #000;

diff --git a/MapTour/src/app/storymaps/maptour/builder/BuilderView.css b/MapTour/src/app/storymaps/maptour/builder/BuilderView.css
@@ -8,7 +8,7 @@
 	min-width: 180px;
 	bottom: 150px;
 	text-align: center;
-	background-color: #c2c2c2;
+	background-color: #E5E5E5;
 	-webkit-border-top-left-radius: 4px;
 	-webkit-border-top-right-radius: 4px;
 	-moz-border-radius-topleft: 4px;
@@ -40,7 +40,7 @@
 	bottom: 150px;
 	left: 30px;
 	text-align: center;
-	background-color: #c2c2c2;
+	background-color: #E5E5E5;
 	-webkit-border-top-left-radius: 4px;
 	-webkit-border-top-right-radius: 4px;
 	-moz-border-radius-topleft: 4px;

diff --git a/MapTour/src/app/storymaps/maptour/builder/InitPopupViewHostedFSCreation.css b/MapTour/src/app/storymaps/maptour/builder/InitPopupViewHostedFSCreation.css
@@ -8,7 +8,6 @@
 }
 
 .dataError {
-	font-family: Arial,Helvetica,sans-serif;
 	font-weight: bold;
 	font-size: 14px;
 	color: #C43D40;

diff --git a/MapTour/src/app/storymaps/maptour/builder/SharePopup.css b/MapTour/src/app/storymaps/maptour/builder/SharePopup.css
@@ -76,7 +76,6 @@
 #sharePopup .share-warning {
 	display: none;
 	margin-top: 20px;
-	font-family:Arial, Helvetica, sans-serif;
 	font-weight:bold !important;
 	font-size:14px;
 	color:#c43d40 !important;
@@ -96,7 +95,6 @@
 }
 
 #sharePopup .sharing-status.error a {
-	font-family:Arial, Helvetica, sans-serif;
 	font-weight:bold !important;
 	font-size:14px;
 	color:#c43d40 !important;

diff --git a/MapTour/src/app/storymaps/maptour/core/MainView.css b/MapTour/src/app/storymaps/maptour/core/MainView.css
@@ -32,7 +32,7 @@
 	left: 0px;
 	right: 0px;
 	width: 100%;
-	background-color:#c2c2c2;
+	background-color:#E5E5E5;
 }
 
 .builderMobile a {
@@ -67,7 +67,6 @@
 
 #hoverInfo {
 	font-size:10px;
-	font-family:Verdana, Geneva, sans-serif;
 	position:absolute;
 	padding:5px;
 	max-width:200px;

diff --git a/MapTour/src/app/storymaps/maptour/ui/Responsive.css b/MapTour/src/app/storymaps/maptour/ui/Responsive.css
@@ -34,7 +34,7 @@
 
 	#header {
 		height: 41px !important;
-		background-color: #c2c2c2;
+		background-color: #E5E5E5;
 	}
 
 	#picturePanel {

diff --git a/MapTour/src/app/storymaps/maptour/ui/desktop/Carousel.css b/MapTour/src/app/storymaps/maptour/ui/desktop/Carousel.css
@@ -74,7 +74,6 @@
 	width:145px;
 	height:100%;
 	font-size:10px;
-	font-family:Verdana, Geneva, sans-serif;
 }
 
 .modern-layout .carouselScroller li {
@@ -102,6 +101,7 @@
     word-wrap: break-word;
 	width: 140px;
 	overflow: hidden;
+	font-family: 'open_sanssemibold', sans-serif;
 }
 
 /* 
@@ -140,7 +140,6 @@
 	width: 20px;
 	height: 15px;
 	text-align: center;
-	font-family:Arial, Helvetica, sans-serif;
 	font-size:12px;
 	color:#FFFFFF;
 	padding-right: 1px;
@@ -173,14 +172,14 @@ body.notNumbered .carouselScroller span:before {
 .arrowLeft {
 	position: absolute;
 	top: 52px;
-	left: -32px;
+	left: -28px;
 	cursor: pointer;
 }
 
 .arrowRight {
 	position: absolute;
 	top: 52px;
-	right: -33px;
+	right: -29px;
 	cursor: pointer;
 }
 

diff --git a/MapTour/src/app/storymaps/maptour/ui/desktop/PicturePanel.css b/MapTour/src/app/storymaps/maptour/ui/desktop/PicturePanel.css
@@ -2,7 +2,7 @@
 	height:100%;
 	float:left;
 	position:relative;
-	background-color:#797979;
+	background-color:#B4B4B4;
 }
 
 .modern-layout #picturePanel {
@@ -23,14 +23,14 @@
 #arrowPrev {
 	position:absolute;
 	top:0px;
-	left:0px;
+	left:8px;
 	z-index:100;
 }
 
 #arrowNext {
 	position:absolute;
-	right:0px;
 	top:0px;
+	right:8px;
 	z-index:101;
 }
 
@@ -44,25 +44,23 @@
  */
 .modern-layout-control {
 	position: absolute;
-	font-size: 60px;
-	font-weight: 100;
-	line-height: 30px;
-	color: #FFF;
-	text-align: center;
 	cursor: default;
 	opacity: 0;
 	z-index: 402;
 }
 
 .modern-layout-control.click-btn {
-	width: 40px;
-	height: 40px;
-	margin-top: -20px;
-	background: #222;
-	border: 3px solid #FFF;
-	-webkit-border-radius: 23px;
-	-moz-border-radius: 23px;
-	border-radius: 23px;
+	width: 32px;
+	height: 53px;
+	background-repeat: no-repeat;
+}
+
+.modern-layout-control.click-btn.left {
+	background: url(../../../../../resources/icons/picturepanel-left2.png);
+}
+
+.modern-layout-control.click-btn.right {
+	background: url(../../../../../resources/icons/picturepanel-right2.png);
 }
 
 .modern-layout-control.click-bg {
@@ -115,10 +113,6 @@ body.hasTouch .modern-layout-control:not(.disabled){
 	height: 30px;
 }
 
-.editPictureButtons a {
-	font-family: Arial, Helvetica, sans-serif;
-}
-
 .editPictureButtons > div {
 	display: inline-block;
 }
@@ -167,7 +161,6 @@ body.hasTouch .modern-layout-control:not(.disabled){
 
 .attributesWay .error {
 	display: none;
-	font-family:Arial, Helvetica, sans-serif;
 	font-weight:bold;
 	font-size:14px;
 	color:#c43d40;

diff --git a/MapTour/src/app/storymaps/maptour/ui/desktop/PicturePanel.js b/MapTour/src/app/storymaps/maptour/ui/desktop/PicturePanel.js
@@ -236,7 +236,7 @@ define(["storymaps/ui/crossfader/CrossFader",
 
 				// Arrows position (timeout for IE)
 				setTimeout(function(){
-					var arrowY = $(".member-image.current").position().top + $(".member-image.current").height() / 2 + 15;
+					var arrowY = $(".member-image.current").position().top + $(".member-image.current").height() / 2 - 6;
 					$(".modern-layout-control").css("top", arrowY);
 
 					$(".modern-layout-control.left").css("left", (panel.width() - $(".member-image.current").width()) / 2 + 2);
@@ -324,10 +324,8 @@ define(["storymaps/ui/crossfader/CrossFader",
 				panel.height(ppHeight);
 
 				// Arrows position
-				$("#arrowPrev").css("top", (panel.height() / 2) - 40);
-				$("#arrowNext").css("top", (panel.height() / 2) - 40);
-				$("#arrowPrev").css("left", 0);
-				$("#arrowNext").css("right", 0);
+				$("#arrowPrev").css("top", (panel.height() / 2) - 22);
+				$("#arrowNext").css("top", (panel.height() / 2) - 22);
 			}
 
 			function resizeCommon()

diff --git a/MapTour/src/app/storymaps/maptour/ui/mobile/Common.css b/MapTour/src/app/storymaps/maptour/ui/mobile/Common.css
@@ -56,7 +56,6 @@ body.notNumbered .tpIcon {
 
 .tpName {
 	padding-top: 9px;
-	font-family:Arial, Helvetica, sans-serif;
 	font-size:18px;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -70,22 +69,22 @@ body.notNumbered .tpIcon {
 
 .tpDescription {
 	font-size:14px;
-	margin-top:5px;
 	overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
     -webkit-line-clamp: 3;
     -webkit-box-orient: vertical;
 	max-height: 52px;
 	word-wrap: break-word;
+	line-height: 18px;
+	margin-top: 2px;
 }
 
 /*
  * Rules for info view and introduction record
  */
 
 .tourPointName {
-	font-family:Arial, Helvetica, sans-serif;
 	font-size: 24px;
 	margin-left: 68px;
 	margin-top: 12px;