Permalink
Browse files

Cleaned up all and upgraded some NPM modules

  • Loading branch information...
p3k committed Apr 17, 2015
1 parent cd9b084 commit 40519bc0ea9975b0f501a680371f95c57039867e
Showing with 512 additions and 44 deletions.
  1. +2 −3 build/client/editor.js
  2. +5 −5 package.json
  3. +14 −12 static/scripts/editor.min.js
  4. +485 −18 static/scripts/main.min.js
  5. +1 −1 static/styles/editor.min.css
  6. +5 −5 static/styles/main.min.css
View
@@ -1,11 +1,10 @@
window.CodeMirror = require('codemirror/lib/codemirror');
require('codemirror/mode/css/css');
require('codemirror/mode/javascript/javascript');
require('codemirror/mode/xml/xml');
require('codemirror/mode/gfm/gfm');
require('codemirror/mode/htmlmixed/htmlmixed');
require('codemirror/mode/javascript/javascript');
require('codemirror/mode/markdown/markdown');
require('codemirror/mode/xml/xml');
require('codemirror/mode/gfm/gfm');
require('./cm-skin-mode');
window.marked = require('marked/lib/marked');
View
@@ -18,19 +18,19 @@
"author": "The Ant Queens",
"license": "Apache 2",
"napa": {
"uikit-bower": "uikit/bower-uikit#2.17.0",
"uikit-bower": "uikit/bower-uikit#2.18.0",
"jquery-collagePlus": "ed-lea/jquery-collageplus#0.3.3"
},
"browserify-css": {
"minify": true
},
"devDependencies": {
"JSON": "^1.0.0",
"browserify": "^8.0.2",
"codemirror": "^4.10.0",
"codemirror": "^5.1.0",
"jquery": "^2.1.3",
"js-md5": "^0.1.3",
"JSON": "^1.0.0",
"less": "git://github.com/less/less.js#v1.7.5",
"js-md5": "^0.3.0",
"less": "=1.7.5",
"marked": "^0.3.3",
"minifyify": "^6.1.0",
"napa": "^1.1.0",

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1,4 +1,4 @@
/*! UIkit 2.17.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.18.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Base
========================================================================== */
@@ -1167,9 +1167,9 @@ iframe {
clear: both;
}
/*
* Remove margin from the last-child if not `uk-widget-title`
* Remove margin from the last-child
*/
.uk-panel > :not(.uk-panel-title):last-child {
.uk-panel > :last-child {
margin-bottom: 0;
}
/* Sub-object: `uk-panel-title`
@@ -8002,7 +8002,7 @@ a.uk-thumbnail:focus {
page-break-after: avoid;
}
}
/*! UIkit 2.17.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.18.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Form password
========================================================================== */
@@ -8036,7 +8036,7 @@ a.uk-thumbnail:focus {
.uk-form-password > input {
padding-right: 50px !important;
}
/*! UIkit 2.17.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.18.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Tooltip
========================================================================== */

0 comments on commit 40519bc

Please sign in to comment.