From 56850fc2754ddefdd74f30ed8ac41ff9d6998934 Mon Sep 17 00:00:00 2001 From: Eric Wheeler Date: Sat, 9 Jul 2016 23:19:59 -0700 Subject: [PATCH] added tinymce --- .idea/workspace.xml | 88 +++++++++++++++++++-------------------------- bower.json | 8 ++++- 2 files changed, 44 insertions(+), 52 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index aa95c76..21671a5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,32 +3,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -76,16 +51,16 @@ - + - + - + @@ -105,8 +80,18 @@ - - + + + + + + + + + + + + @@ -168,7 +153,6 @@ @@ -433,12 +418,12 @@ - + - @@ -747,13 +732,6 @@ - - - - - - - @@ -810,14 +788,6 @@ - - - - - - - - @@ -872,18 +842,34 @@ - + - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bower.json b/bower.json index 63ccc61..cea06ff 100644 --- a/bower.json +++ b/bower.json @@ -19,7 +19,8 @@ "dependencies": { "uikit": "^2.26.3", "html5shiv": "^3.7.3", - "respond": "^1.4.2" + "respond": "^1.4.2", + "tinymce": "^4.4.0" }, "overrides": { "uikit": { @@ -49,6 +50,11 @@ "main": [ "**/html5shiv.min.js" ] + }, + "tinymce": { + "main": [ + "**/tinymce.min.js" + ] } } }