Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The easiest way to start with Trix is including it from an npm CDN in the `<head
```html
<head>
<link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.0.8/dist/trix.css">
<link rel="stylesheet" href="https://unpkg.com/trix@2.0.8/dist/trix.css">
<script type="text/javascript" src="https://unpkg.com/trix@2.0.8/dist/trix.umd.min.js"></script>
</head>
```
Expand Down
1 change: 0 additions & 1 deletion action_text-trix/app/assets/javascripts/trix.js
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,6 @@ $\
};
const insertStyleElementForTagName = function (tagName) {
const element = document.createElement("style");
element.setAttribute("type", "text/css");
element.setAttribute("data-tag-name", tagName.toLowerCase());
const nonce = getCSPNonce();
if (nonce) {
Expand Down
4 changes: 2 additions & 2 deletions assets/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<meta name="csp-nonce" content="topsecret">
<link rel="icon" href="data:,">
<link rel="stylesheet" type="text/css" href="trix.css">
<style type="text/css">
<link rel="stylesheet" href="trix.css">
<style>
* {
box-sizing: border-box;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<title>Test Suite</title>
<link rel="icon" href="data:,">
<link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.19.1.css">
<link rel="stylesheet" type="text/css" href="trix.css">
<link rel="stylesheet" href="trix.css">
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ QUnit.config.testTimeout = 20000

document.head.insertAdjacentHTML(
"beforeend",
`<style type="text/css">
`<style>
#trix-container { height: 150px; }
trix-toolbar { margin-bottom: 10px; }
trix-toolbar button { border: 1px solid #ccc; background: #fff; }
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_helpers/fixtures/editor_with_block_styles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default () =>
`<style type="text/css">
`<style>
blockquote { font-style: italic; }
li { font-weight: bold; }
</style>
Expand Down
2 changes: 1 addition & 1 deletion src/test/test_helpers/fixtures/editor_with_bold_styles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default () =>
`<style type="text/css">
`<style>
strong { font-weight: 500; }
span { font-weight: 600; }
article { font-weight: bold; }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default () =>
`<style type="text/css">
`<style>
.trix-content figure.attachment {
display: inline-block;
}
Expand Down
1 change: 0 additions & 1 deletion src/trix/core/helpers/custom_elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export const installDefaultCSSForTagName = function(tagName, defaultCSS) {

const insertStyleElementForTagName = function(tagName) {
const element = document.createElement("style")
element.setAttribute("type", "text/css")
element.setAttribute("data-tag-name", tagName.toLowerCase())
const nonce = getCSPNonce()
if (nonce) {
Expand Down
Loading