Commit dfcf899e authored by techird's avatar techird

merge from dev

parents db78250c 8e903a19
git stash
git checkout gh-pages
git merge dev -m "merge from dev"
grunt
git commit -am "publish"
git push origin gh-pages
git checkout dev
git stash pop
...@@ -5,7 +5,7 @@ html, body, div { ...@@ -5,7 +5,7 @@ html, body, div {
} }
html, body, #kity-minder, div.kmui-editor-body { html, body, #kity-minder, div.kmui-editor-body {
height: 100%; height: 100%;
width: 100% width: 100%;
overflow: hidden; overflow: hidden;
-moz-user-select: none; -moz-user-select: none;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment