Skip to content

Commit

Permalink
Merge pull request #9 from brunobord/9-local-lepture-editor
Browse files Browse the repository at this point in the history
CORS blocked, not working on FF.
  • Loading branch information
brunobord committed Jul 12, 2014
2 parents 4cf69ec + b94f29d commit 04798b0
Show file tree
Hide file tree
Showing 6 changed files with 425 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ minify_css:
uglifycss --ugly-comments vendor/css/meteo/stylesheet.css > vendor/css/meteo/stylesheet.min.css
uglifycss --ugly-comments vendor/css/fontello/fontello.css > vendor/css/fontello/fontello.min.css
uglifycss --ugly-comments vendor/css/glyphicons.css > vendor/css/glyphicons.min.css
uglifycss --ugly-comments vendor/css/editor.css > vendor/css/editor.min.css
uglifycss --ugly-comments static/css/style.css > static/css/style.min.css
uglifycss --ugly-comments static/css/preview.css > static/css/preview.min.css

Expand Down
2 changes: 1 addition & 1 deletion index-dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" href="vendor/css/meteo/stylesheet.css" type="text/css">
<link rel="stylesheet" href="vendor/css/fontello/fontello.css" type="text/css">
<link rel="stylesheet" href="vendor/css/glyphicons.css" type="text/css">
<link rel="stylesheet" href="http://lab.lepture.com/editor/editor.css" />
<link rel="stylesheet" href="vendor/css/editor.css" />
<link rel="stylesheet" href="static/css/fitgrd.pack.css" type="text/css">
<link rel="stylesheet" href="static/css/style.css" type="text/css">
<link rel="stylesheet" href="static/css/preview.css" type="text/css">
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" href="vendor/css/meteo/stylesheet.min.css" type="text/css">
<link rel="stylesheet" href="vendor/css/fontello/fontello.min.css" type="text/css">
<link rel="stylesheet" href="vendor/css/glyphicons.min.css" type="text/css">
<link rel="stylesheet" href="http://lab.lepture.com/editor/editor.css" />
<link rel="stylesheet" href="vendor/css/editor.min.css" />
<link rel="stylesheet" href="static/css/fitgrd.pack.css" type="text/css">
<link rel="stylesheet" href="static/css/style.min.css" type="text/css">
<link rel="stylesheet" href="static/css/preview.min.css" type="text/css">
Expand Down
Empty file added static/css/editor.min.css
Empty file.
Loading

0 comments on commit 04798b0

Please sign in to comment.