]> git.ipfire.org Git - thirdparty/bulma.git/commitdiff
Fix #1456
authorJeremy Thomas <bbxdesign@gmail.com>
Mon, 4 Dec 2017 19:28:07 +0000 (19:28 +0000)
committerJeremy Thomas <bbxdesign@gmail.com>
Mon, 4 Dec 2017 19:28:07 +0000 (19:28 +0000)
CHANGELOG.md
docs/.gitignore
docs/documentation/overview/customize.html
package.json

index 38e52b1acb563b7a75867ef92e42f797f9c70d22..31dd63653e6924456b930f92e29bda5d09818087 100644 (file)
@@ -6,6 +6,10 @@
 
 * New `.is-italic` helper
 
+### Bug fixes
+
+* #1456 Fix customize documentation
+
 ## 0.6.2
 
 ### Improvements
index fb44390c20e3fbce62f46681e0594a82cc3eb16a..54836f4c079ea687b6daa3df7c197f3695ed4882 100644 (file)
@@ -5,11 +5,15 @@
 _config.local.yml
 _config.version.yml
 bulma-test.sass
+bulma-test.scss
+bulma-test.css
 bulma-website-local.sass
 css/bulma-test.css
 css/bulma-docs.css.map
 PUBLISHING.md
 npm-debug.log
+test.sass
+test.scss
 
 # Folders
 
index d956603feeac11abb749c0baebc0a977e300ef40..520497c7da3c1812ced8a6141b91b69bcde28a5f 100644 (file)
@@ -5,48 +5,48 @@ doc-tab: overview
 doc-subtab: customize
 ---
 
-{% capture sass %}
+{% capture scss_code %}
 // 1. Import the initial variables
-@import "../sass/utilities/initial-variables"
-@import "../sass/utilities/functions"
+@import "../sass/utilities/initial-variables";
+@import "../sass/utilities/functions";
 
 // 2. Set your own initial variables
 // Update blue
-$blue: #72d0eb
+$blue: #72d0eb;
 // Add pink and its invert
-$pink: #ffb3b3
-$pink-invert: #fff
+$pink: #ffb3b3;
+$pink-invert: #fff;
 // Add a serif family
-$family-serif: "Merriweather", "Georgia", serif
+$family-serif: "Merriweather", "Georgia", serif;
 
 // 3. Set the derived variables
 // Use the new pink as the primary color
-$primary: $pink
-$primary-invert: $pink-invert
+$primary: $pink;
+$primary-invert: $pink-invert;
 // Use the existing orange as the danger color
-$danger: $orange
+$danger: $orange;
 // Use the new serif family
-$family-primary: $family-serif
+$family-primary: $family-serif;
 
 // 4. Setup your Custom Colors
-$linkedin: #0077B5
-$linkedin-invert: findColorInvert($linkedin)
-$twitter: #1DA1F2
-$twitter-invert: findColorInvert($twitter)
-$github: #222222
-$github-invert: findColorInvert($github)
+$linkedin: #0077b5;
+$linkedin-invert: findColorInvert($linkedin);
+$twitter: #55acee;
+$twitter-invert: findColorInvert($twitter);
+$github: #333;
+$github-invert: findColorInvert($github);
 
 // 5. Add new color variables to the color map.
-@import "../sass/utilities/derived-variables.sass"
+@import "../sass/utilities/derived-variables.sass";
 $addColors: (
   "twitter":($twitter, $twitter-invert),
   "linkedin": ($linkedin, $linkedin-invert),
   "github": ($github, $github-invert)
-)
-$colors: map-merge($colors, $addColors)
+);
+$colors: map-merge($colors, $addColors);
 
 // 6. Import the rest of Bulma
-@import "../bulma"
+@import "../bulma";
 {% endcapture %}
 
 {% include subnav-overview.html %}
@@ -84,10 +84,10 @@ $colors: map-merge($colors, $addColors)
           <strong>Set</strong> your variables
         </p>
         <p class="subtitle is-6">
-          Add your own colors, set new fonts, override Bulma's default styles...
+          Create a file called <code>mystyles.scss</code> and add your own colors, set new fonts, override Bulma's default styles...
         </p>
         <div class="highlight-full">
-          {% highlight sass %}{{ sass }}{% endhighlight %}
+          {% highlight sass %}{{ scss_code }}{% endhighlight %}
         </div>
       </div>
     </article>
index efb3bdbbbb19284e1b74d81466e2bc361ca96ca2..86d8c053c515cb76b24bb42f12091aded4e87f17 100644 (file)
@@ -39,7 +39,8 @@
     "start": "npm run build-sass -- --watch",
     "start-docs": "npm run docs-sass -- --watch",
     "start-test": "npm run test-sass -- --watch",
-    "test-sass": "node-sass --output-style expanded docs/bulma-test.sass docs/css/bulma-test.css"
+    "test-sass": "node-sass --output-style expanded docs/bulma-test.sass docs/css/bulma-test.css",
+    "test-scss": "node-sass --output-style expanded docs/bulma-test.scss docs/css/bulma-test.css"
   },
   "files": [
     "css",