diff --git a/CHANGES b/CHANGES index 9aa03ab..52d9149 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,17 @@ * Add change event callback +1.0.3 - Bug fixes and updated content +* General bug fixes and improvements +* Added gulpfile.js to streamline +* Created example + - Multiple editors (on a single page) +* Updated content + - Updated jquery.hotkeys + - Updated Bootstrap to version 3.3.4 + - Updated Font Awesome to version 4.3.0 + - Updated jQuery to version 2.1.4 + - Updated Google Code Prettify to version 1.0.4 + 1.0.2 - Merged some extras * Added support for placeholder attribute as requested in issue #143 and #136 diff --git a/css/style.css b/css/style.css index c699868..ca523d8 100644 --- a/css/style.css +++ b/css/style.css @@ -27,7 +27,7 @@ box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); } -#voiceBtn { +.voiceBtn { width: 20px; color: transparent; background-color: transparent; @@ -53,6 +53,29 @@ div[data-role="editor-toolbar"] { .btn-toolbar { padding: 10px 0px 10px 0px; } + +[contentEditable=true]:empty:not(:focus):before { + content:attr(data-placeholder) +} + .placeholderText { color: #777; +} + +/* + Font Sizes + fs represents the font-size attribute; therefore, + fs-five would be the equivalent to font-size: 5; +*/ + +.fs-One { + font-size: x-small; +} + +.fs-Three { + font-size: medium; +} + +.fs-Five { + font-size: x-large; } \ No newline at end of file diff --git a/examples/basic.html b/examples/basic.html index e3ebca8..e9a2e02 100644 --- a/examples/basic.html +++ b/examples/basic.html @@ -5,23 +5,22 @@
Submit
@@ -71,9 +71,9 @@ Simple Editor with Toolbar
-
+
Simple Editor with Toolbar