From 04a4fea4a0fa0a1d7e0f2d004d837aa0277ff7ac Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 23 Feb 2017 10:29:01 -0500 Subject: [PATCH 1/5] Use common navigation for single TinyMCE prototype --- navigation.js | 3 ++- tinymce-single/index.html | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/navigation.js b/navigation.js index 6fd8cb2e47d02d..86877fc052d684 100644 --- a/navigation.js +++ b/navigation.js @@ -8,7 +8,8 @@ */ PROTOTYPES = { '/': 'UI Prototype', - '/tinymce-per-block/': 'TinyMCE per block prototype' + '/tinymce-per-block/': 'TinyMCE per block prototype', + '/tinymce-single/': 'Single TinyMCE instance prototype' }; // Generate Navigation DOM diff --git a/tinymce-single/index.html b/tinymce-single/index.html index e6a33a4d91a06a..18390b0567b3d1 100644 --- a/tinymce-single/index.html +++ b/tinymce-single/index.html @@ -7,14 +7,6 @@ - -

1.0 Is The Loneliest Number

@@ -27,6 +19,7 @@

1.0 Is The Loneliest Number

I like Apple for the opposite reason: they’re not afraid of getting a rudimentary 1.0 out into the world.

+ From 87a43a579d7a260b001c094fcf301e027aa36b29 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 23 Feb 2017 10:33:26 -0500 Subject: [PATCH 2/5] Remove unused shared navigation styles --- shared/index.css | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/shared/index.css b/shared/index.css index b807bb87ef24c2..1b9e9ad439c390 100644 --- a/shared/index.css +++ b/shared/index.css @@ -7,22 +7,6 @@ body { margin: 1em; } -a { - color: inherit; -} - -nav { - font-size: 16px; -} - -nav:target { - display: none; -} - -nav li.is-active { - font-weight: bold; -} - #editor { background: #fff; margin: 5em auto; From 53206d7d5f52a6cb652b2088e9a2764058426760 Mon Sep 17 00:00:00 2001 From: iseulde Date: Thu, 23 Feb 2017 17:04:07 +0100 Subject: [PATCH 3/5] Restore link styles --- shared/index.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared/index.css b/shared/index.css index 1b9e9ad439c390..f5589e5ac05a21 100644 --- a/shared/index.css +++ b/shared/index.css @@ -7,6 +7,10 @@ body { margin: 1em; } +a { + color: inherit; +} + #editor { background: #fff; margin: 5em auto; From 126c0689c4013d4e184dd3b2303b7b99af7aaca3 Mon Sep 17 00:00:00 2001 From: iseulde Date: Thu, 23 Feb 2017 17:06:31 +0100 Subject: [PATCH 4/5] Move navigation.js to shared folder --- index.html | 2 +- navigation.js => shared/navigation.js | 0 tinymce-per-block/index.html | 2 +- tinymce-single/index.html | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename navigation.js => shared/navigation.js (100%) diff --git a/index.html b/index.html index ea509359dec094..b7a85eaaba2dfd 100644 --- a/index.html +++ b/index.html @@ -87,6 +87,6 @@

1.0 Is The Loneliest Number

- + diff --git a/navigation.js b/shared/navigation.js similarity index 100% rename from navigation.js rename to shared/navigation.js diff --git a/tinymce-per-block/index.html b/tinymce-per-block/index.html index c9ac580f72984a..0cb14c8664424d 100644 --- a/tinymce-per-block/index.html +++ b/tinymce-per-block/index.html @@ -15,6 +15,6 @@ - + diff --git a/tinymce-single/index.html b/tinymce-single/index.html index 18390b0567b3d1..2ffca8682ef72b 100644 --- a/tinymce-single/index.html +++ b/tinymce-single/index.html @@ -19,7 +19,7 @@

1.0 Is The Loneliest Number

I like Apple for the opposite reason: they’re not afraid of getting a rudimentary 1.0 out into the world.

- + From a7d66f5a8aedb483a6911b435694173352a37987 Mon Sep 17 00:00:00 2001 From: iseulde Date: Thu, 23 Feb 2017 17:24:54 +0100 Subject: [PATCH 5/5] Limit link styles to the editor content --- shared/index.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/index.css b/shared/index.css index f5589e5ac05a21..e8284a6d4e1d84 100644 --- a/shared/index.css +++ b/shared/index.css @@ -7,10 +7,6 @@ body { margin: 1em; } -a { - color: inherit; -} - #editor { background: #fff; margin: 5em auto; @@ -19,6 +15,10 @@ a { width: 37.5em; } +#editor a { + color: inherit; +} + #editor iframe { max-width: 100%; border: 0;