Merge branch 'develop'

* develop: Release 1.2.1 what-input 4.1.6 foundation-sites 6.4.3 License clarification
fanfarian · Nov 8, 2017 · d781c6d · d781c6d
2 parents 8417317 + 182376f
commit d781c6d
Show file tree

Hide file tree

Showing 104 changed files with 18,893 additions and 2,098 deletions.
diff --git a/CHANGELOG.html b/CHANGELOG.html
@@ -8,6 +8,17 @@ <h3 id="sr-themehttp:sr-theme.com">sr-theme (http://sr-theme.com)</h3>
 
 <h1 id="changelog">Changelog</h1>
 
+<h2 id="1.2.12017-10-25">1.2.1 (2017&#8211;10&#8211;25)</h2>
+
+<ul>
+<li>Bower Updates
+
+<ul>
+<li>foundation-sites 6.4.3</li>
+<li>what-input 4.1.6</li>
+</ul></li>
+</ul>
+
 <h2 id="1.2.02017-06-13">1.2.0 (2017&#8211;06&#8211;13)</h2>
 
 <ul>
@@ -18,7 +29,7 @@ <h2 id="1.2.02017-06-13">1.2.0 (2017&#8211;06&#8211;13)</h2>
 <ul>
 <li>fontfaceobserver 2.0.13</li>
 <li>foundation-sites 6.4.1</li>
-<li>what-input 4.3.1</li>
+<li>what-input 4.1.3</li>
 </ul></li>
 </ul>
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,18 @@
 ### sr-theme (http://sr-theme.com) 
 # Changelog
 
+## 1.2.1 (2017-10-25)
+* Bower Updates
+	- foundation-sites 6.4.3
+	- what-input 4.1.6
+
 ## 1.2.0 (2017-06-13)
 * Small Bugfixes & has_thumbnail() request for loop- files
 * Update YahnisElsts PUC 4.1
 * Bower Updates
 	- fontfaceobserver 2.0.13
 	- foundation-sites 6.4.1
-	- what-input 4.3.1
+	- what-input 4.1.3
 
 
 ## 1.1.11 (2017-05-18)

diff --git a/assets/css/style.css b/assets/css/style.css
diff --git a/assets/css/style.css.map b/assets/css/style.css.map
diff --git a/bower.json b/bower.json
@@ -12,7 +12,7 @@
     "jquery": "^3.1.0"
   },
   "resolutions": {
-    "what-input": "^4.3.1",
+    "what-input": "~4.1.3",
     "jquery": "^3.2.1",
     "fontfaceobserver": "^2.0.9"
   }