Update change log. Fix html embed styles

vigetlabs · May 11, 2016 · 058b9ce · 058b9ce
1 parent a29ba4c
commit 058b9ce
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Changelog
 
-## 3.4.0 (release candidate)
+## 3.4.0
 
 - Upgrade Microcosm to 9.21.x
 - The `<Field />` component is once again controlled. Upgrading
   Microcosm addressed issues with using a controlled input inside
   of this add-on.
+- Fix html embed styles
 
 ### Upgrading
 

diff --git a/addons/html-embed/index.jsx b/addons/html-embed/index.jsx
@@ -41,7 +41,7 @@ module.exports = React.createClass({
     let javascript = `<script src="${ script }" async></script>`
     let embeddable = encoding + escape(html + javascript)
 
-    return <iframe className="col-block-frame" src={ embeddable } />
+    return <iframe className="col-block-html-frame" src={ embeddable } />
   },
 
   render() {

diff --git a/example/example.js b/example/example.js
@@ -20,6 +20,11 @@ let blockTypes = [
     component : require('../addons/medium'),
     group     : 'Rich Text'
   },
+  {
+    id        : 'embed',
+    label     : 'Embed',
+    component : require('../addons/html-embed')
+  },
   {
     id        : 'child-text',
     label     : 'Child Text',

diff --git a/example/example.scss b/example/example.scss
@@ -23,3 +23,4 @@ body {
 @import "../style/addons/common";
 @import "../style/addons/medium";
 @import "../style/addons/section";
+@import "../style/addons/html-embed";
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "colonel-kurtz",
-  "version": "3.4.0-rc",
+  "version": "3.4.0",
   "private": true,
   "description": "A block editor",
   "main": "src/Colonel.js",

diff --git a/style/addons/html-embed.scss b/style/addons/html-embed.scss
@@ -3,28 +3,23 @@
  */
 
 .col-block-html {
-  padding-top: 8px;
-
-  .col-block-html {
-    background: #223;
-    border-radius: 3px;
-    border: 1px solid #222;
-    box-shadow: inset 0 1px 5px rgba(black, 0.4);
-    color: #eef;
-    font-family: monospace;
-    font-size: 14px;
-    height: 72px;
-    line-height: 1.7;
-    margin: 8px 0 4px;
-    padding: 4px 12px;
-    width: 100%;
-    word-break: break-all;
-  }
-
-  .col-block-frame {
-    border: 0;
-    min-height: 350px;
-    width: 100%;
-  }
+  background: #223;
+  border-radius: 3px;
+  border: 1px solid #222;
+  box-shadow: inset 0 1px 5px rgba(black, 0.4);
+  color: #eef;
+  font-family: monospace;
+  font-size: 14px;
+  height: 72px;
+  line-height: 1.7;
+  margin: 8px 0 4px;
+  padding: 4px 12px;
+  width: 100%;
+  word-break: break-all;
+}
 
+.col-block-html-frame {
+  border: 0;
+  min-height: 350px;
+  width: 100%;
 }