Trix 1.2.0

basecamp · Jul 29, 2019 · 6e08079 · 6e08079
1 parent 6ee5821
commit 6e08079
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/dist/trix-core.js b/dist/trix-core.js
diff --git a/dist/trix.css b/dist/trix.css
@@ -1,6 +1,6 @@
 @charset "UTF-8";
 /*
-Trix 1.1.1
+Trix 1.2.0
 Copyright © 2019 Basecamp, LLC
 http://trix-editor.org/*/
 trix-editor {
@@ -90,6 +90,10 @@ trix-toolbar .trix-button--icon {
     opacity: 1; }
   trix-toolbar .trix-button--icon:disabled::before {
     opacity: 0.125; }
+trix-toolbar .trix-button--icon-attach::before {
+  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M16.5%206v11.5a4%204%200%201%201-8%200V5a2.5%202.5%200%200%201%205%200v10.5a1%201%200%201%201-2%200V6H10v9.5a2.5%202.5%200%200%200%205%200V5a4%204%200%201%200-8%200v12.5a5.5%205.5%200%200%200%2011%200V6h-1.5z%22%2F%3E%3C%2Fsvg%3E);
+  top: 8%;
+  bottom: 4%; }
 trix-toolbar .trix-button--icon-bold::before {
   background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M15.6%2011.8c1-.7%201.6-1.8%201.6-2.8a4%204%200%200%200-4-4H7v14h7c2.1%200%203.7-1.7%203.7-3.8%200-1.5-.8-2.8-2.1-3.4zM10%207.5h3a1.5%201.5%200%201%201%200%203h-3v-3zm3.5%209H10v-3h3.5a1.5%201.5%200%201%201%200%203z%22%2F%3E%3C%2Fsvg%3E); }
 trix-toolbar .trix-button--icon-italic::before {

diff --git a/dist/trix.js b/dist/trix.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trix",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A rich text editor for everyday writing",
   "main": "dist/trix.js",
   "style": "dist/trix.css",

diff --git a/src/trix/VERSION b/src/trix/VERSION
@@ -1 +1 @@
-1.1.1
+1.2.0