CSS updates

404.php

@@ -1,9 +1,20 @@
 <?php get_header(); ?>
 
+<style type="text/css">
+    .error404 .container {
+
+    }
+    .error404 #searchform {
+        margin: 80px 0;
+    }
+</style>
+
         <div class="uw-hero-image">
 
         </div>
         <div role='main' class='container uw-body'>
+            <div class="row show-grid">
+                <div class="col-md-8 col-md-offset-2">
 
             <!-- TODO: finalize the 404 look for the new theme.  This is the old theme
             <div id="parallax" class="parallax-viewport">
@@ -25,14 +36,14 @@
             <div class='text-center'>
                 <?php get_search_form(); ?>
             </div>
-            <div class="row show-grid four-oh-four">
-                <div class="col-md-4 col-md-offset-3">
+            <div class="row show-grid">
+                <div class="col-md-6">
                    <h3>Not what you were expecting?</h3>
                    <p>Dubs tells us this page might not be what you had in mind when you set out on your journey through the UW Web.  Don&#146;t worry, you&#146;re not in the Dawg House! Here are some of Dubs&#146; favorite pages if you feel like exploring: </p>
 
                 </div>
 
-                <div class="col-md-3">
+                <div class="col-md-5 col-md-offset-1">
                     <ul>
                         <li><a href="//www.washington.edu">UW home page</a></li>
                         <li><a href="//www.washington.edu/discover/">Discover the UW</a></li>
@@ -44,6 +55,8 @@
                 </div>
             </div><!-- four-oh-four -->
 
+            </div></div>
+
 		</div><!-- uw-body -->
 
 <?php get_footer(); ?>

js/site.dev.js

