added tinymce

This commit is contained in:
R. Eric Wheeler 2016-07-09 23:19:59 -07:00
parent 24f1a18dfc
commit 56850fc275
2 changed files with 44 additions and 52 deletions

View File

@ -3,32 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="cf1e275f-fbc1-41d4-a421-0f55447b6367" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/App.php" afterPath="$PROJECT_DIR$/app/App.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config/config.yml" afterPath="$PROJECT_DIR$/app/config/config.yml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config/default/config.php" afterPath="$PROJECT_DIR$/app/config/default/config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/providers.php" afterPath="$PROJECT_DIR$/app/providers.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/resume.html.twig" afterPath="$PROJECT_DIR$/app/views/resume.html.twig" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/uikit.html.twig" afterPath="$PROJECT_DIR$/app/views/uikit.html.twig" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.php" afterPath="$PROJECT_DIR$/dump.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Command/SchemaValidationCommand.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Command/SchemaValidationCommand.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Config/ConfigServiceProvider.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Config/ConfigServiceProvider.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Config/ConfigTrait.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Config/ConfigTrait.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Controller/ApiControllerProvider.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Controller/ApiControllerProvider.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Controller/ResumeControllerProvider.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Controller/ResumeControllerProvider.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/FacebookProfileIcon.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/FacebookProfileIcon.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/GithubProfileIcon.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/GithubProfileIcon.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/GitlabProfileIcon.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/GitlabProfileIcon.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/LinkedinProfileIcon.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/LinkedinProfileIcon.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/ProfileIconInterface.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/ProfileIconInterface.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/TwitterProfileIcon.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Image/Profile/TwitterProfileIcon.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Json/JsonFileTrait.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Json/JsonFileTrait.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Json/JsonServiceProvider.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Json/JsonServiceProvider.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Json/JsonTrait.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Json/JsonTrait.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Json/ResumeBuilder.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Json/ResumeBuilder.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Resume/ResumeParser.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Resume/ResumeParser.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Twig/Date.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Twig/Date.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Twig/RenderProfile.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Twig/RenderProfile.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/index.php" afterPath="$PROJECT_DIR$/web/index.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/bower.json" afterPath="$PROJECT_DIR$/bower.json" />
</list>
<ignored path="resume.iws" />
<ignored path=".idea/workspace.xml" />
@ -76,16 +51,16 @@
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="resume.html.twig" pinned="false" current-in-tab="true">
<file leaf-file-name="resume.html.twig" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/resume.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<state relative-caret-position="3478">
<caret line="231" column="20" selection-start-line="231" selection-start-column="20" selection-end-line="231" selection-end-column="20" />
<folding />
</state>
@ -105,8 +80,18 @@
<file leaf-file-name="Gruntfile.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Gruntfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
<state relative-caret-position="550">
<caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="bower.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="601">
<caret line="55" column="27" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
<folding />
</state>
</provider>
@ -168,7 +153,6 @@
<option value="$PROJECT_DIR$/src/Sikofitt/Command/TestCommand.php" />
<option value="$PROJECT_DIR$/bin/console" />
<option value="$PROJECT_DIR$/src/Sikofitt/Command/SchemaValidationCommand.php" />
<option value="$PROJECT_DIR$/bower.json" />
<option value="$PROJECT_DIR$/app/views/base.html.twig" />
<option value="$PROJECT_DIR$/src/Sikofitt/Config/ConfigTrait.php" />
<option value="$PROJECT_DIR$/src/Sikofitt/less/resume.less" />
@ -182,6 +166,7 @@
<option value="$PROJECT_DIR$/Procfile" />
<option value="$PROJECT_DIR$/app/App.php" />
<option value="$PROJECT_DIR$/app/views/resume.html.twig" />
<option value="$PROJECT_DIR$/bower.json" />
</list>
</option>
</component>
@ -433,12 +418,12 @@
<workItem from="1467840020930" duration="1614000" />
<workItem from="1467938148836" duration="1798000" />
<workItem from="1468092833685" duration="3410000" />
<workItem from="1468116337948" duration="1708000" />
<workItem from="1468116337948" duration="2641000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="34045000" />
<option name="totallyTimeSpent" value="34978000" />
</component>
<component name="ToolWindowManager">
<frame x="110" y="54" width="1701" height="893" extended-state="0" />
@ -747,13 +732,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="579">
<caret line="41" column="16" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Sikofitt/Config/ConfigTrait.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
@ -810,14 +788,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Gruntfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
<caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/uikit.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
@ -872,18 +842,34 @@
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/resume.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<state relative-caret-position="3478">
<caret line="231" column="20" selection-start-line="231" selection-start-column="20" selection-end-line="231" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Gruntfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="601">
<caret line="55" column="27" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

View File

@ -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"
]
}
}
}