Merge pull request unimelb#817 from unimelb/chore-update-static

Prep static site
icelab · Feb 28, 2017 · 91c999f · 91c999f
2 parents 40c528d + 3869915
commit 91c999f
Show file tree

Hide file tree

Showing 19 changed files with 8,782 additions and 43 deletions.
diff --git a/.env.example b/.env.example
@@ -1,5 +1,5 @@
 SECRET=0oAsRP76XrEe2jJ3Xi4Js0oJs0oAsRPAsR6XrEe2jJ3Xi4P7XrEe2jJ3Xi4Js0oAsRP76XrEe2jJ3Xi4Js76XrEe2jJ3Xi4Js0oAsRP76
-VERSION=v5.0
+VERSION=v6.0
 
 # webpack
 WEB_SERVER_HOST="localhost"

diff --git a/assets/targets/components/headers/_headers.scss b/assets/targets/components/headers/_headers.scss
@@ -231,6 +231,13 @@
   }
 }
 
+.uomcontent [role="main"] .fixed-bg {
+  background-attachment: fixed;
+  background-color: $black;
+  background-position: top center;
+  background-size: inherit;
+}
+
 .uomcontent .floating + [role="main"] {
   header,
   & > header:first-child {

diff --git a/assets/targets/components/listings/07-logo-listing.slim b/assets/targets/components/listings/07-logo-listing.slim
@@ -1,3 +1,5 @@
+p For specific dimension images that you want to keep unmodified (no cropping), eg. in sponsor logo grids. The markup will allow labels and links if required.
+
 .logo-listing
   figure.logo-listing__item
     img alt="" src="http://placeimg.com/110/180/animals"

diff --git a/assets/targets/components/listings/_listings.scss b/assets/targets/components/listings/_listings.scss
@@ -28,6 +28,14 @@
     &:first-child {
       border-top: 0 none;
     }
+
+    &.alt {
+      margin-left: 0;
+      margin-right: 0;
+      padding-left: 3%;
+      padding-right: 3%;
+      width: 100%;
+    }
   }
 
   a {
@@ -47,7 +55,7 @@
   img {
     display: block;
     float: none;
-    margin: 0 auto;
+    margin: 0 auto 0 0;
     max-width: 100%;
   }
 
@@ -61,7 +69,6 @@
 
   p {
     @include adjust-font-size-to(13px);
-    // @include rem(margin-left, 115px);
     color: $midgray;
     padding: 0;
     width: auto;
@@ -72,13 +79,13 @@
 
     img {
       @include rem(min-height, 200px);
+      max-width: none;
     }
   }
 
   @include breakpoint(tablet) {
     @include padding-leader(2);
     img {
-      margin-left: 0;
       max-width: 100%;
     }
 
@@ -92,6 +99,12 @@
       display: inline-block;
       vertical-align: top;
       width: 49.5%;
+
+      &.alt {
+        padding-left: 0;
+        padding-right: 0;
+        width: 49.5%;
+      }
     }
 
     li:nth-child(4n+1) {
@@ -109,12 +122,14 @@
   }
 
   @include breakpoint(desktop) {
-    li {
+    li,
+    li.alt {
       width: 32.9%;
     }
   }
   @include breakpoint(wide) {
-    li {
+    li,
+    li.alt {
       width: 24.7%;
     }
   }

diff --git a/assets/targets/components/listings/_nav_block.scss b/assets/targets/components/listings/_nav_block.scss
@@ -2,9 +2,9 @@
   @include padding-leader(3);
   @include padding-trailer(3);
   @include rem(max-width, 1400px);
-  @include rem(padding-left, 25px);
-  @include rem(padding-right, 25px);
   margin: 0 auto;
+  padding-left: 3%;
+  padding-right: 3%;
 
   h1.aligned-title {
     @include rem(padding-bottom, 48px);

diff --git a/assets/targets/components/listings/_nav_text.scss b/assets/targets/components/listings/_nav_text.scss
@@ -2,9 +2,9 @@
   @include padding-leader(3);
   @include padding-trailer(3);
   @include rem(max-width, 1400px);
-  @include rem(padding-left, 27px);
-  @include rem(padding-right, 27px);
   margin: 0 auto;
+  padding-left: 3%;
+  padding-right: 3%;
 
   h1,
   p,

diff --git a/assets/targets/components/people/01-staff-listing.slim b/assets/targets/components/people/01-staff-listing.slim
@@ -20,7 +20,7 @@ table.staff-listing
       a href="#" Jason Smith
       |,
       '
-      em Coffee Expert
+      em Coffee Drinker
     td.third
       em University of Melbourne
   tr

diff --git a/assets/targets/components/people/02-staff-listing-min.slim b/assets/targets/components/people/02-staff-listing-min.slim
@@ -25,7 +25,7 @@ ul.staff-listing.min
       a href="#" Jason Smith
       |,
       '
-      em Coffee Expert
+      em Coffee Drinker
   li
     .profile
       .frame

diff --git a/assets/targets/components/people/03-staff-listing-detailed.slim b/assets/targets/components/people/03-staff-listing-detailed.slim
@@ -1,3 +1,5 @@
+p Images should be square dimensions (ie. equal width and height).
+
 ul.staff-listing-detailed
   li
     a href=""
@@ -20,6 +22,6 @@ ul.staff-listing-detailed
       .frame
         img src="http://placeimg.com/200/200/animals?3" alt=""
       strong Jason Smith
-      p Coffee Expert
+      p Coffee Drinker
       p
         em University of Melbourne
diff --git a/assets/targets/components/people/04-staff-listing-detailed-diamond.slim b/assets/targets/components/people/04-staff-listing-detailed-diamond.slim
@@ -1,3 +1,5 @@
+p Images should be square dimensions (ie. equal width and height).
+
 ul.staff-listing-detailed.staff-listing-detailed--diamond
   li
     a href=""
@@ -20,6 +22,6 @@ ul.staff-listing-detailed.staff-listing-detailed--diamond
       .diamond-mask
         img src="http://placeimg.com/300/300/animals?3" alt=""
       strong Jason Smith
-      p Coffee Expert
+      p Coffee Drinker
       p
         em University of Melbourne
diff --git a/assets/targets/components/text/_two_columns.scss b/assets/targets/components/text/_two_columns.scss
@@ -21,11 +21,6 @@
     padding: 0;
   }
 
-  svg {
-    @include rem(margin-left, 15px);
-    @include rem(margin-right, 15px);
-  }
-
   & > section {
     margin: 0;
     padding: 0;
@@ -59,6 +54,11 @@
   @include breakpoint(desktop) {
     @include rem(max-width, $w-lge);
     display: table;
+
+    svg {
+      @include rem(margin-left, 15px);
+      @include rem(margin-right, 15px);
+    }
   }
 }