Merge branch 'gh-pages'

byuweb · Oct 28, 2014 · 8f2bed7 · 8f2bed7
2 parents d8999ef + 4258ce8
commit 8f2bed7
Show file tree

Hide file tree

Showing 11 changed files with 2,866 additions and 1,767 deletions.
diff --git a/css/responsive.css b/css/responsive.css
diff --git a/elements.html b/elements.html
@@ -650,6 +650,12 @@ <h4>Horizontal description list</h4>
   &lt;dd&gt;...&lt;/dd&gt;
 &lt;/dl&gt;</pre>
         <p><span class="label text-warning">Heads up! </span>Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code> . In narrower viewports, they will change to the default stacked layout.</p>
+        <h3>Alternate typographic styles</h3>
+        <h4>Small caps</h4>
+        <p class="sc">This text should be set in small caps</p>
+        <h4>Lining numerals</h4>
+        <p class="lnum">These numbers should be lining: 1234567890</p>
+        <p>And these should not: 1234567890</p>
       </section>
     </div>
     <div class="nav-container">

diff --git a/header-org.html b/header-org.html
@@ -13,7 +13,7 @@
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory-->
     <link rel="shortcut icon" href="favicon.ico">
     <!-- Styles-->
-    <link rel="stylesheet" href="//cloud.typography.com/75214/740862/css/fonts.css">
+    <link rel="stylesheet" href="//cloud.typography.com/75214/688502/css/fonts.css">
     <link rel="stylesheet" href="css/header.css">
     <!-- Modernizr for SVG image fallbacks. If you use your own build, make sure it has SVG test-->
     <script src="js/modernizr.js"></script>

diff --git a/header-search.html b/header-search.html
@@ -14,7 +14,7 @@
     <link rel="shortcut icon" href="favicon.ico">
     <!-- Styles-->
     <link rel="stylesheet" href="//cloud.typography.com/75214/740862/css/fonts.css">
-    <link rel="stylesheet" href="css/header.css">
+    <link rel="stylesheet" href="css/header-search.css">
     <!-- Modernizr for SVG image fallbacks and script loading-->
     <!-- If you use your own Modernizr build, make sure it has SVG test and the Modernizr.load option.-->
     <script src="js/modernizr.js"></script>

