Merge pull request #73 from uicrooks/dev

v2.6.2

README.md

@@ -64,7 +64,7 @@ Shopify Theme Lab is a customizable modular development environment for blazing-
   - [Shopify + webpack](#shopify--webpack)
   - [Shopify remote auto-reloading](#shopify-remote-auto-reloading)
 - [Static files](#static-files)
-- [Custom fonts](#custom-fonts)
+- [Local fonts](#local-fonts)
 - [Common pitfalls](#common-pitfalls)
 - [Limitations](#limitations)
 - [Contributing](#contributing)
@@ -189,6 +189,12 @@ $ npm run deploy:live # deploy shopify/ directory
 $ npm run deploy:live -- --allow-live
 ```
 
+> By default, the deploy task overrides all files on the remote store, if any changes were made through the Shopify theme editor you might want to download the `settings_data.json` file before deploying:
+
+```sh
+$ npm run settings:live
+```
+
 ### Teams
 The `shopify:init` task always creates a new theme with a unique ID for the provided store. Sometimes it can be useful to connect to an existing initialized theme (e.g. when multiple people deploy to the same live environment).
 
@@ -553,8 +559,8 @@ While `npm run start` task is running: The `shopify/` directory is being watched
 Place your static files inside the `shopify/assets/` directory and add the `static` keyword to their filename e.g. `myfile.static.png`. All files inside this directory are ignored by git except for files with `static` in their filename. Since this directory is also shared with files generated by webpack, it's cleaned on every consecutive build except for `static` files.
 <!-- static files (end) -->
 
-<!-- custom fonts (start) -->
-## Custom fonts
+<!-- local fonts (start) -->
+## Local fonts
 
 1. add your fonts to the `shopify/assets/` directory with the `static` keyword e.g.:
 ```text
@@ -594,7 +600,7 @@ body {
   font-family: 'Open Sans', sans-serif;
 }
 ```
-<!-- custom fonts (end) -->
+<!-- local fonts (end) -->
 
 <!-- common pitfalls (start) -->
 ## Common pitfalls