Merge branch 'gh-pages'

byuweb · Oct 8, 2013 · d65ddca · d65ddca
2 parents 4c89d57 + 55edc74
commit d65ddca
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 90 deletions.
diff --git a/css/base.css b/css/base.css
diff --git a/css/responsive.css b/css/responsive.css
diff --git a/src/sass/base/_h5bp.scss b/src/sass/base/_h5bp.scss
@@ -209,76 +209,3 @@ textarea {
 .clearfix {
     *zoom: 1;
 }
-
-
-/* ==========================================================================
-   Print styles.
-   Inlined to avoid required HTTP connection: h5bp.com/r
-   ========================================================================== */
-
-@media print {
-    * {
-        background: transparent !important;
-        color: #000 !important; /* Black prints faster: h5bp.com/s */
-        box-shadow: none !important;
-        text-shadow: none !important;
-    }
-
-    a,
-    a:visited {
-        text-decoration: underline;
-    }
-
-    a[href]:after {
-        content: " (" attr(href) ")";
-    }
-
-    abbr[title]:after {
-        content: " (" attr(title) ")";
-    }
-
-    /*
-     * Don't show links for images, or javascript/internal links
-     */
-
-    .ir a:after,
-    a[href^="javascript:"]:after,
-    a[href^="#"]:after {
-        content: "";
-    }
-
-    pre,
-    blockquote {
-        border: 1px solid #999;
-        page-break-inside: avoid;
-    }
-
-    thead {
-        display: table-header-group; /* h5bp.com/t */
-    }
-
-    tr,
-    img {
-        page-break-inside: avoid;
-    }
-
-    img {
-        max-width: 100% !important;
-    }
-
-    @page {
-        margin: 0.5cm;
-    }
-
-    p,
-    h2,
-    h3 {
-        orphans: 3;
-        widows: 3;
-    }
-
-    h2,
-    h3 {
-        page-break-after: avoid;
-    }
-}
diff --git a/src/sass/responsive/_calendar.scss b/src/sass/responsive/_calendar.scss
@@ -127,17 +127,17 @@
 }
 
 
-@media all and (min-width 800px) {
+@media all and (min-width: 50em) {
 	.briefs-item h3 { font-size: 1em; }
-	.day { font-size: 1em;
-	  a { width:72%; }
-	  .time { width:27%; }
+	.day { 
+		font-size: 1em;
+		a { width: 72%; }
+		.time { width: 27%; }
 	}
 }
 
 
 @media all and (min-width: $large-width) {
-
 
 	#calendar { width:34.755%; }
 
@@ -160,5 +160,5 @@
 	  a { width:74%; }
 	  .time { width:25%; } 
 	}
+}
 
-}
diff --git a/src/sass/responsive/_content.scss b/src/sass/responsive/_content.scss
@@ -70,4 +70,4 @@
     /* Retina-specific stuff here */
     background-image: url("../img/background-patterns/" + $body-bg + "@2x.png");
     background-size: $body-bg-size;
-}
+}
diff --git a/src/sass/responsive/_nav.scss b/src/sass/responsive/_nav.scss
@@ -344,17 +344,17 @@ body.sideNav {
 @media all and ( min-width: $full-menu-width ) {
 	$header-top-height: 96px;
 	$search-width: 250px;
-	$menu-height:36px;
+	$menu-height: 36px;
 
 
 	#main-header {
 		background-size: 100% 96px;
 	}
 
 	body.sideNav {
-		min-height: auto;
+		min-height: 0;
 		#main-header, #content, #page-footer, #search-menu {
-			left:auto;
+			left: auto;
 		}
 	}
 
@@ -540,7 +540,7 @@ body.sideNav {
 				}
 			}
 			.sublinks { 
-				padding-bottom: 0 25px 0 .25em;
+				padding: 0 25px 0 .25em;
 				a {
 					padding-left: 1.5em;
 				}

diff --git a/src/sass/responsive/_print.scss b/src/sass/responsive/_print.scss
@@ -72,7 +72,6 @@
 
 
 @media print,
-       (-o-min-device-pixel-ratio: 5/4),
        (-webkit-min-device-pixel-ratio: 1.25),
        (min-resolution: 120dpi) {
     /* Style adjustments for high resolution devices */

diff --git a/src/sass/responsive/_type.scss b/src/sass/responsive/_type.scss
@@ -130,6 +130,6 @@ body {
 	$lineHeight:22px;
 
 	body, button, input, select, textarea {
-		font-size:$fontSize + px;
+		font-size:$fontSize;
 		line-height: $lineHeight; }
 }