diff --git a/js/slider.min.js b/js/slider.min.js
diff --git a/src/font-info.txt b/src/font-info.txt
@@ -0,0 +1,57 @@
+// Below is the CSS from H&Co. I've checked out the network tab to see what was actually being loaded, and noted it.
+
+/*
+	Copyright (C) 2013 Hoefler & Frere-Jones 
+
+	This software is the property of Hoefler & Frere-Jones (H&FJ).
+	Your right to access and use this software is subject to the
+	applicable License Agreement, or Terms of Service, that exists
+	between you and H&FJ. If no such agreement exists, you may not
+	access or use this software for any purpose.
+
+	This software may only be hosted at the locations specified in
+	the applicable License Agreement or Terms of Service, and only
+	for the purposes expressly set forth therein.  You may not copy,
+	modify, convert, create derivative works from or distribute this
+	software in any way, or make it accessible to any third party,
+	without first obtaining the written permission of H&FJ.
+
+	For more information, please visit H&FJ at http://typography.com.
+	2324-65076-20131114
+*/
+
+@font-face{ font-family: "Requiem Text A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AACSCAA0AAAAARKwAAQ ... ); font-weight:400; font-style:normal; } %
+@font-face{ font-family: "Requiem Text B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABVOAAsAAAAAHWQAAQ ... ); font-weight:400; font-style:normal; } %
+
+@font-face{ font-family: "Sentinel SSm A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AACxuAA0AAAAASOgAAQ ... ); font-weight:300; font-style:normal; } *+%
+@font-face{ font-family: "Sentinel SSm B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABXeAAsAAAAAHdgAAQ ... ); font-weight:300; font-style:normal; } *+%
+@font-face{ font-family: "Sentinel SSm A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AAC+uAA0AAAAATtQAAQ ... ); font-weight:300; font-style:italic; } --
+@font-face{ font-family: "Sentinel SSm B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABciAAsAAAAAH2gAAQ ... ); font-weight:300; font-style:italic; } --
+
+@font-face{ font-family: "Whitney SSm A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AADsOAA0AAAAAYZgAAQ ... ); font-weight:500; font-style:normal; } *+%
+@font-face{ font-family: "Whitney SSm B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABWCAAsAAAAAHYwAAQ ... ); font-weight:500; font-style:normal; } *+%
+@font-face{ font-family: "Whitney SSm A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AADxuAA0AAAAAYXwAAQ ... ); font-weight:500; font-style:italic; } *+
+@font-face{ font-family: "Whitney SSm B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABXKAAsAAAAAHfAAAQ ... ); font-weight:500; font-style:italic; } *+
+@font-face{ font-family: "Whitney SSm A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AADvHAA0AAAAAYtwAAQ ... ); font-weight:600; font-style:normal; } *+%
+@font-face{ font-family: "Whitney SSm B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABWfAAsAAAAAHbQAAQ ... ); font-weight:600; font-style:normal; } *+%
+@font-face{ font-family: "Whitney SSm A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AAD0aAA0AAAAAYqgAAQ ... ); font-weight:600; font-style:italic; }
+@font-face{ font-family: "Whitney SSm B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABXuAAsAAAAAHhgAAQ ... ); font-weight:600; font-style:italic; }
+
+@font-face{ font-family: "Whitney SSm SC A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AAA0GAA0AAAAAE3QAAQ ... ); font-weight:500; font-style:normal; } +!!
+@font-face{ font-family: "Whitney SSm SC B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AAAxCAAsAAAAAEnwAAQ ... ); font-weight:500; font-style:normal; } +!!
+
+@font-face{ font-family: "Sentinel A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AADdTAA0AAAAAbbAAAQ ... ); font-weight:500; font-style:normal; } *+%
+@font-face{ font-family: "Sentinel B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABaPAAsAAAAAHogAAQ ... ); font-weight:500; font-style:normal; } *+%
+@font-face{ font-family: "Sentinel A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AADtCAA0AAAAAeKwAAQ ... ); font-weight:500; font-style:italic; }
+@font-face{ font-family: "Sentinel B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AABfCAAsAAAAAIBAAAQ ... ); font-weight:500; font-style:italic; }
+
+@font-face{ font-family: "Whitney SSm Lining Num A"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AAA4WAA0AAAAAFYQAAQ ... ); font-weight:500; font-style:normal; } +
+@font-face{ font-family: "Whitney SSm Lining Num B"; src: url(data:application/x-font-woff;base64,d09GRk9UVE8AAA8KAAsAAAAAFXAAAQ ... ); font-weight:500; font-style:normal; } +
+
+
+* = Listed in network tab for byu.edu
++ = Listed in network tab for style guide (should include sc and lnum)
+% = Listed in network tab for secondary page
+
+!! = No glyphs in preview
+-- = To be removed
diff --git a/src/jade/elements.html.jade b/src/jade/elements.html.jade
@@ -780,3 +780,9 @@ block content
 			code text-overflow
 			|  . In narrower viewports, they will change to the default stacked layout.
 
+		h3 Alternate typographic styles
+		h4 Small caps
+		p.sc This text should be set in small caps
+		h4 Lining numerals
+		p.lnum These numbers should be lining: 1234567890
+		p And these should not: 1234567890
diff --git a/src/jade/header-org.html.jade b/src/jade/header-org.html.jade
@@ -12,7 +12,7 @@ block head
 		link(rel='shortcut icon', href='favicon.ico')
 
 		// Styles
-		link(rel='stylesheet', href='//cloud.typography.com/75214/740862/css/fonts.css')
+		link(rel="stylesheet", href="//cloud.typography.com/75214/688502/css/fonts.css")
 		link(rel='stylesheet', href='css/header.css')
 
 		// Modernizr for SVG image fallbacks. If you use your own build, make sure it has SVG test

diff --git a/src/jade/header-search.html.jade b/src/jade/header-search.html.jade
@@ -13,7 +13,7 @@ block head
 
 		// Styles
 		link(rel='stylesheet', href='//cloud.typography.com/75214/740862/css/fonts.css')
-		link(rel='stylesheet', href='css/header.css')
+		link(rel='stylesheet', href='css/header-search.css')
 
 		// Modernizr for SVG image fallbacks and script loading
 		// If you use your own Modernizr build, make sure it has SVG test and the Modernizr.load option.

diff --git a/src/js/slider-update.js b/src/js/slider-update.js
@@ -64,7 +64,7 @@
 				// load first cloned slide #0
 				loadImg(slider, 0);
 				// load last cloned slide #6
-				loadImg(slider, slider.pages+1);
+				loadImg(slider, slider.pages-1);
 				// trigger slide complete to preload the next slide image
 				slider.$el.trigger('slide_complete', slider);
 
@@ -79,6 +79,8 @@
 			onSlideComplete: function(slider) {
 				// *** PRELOAD THE NEXT SLIDE IMAGE ***
 				loadImg(slider, slider.currentPage + 1);
+				// *** PRELOAD THE PREVIOUS SLIDE IMAGE ***
+				loadImg(slider, slider.currentPage - 2);
 			}
 
 			// Interactivity

diff --git a/src/sass/responsive/_query-larger.scss b/src/sass/responsive/_query-larger.scss
@@ -34,4 +34,23 @@
 		margin-right: -$display_width/2;
 	}
 
+}
+
+/*** Responsive Modal Markup ***/
+@media (max-width: 767px) {
+
+       .modal {
+           position: fixed;
+           top: 20px;
+           left: 20px;
+           right: 20px;
+           width: auto;
+           margin: 0;
+       }
+       .modal.fade {
+           top: -100px;
+       }
+       .modal.fade.in {
+           top: 20px;
+       }
 }