Merge pull request #2 from boltthemes/bolt3

Bolt 3
nestordedios · Apr 29, 2016 · 78ac8ab · 78ac8ab
2 parents 28b825a + b087055
commit 78ac8ab
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 ## Solarize by TEMPLATED 
 ===================
 
+**Note:** This is for Bolt 3. Check out the `bolt-v2` branch for a Bolt 2 compatible version.
+
 ![Preview](screenshots/screenshot1.png)
 
 ### Introduction

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
  "type": "bolt-theme",
  "keywords": ["theme", "solarize", "responsive", "clean"],
  "require": {
- "bolt/bolt": ">=2.0.0,<3.0.0"
+ "bolt/bolt": "^3.0"
  },
  "license": "CCA (Creative Commons Attribution)",
  "authors": [

diff --git a/record-sidebar-left.twig b/record-sidebar-left.twig
@@ -10,6 +10,9 @@
 
  <!-- Sidebar -->
  <div id="sidebar" class="4u">
+
+ {{ widgets('aside_top') }}
+
  <section>
  <header class="major">
  <h2>Latest Pages</h2>
@@ -32,6 +35,9 @@
  {% endfor %}
  </ul>
  </section>
+
+ {{ widgets('aside_bottom') }}
+
  </div>
 
  <!-- Content -->

diff --git a/record-sidebar-right.twig b/record-sidebar-right.twig
@@ -23,6 +23,9 @@
 
  <!-- Sidebar -->
  <div id="sidebar" class="4u">
+
+ {{ widgets('aside_top') }}
+
  <section>
  <header class="major">
  <h2>Latest Pages</h2>
@@ -45,6 +48,9 @@
  {% endfor %}
  </ul>
  </section>
+
+ {{ widgets('aside_bottom') }}
+
  </div>
 
  </div>

diff --git a/config.yml → theme.yml b/config.yml → theme.yml