Skip to content

Commit a552415

Browse files
committed
Trix 1.3.0
1 parent b2fba5c commit a552415

File tree

5 files changed

+40
-39
lines changed

5 files changed

+40
-39
lines changed

dist/trix-core.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/trix.css

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@charset "UTF-8";
22
/*
3-
Trix 1.2.4
3+
Trix 1.3.0
44
Copyright © 2020 Basecamp, LLC
55
http://trix-editor.org/*/
66
trix-editor {
@@ -301,47 +301,50 @@ trix-editor .attachment__metadata {
301301
.trix-content {
302302
line-height: 1.5; }
303303
.trix-content * {
304-
box-sizing: border-box; }
304+
box-sizing: border-box;
305+
margin: 0;
306+
padding: 0; }
305307
.trix-content h1 {
306308
font-size: 1.2em;
307-
line-height: 1.2;
308-
margin: 0; }
309+
line-height: 1.2; }
309310
.trix-content blockquote {
310-
margin: 0 0 0 0.3em;
311-
padding: 0 0 0 0.6em;
312-
border-left: 0.3em solid #ccc; }
311+
border: 0 solid #ccc;
312+
border-left-width: 0.3em;
313+
margin-left: 0.3em;
314+
padding-left: 0.6em; }
315+
.trix-content [dir=rtl] blockquote,
316+
.trix-content blockquote[dir=rtl] {
317+
border-width: 0;
318+
border-right-width: 0.3em;
319+
margin-right: 0.3em;
320+
padding-right: 0.6em; }
321+
.trix-content li {
322+
margin-left: 1em; }
323+
.trix-content [dir=rtl] li {
324+
margin-right: 1em; }
313325
.trix-content pre {
314326
display: inline-block;
315327
width: 100%;
316328
vertical-align: top;
317329
font-family: monospace;
318330
font-size: 0.9em;
319-
margin: 0;
320331
padding: 0.5em;
321332
white-space: pre;
322333
background-color: #eee;
323334
overflow-x: auto; }
324-
.trix-content ul, .trix-content ol, .trix-content li {
325-
margin: 0;
326-
padding: 0; }
327-
.trix-content ul li, .trix-content ol li, .trix-content li li {
328-
margin-left: 1em; }
329335
.trix-content img {
330336
max-width: 100%;
331337
height: auto; }
332338
.trix-content .attachment {
333339
display: inline-block;
334340
position: relative;
335-
max-width: 100%;
336-
margin: 0;
337-
padding: 0; }
341+
max-width: 100%; }
338342
.trix-content .attachment a {
339343
color: inherit;
340344
text-decoration: none; }
341345
.trix-content .attachment a:hover, .trix-content .attachment a:visited:hover {
342346
color: inherit; }
343347
.trix-content .attachment__caption {
344-
padding: 0;
345348
text-align: center; }
346349
.trix-content .attachment__caption .attachment__name + .attachment__size::before {
347350
content: ' · '; }
@@ -355,16 +358,14 @@ trix-editor .attachment__metadata {
355358
.trix-content .attachment--file {
356359
color: #333;
357360
line-height: 1;
358-
margin: 0 2px 2px 0;
361+
margin: 0 2px 2px 2px;
359362
padding: 0.4em 1em;
360363
border: 1px solid #bbb;
361364
border-radius: 5px; }
362365
.trix-content .attachment-gallery {
363366
display: flex;
364367
flex-wrap: wrap;
365-
position: relative;
366-
margin: 0;
367-
padding: 0; }
368+
position: relative; }
368369
.trix-content .attachment-gallery .attachment {
369370
flex: 1 0 33%;
370371
padding: 0 0.5em;

dist/trix.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "trix",
3-
"version": "1.2.4",
3+
"version": "1.3.0",
44
"description": "A rich text editor for everyday writing",
55
"main": "dist/trix.js",
66
"style": "dist/trix.css",

src/trix/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.4
1+
1.3.0

0 commit comments

Comments
 (0)