Merge branch 'master' of github.com:issueapp/spring

Former-commit-id: 695fac1
issueapp · Jun 19, 2015 · 8922a92 · 8922a92
2 parents ada7dce + 305d93d
commit 8922a92
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/issues/muse/assets/winter/michelle-4-skirt.jpg b/issues/muse/assets/winter/michelle-4-skirt.jpg
diff --git a/issues/muse/data/winter/2.md b/issues/muse/data/winter/2.md
@@ -19,27 +19,27 @@
         image_url: assets/winter/michelle-2-sunny.jpg
         description: An uplifting feline shape is accentuated with enamel filled metal caps adorning frame fronts. Each richly coloured cap is further enunciated with a delicate metal line, which reflects a broad metal ring that is engraved with the Chloé logo.
         link: http://shop.davidjones.com.au/djs/en/davidjones/sun-600
-        
+
       - title: Powder Blue Merino Knit by Trenery;
         price: $215
         brand: Veronik Mmaine
         description: Patterned with a rose design, these culottes sit high on the waist and feature a wide cropped leg that falls to mid calf. The fabric has a nice stretch that moulds around the body creating a flattering fit.- Stretch fabrication- Wide leg- Cropped to mid calf- Rose pattern- High waist- Metal zip to side seam- Made in Australia
         image_url: assets/winter/michelle-3-jumper.jpg
         link: http://shop.davidjones.com.au/djs/en/davidjones/merino-zip-trim-knit
-        
-      - title: Fabric Mache Skirt
-        price: $335.3
-        brand: MANNING CARTELL
-        description: The Fabric Mache Skirt from Manning Cartell is crafted from textured tweed bonded with sheer chiffon. The piece features a feminine fit and flare silhouette and inverted pleats for additional shape, structure and movement.
+
+      - title: Fabric Mache Dress
+        price: $524.30
+        brand: Manning Cartell
+        description: Crafted from textured tweed bonded with sheer chiffon, the Fabric Mache Dress from Manning Cartell blends feminine and masculine elements with ease. Front welt pockets and a tail hem skirt with inverted pleats complete this modern must-have.
         image_url: assets/winter/michelle-4-skirt.jpg
-        link: http://shop.davidjones.com.au/djs/ProductDisplay?urlRequestType=Base&catalogId=10051&categoryId=27114&productId=5796561&errorViewName=ProductDisplayErrorView&urlLangId=-1&langId=-1&top_category=26551&parent_category_rn=&storeId=10051
+        link: http://shop.davidjones.com.au/djs/ProductDisplay?urlRequestType=Base&catalogId=10051&categoryId=27051&productId=5714564&errorViewName=ProductDisplayErrorView&urlLangId=-1&langId=-1&top_category=26551&parent_category_rn=&storeId=10051
 
       - title: Skinny Coloured Jean by Paul Smith
         price: $335.3
         brand: Paul Smith
         description: Five pocket style. Button fasten waistband. Zip fly. Branded buttons & rivets. Skinny fit. Contrast stitching. Logo tag to back pocket. Leather logo patch to waistband. 98% cotton, 2% polyurethane. Machine washable.
         image_url: assets/winter/michelle-5-pants.jpg
-        link: http://shop.davidjones.com.au/djs/ProductDisplay?urlRequestType=Base&catalogId=10051&categoryId=27114&productId=5796561&errorViewName=ProductDisplayErrorView&urlLangId=-1&langId=-1&top_category=26551&parent_category_rn=&storeId=10051
+        link: http://shop.davidjones.com.au/djs/en/davidjones/skinny-coloured-jean
 
       - title: Carlie Light Grey Boot
         price: $125.96
@@ -48,7 +48,7 @@
         image_url: assets/winter/michelle-6-shoe.jpg
         link: http://shop.davidjones.com.au/djs/en/davidjones/carlie-boot
 
-      
+
     layout:
       type: two-column
       image_style: cover
@@ -65,4 +65,4 @@
 <a class="color" style="background: #e8d8c7">#e8d8c7</a>
 </div>
 
-Amp up the sweetness with a pastel coloured combo. This foolproof pairing is unashamedly feminine so add a bit of edge with textured pieces such as a woven skirt or leather boots.
+Amp up the sweetness with a pastel coloured combo. This foolproof pairing is unashamedly feminine so add a bit of edge with textured pieces such as a woven skirt or leather boots.
diff --git a/views/issue/_cover.html.erb b/views/issue/_cover.html.erb
@@ -31,7 +31,8 @@
   App.pages = App.pages || {}
 
   // Not sure why layout is not being set.
-  App.refresh()
+  // App.refresh()
+
   App.pages["index"] = {
     handle: "index",
     title: "<%= issue.title %>"

diff --git a/views/issue/_page.html.erb b/views/issue/_page.html.erb
@@ -67,7 +67,7 @@
   App.pages = App.pages || {}
 
   // Not sure why layout is not being set.
-  App.refresh()
+  // App.refresh()
 
   App.pages["<%= page.path %>"] = <%= page.json.to_json %>;
 

diff --git a/views/issue/_toc.html.erb b/views/issue/_toc.html.erb
@@ -65,7 +65,7 @@
   App.pages = App.pages || {}
 
   // Not sure why layout is not being set.
-  App.refresh()
+  // App.refresh()
 
   App.pages["<%= page.path %>"] = {
     id: "<%= page.id %>",