@@ -8813,7 +8813,7 @@ UW.QuickLink = Backbone.Model.extend({
         has_icon: false,
         classes: ''
     },
-    
+
     initialize: function () {
         //hacktacular.  Need to stop the collection making a model with url = collection.url somehow
         if (this.get('link_url') !== undefined){
@@ -8835,7 +8835,7 @@ UW.QuickLinkView = Backbone.View.extend({
 
     create_menu_item : function ()
     {
-        item = this.model.toJSON();
+        var item = this.model.toJSON();
         this.$menu_item = $(_.template( this.menu_template, item ));
     }
 });
@@ -8870,15 +8870,15 @@ UW.QuickLinks = Backbone.Collection.extend({
             this.add(this.normalize_data(this.default_links[i]));
         }
     },
-    
+
     normalize_data: function (holder) {
         holder.link_url = holder.url;
         delete holder.url;
         if (holder.classes !== 'undefined'){
             holder.classes = holder.classes.join(' ');
             if (holder.classes !== '') {
                 holder.has_icon = true;
-            }   
+            }
         }
         return holder;
     },

less/style.less

@@ -121,3 +121,5 @@ Version: 0.1
 @import "less/widgets/recent-entries.less";
 @import "less/widgets/yarpp_widget.less";
 @import "less/widgets/menu.less";
+@import "less/widgets/pic-text.less";
+

less/uw.body-content.less

@@ -1,3 +1,9 @@
+// Sets bulleted items to a default padding:
+
+ul {
+	padding-left: 25px;
+}
+
 // Wrapper
 
 .uw-body {
@@ -69,6 +75,7 @@
 	margin-bottom: 80px;
 	margin-top: 40px;
 	position: relative;
+	//box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.2);
 	&:before,
 	&:after {
 		content: "";
@@ -136,4 +143,10 @@
 	}
 }
 
+@media only screen and (max-width : 767px) {
+
+	.widget {
+		padding: 0;
+	}	
 
+}

less/uw.boxes.less

@@ -11,7 +11,7 @@
         table-layout: fixed;
         width: 100%;
         border-spacing: 20px;
-        margin: 20px 0 40px;
+        margin: 0 0 40px;
         &.two {
             .tile {
                 width: 47%;
@@ -60,19 +60,23 @@
 
 
 /* Small Devices, Tablets */
-@media only screen and (max-width : 768px) {
-    .box {
-        overflow: visible;
-        &.two {
-            .tile {
-                div {
-                    margin: 0 -21px;
+@media only screen and (max-width : 767px) {
+    .box-outer {
+        .box {
+            overflow: visible;
+            &.two,
+            &.one,
+            &.three {
+                .tile {
+                    div {
+                        margin: 0 -21px;
+                    }
+                    display: block;
+                    width: 100%;
+                    margin: 0 0 30px 0;
+                    padding: 0 20px 20px;
                 }
-                width: 100%;
-                margin: 0 0 30px 0;
-                padding: 0 20px 20px;
             }
         }
     }
-
 }

less/uw.buttons.less

@@ -9,6 +9,8 @@ a.uw-btn {
   position: relative;
   background-image: none !important;
   border-bottom: none;
+  margin-bottom: 25px;
+  margin-right: 55px;
   &.btn-sm {
     padding: 10px 16px;
     font-size: 14px;
@@ -44,6 +46,19 @@ a.uw-btn {
       background-color: lighten(@darkgold, 10%);
     }
   }
+  &.btn-purple {
+    background-color: @purple;
+    color: white;
+    &:hover {
+      background-color: darken(@purple, 5%);
+    }
+    &:before {
+      background-color: darken(@purple, 5%);
+    }
+    &:hover:before {
+      background-color: darken(@purple, 20%);
+    }
+  }
   &:after {
     content: "";
     position: absolute;

less/uw.images.less

@@ -1,15 +1,15 @@
 // Image Handling
 
 .alignleft,
-.alignright,
 .alignnone {
 	float: left;
 	margin: 20px 50px 50px -130px;
 	&.size-large {
 		width:305px !important;
 		height: auto;
 	}
-	&.size-Full {
+	&.size-Full,
+	&.size-full {
 		margin-left: 0;
 		width: 100% !important;
 		height: auto;
@@ -21,6 +21,11 @@
 
 	}
 }
+.alignright {
+	float: right;
+	margin: 20px 20px 20px 60px;
+}
+
 
 .wp-caption-text {
 	font-size: 15px;
@@ -38,10 +43,9 @@
 
 
 
-@media only screen and (max-width : 1300px) {
+@media only screen and (max-width : 1400px) {
 
 	.alignleft,
-	.alignright,
 	.alignnone {
 		float: left;
 		margin: 20px 50px 50px 0px;

less/widgets/pic-text.less

@@ -0,0 +1,6 @@
+.pic-text-widget {
+  img {
+    width: 100%;
+    height: auto;
+  }
+}

less/widgets/recent-entries.less

@@ -8,6 +8,9 @@
 		padding-top: 5px;
 		overflow: hidden;
 		margin-bottom: 10px;
+		//a {
+		//	color: @darkgray;
+		//}
 	}
 	p {
 		margin: 0;

less/widgets/search.less

@@ -12,6 +12,7 @@
 		position: absolute;
 		top: 10px;
 		left: 18px;
+		visibility: hidden;
 	}
 	.assistive-text {
 		  z-index: -1;

less/widgets/yarpp_widget.less

@@ -23,4 +23,7 @@
     display: block;
     overflow: hidden;
   }
+  small {
+    display: block;
+  }
 }

setup/class.button-shortcode.php

@@ -21,6 +21,13 @@ function button_handler($atts, $content)
         $attributes = (object) $atts;
 
         $classes = array('uw-btn');
+
+        $btnColors = shortcode_atts( array(
+            'color' => 'none',
+        ), $atts );
+
+
+        $color = 'btn-' . $btnColors['color'];
 
         if(empty($content)){
             echo 'No text in this button';
@@ -45,6 +52,6 @@ function button_handler($atts, $content)
 
         $class_string = implode($classes, ' ');
 
-        return sprintf('<a class="%s" href="%s">%s</a>', $class_string, $url, $content);
+        return sprintf('<a class="%s %s" href="%s">%s</a>', $class_string, $color, $url, $content);
     }
 }