Skip to content

Commit

Permalink
tinymce icons/font now displaying correctly
Browse files Browse the repository at this point in the history
* added content.min.css from tinymce as content styles
* updating node packages to latest
  • Loading branch information
garbas committed Apr 19, 2014
1 parent d766f3c commit 1a20d40
Show file tree
Hide file tree
Showing 23 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"jquery-form": "3.46.0",
"jquery.cookie": "1.4.0",
"lodash": "2.4.1",
"mockup-core": "1.2.1",
"mockup-core": "1.2.4",
"moment": "2.5.1",
"pickadate": "3.4.0",
"requirejs-text": "2.0.10",
Expand Down
1 change: 1 addition & 0 deletions js/patterns/tinymce/pattern.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ define([
folderTypes: 'Folder,Plone Site',
linkableTypes: 'Document,Event,File,Folder,Image,News Item,Topic',
tiny: {
'content_css': '++resource++plone-tinymce-content.css',
plugins: [
'advlist autolink lists charmap print preview anchor ploneupload',
'searchreplace visualblocks code fullscreen autoresize',
Expand Down
4 changes: 4 additions & 0 deletions less/pattern.tinymce.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

.importCSS() when not (@isBrowser) {
@import (less) "../lib/tinymce/skins/lightgray/skin.min.css";
@import (less) "../lib/tinymce/skins/lightgray/content.inline.min.css";
@import (less) "../lib/tinymce/plugins/visualblocks/css/visualblocks.css";
}
.importCSS() when (@isBrowser) {
@import (css) "@{pathPrefix}../lib/tinymce/skins/lightgray/skin.min.css";
@import (css) "@{pathPrefix}../lib/tinymce/skins/lightgray/content.inline.min.css";
@import (css) "@{pathPrefix}../lib/tinymce/plugins/visualblocks/css/visualblocks.css";
}
.importCSS();

Expand Down
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-cool.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-cry.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-embarassed.gif
Binary file not shown.
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-frown.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-innocent.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-kiss.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-laughing.gif
Binary file not shown.
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-sealed.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-smile.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-surprised.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-undecided.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-wink.gif
Binary file not shown.
Binary file removed lib/tinymce/plugins/emoticons/img/smiley-yell.gif
Binary file not shown.
Binary file removed lib/tinymce/skins/lightgray/fonts/icomoon.ttf
Binary file not shown.
Binary file removed lib/tinymce/skins/lightgray/fonts/icomoon.woff
Binary file not shown.
Binary file removed lib/tinymce/skins/lightgray/img/trans.gif
Binary file not shown.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
"description": "Collection of Plone CMS Core Patterns",
"homepage": "http://plone.github.io/mockup",
"devDependencies": {
"bower": "~1.3.1",
"bower": "~1.3.2",
"coveralls": "~2.10.0",
"extend": "~1.2.1",
"grunt": "~0.4.4",
"grunt-cli": "~0.1.13",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-jshint": "~0.9.2",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.11.0",
"grunt-contrib-requirejs": "~0.4.3",
"grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-jscs-checker": "~0.4.1",
"grunt-karma": "~0.8.2",
"grunt-sed": "~0.1.1",
"karma": "~0.12.1",
"karma-chrome-launcher": "~0.1.2",
"karma": "~0.12.9",
"karma-chrome-launcher": "~0.1.3",
"karma-coverage": "~0.2.1",
"karma-junit-reporter": "~0.2.1",
"karma-junit-reporter": "~0.2.2",
"karma-mocha": "~0.1.3",
"karma-phantomjs-launcher": "~0.1.2",
"karma-phantomjs-launcher": "~0.1.4",
"karma-requirejs": "~0.2.1",
"karma-sauce-launcher": "~0.2.4",
"karma-sauce-launcher": "~0.2.7",
"karma-script-launcher": "~0.1.0",
"lcov-result-merger": "~0.0.2",
"less": "~1.7.0",
Expand Down

1 comment on commit 1a20d40

@mister-roboto
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TESTS PASSED
Mr.Roboto url : http://jenkins.plone.org/roboto/get_info?push=71f5597aa6434485af0c9223d218484b
plone-5.0-python-2.7 [SUCCESS]

Please sign in to comment.