Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
youknowznm committed Oct 8, 2016
1 parent 3c080d7 commit 54fb152
Show file tree
Hide file tree
Showing 23 changed files with 484 additions and 7,220 deletions.
4 changes: 4 additions & 0 deletions .babelrc
@@ -0,0 +1,4 @@
{
"presets": ["es2015", "stage-0"],
"plugins": ["transform-runtime"]
}
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
# vue-memo
# z-memo

> A Vue.js project
Expand Down
Empty file removed dist/.gitkeep
Empty file.
134 changes: 5 additions & 129 deletions index.html
Expand Up @@ -5,136 +5,12 @@
<title>vue-memo</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href='src/style/main.css'>
</head>
<body>
<div class="cover-layer"></div>

<div id="app">
<div id="vue-memo">

<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand">vue-memo</a>
</div>
<ul class="nav navbar-nav">
<li class="add dropdown">
<a href="#" class="create-new dropdown-toggle" data-toggle="dropdown" role="li">新建</a>
<ul class="dropdown-menu">
<li class="add-text">
<a href="#">
文本
</a>
</li>
<li class="add-doodle">
<a href="#">
涂鸦
</a>
</li>
</ul>
</li>
</ul>
<form class="navbar-form navbar-right">
<input type="text" class="search-box form-control" placeholder="搜索">
</form>
<ul class="nav navbar-nav navbar-right">
<li class="categories dropdown">
<a href="#" class="current-category dropdown-toggle" data-toggle="dropdown" role="li">
分类<span class="count badge">14</span>
</a>
<ul class="dropdown-menu">
<li class="total">
<a href="#">
全部<span class="count badge">14</span>
</a>
</li>
<li role="separator" class="divider"></li>
<li class="category">
<a href="#">
工作<span class="count badge">14</span>
</a>
</li>
<li class="category">
<a href="#">
生活<span class="count badge">14</span>
</a>
</li>
<li class="category">
<a href="#">
学习<span class="count badge">14</span>
</a>
</li>
<li role="separator" class="divider"></li>
<li class="category"><a href="#">新增分类</a></li>
</ul>
</li>
</ul>
</div>
</nav>

<div class="memos">

<div class="memo-container">
<div class="memo">
<div class="mark"></div>
<ul class="tools">
<li class="edit"></li>
<li class="delete"></li>
</ul>
<h5 class="title">标题标题标题标题标题标题标题标题标题标题标题</h5>
<div class="content text">
<p>Screen readers will have trouble with your forms if you don't include a label for every input. For these inline forms, you can hide the labels using the .sr-only class. There are further alternative methods of providing a label for assistive technologies, such as the aria-label, aria-labelledby or title attribute. If none of these is present, screen readers may resort to using the placeholder attribute, if present, but note that use of placeholder as a replacement fo</p>
</div>
</div>
</div>




</div>
</div>

<!-- <div id="editor-text" class="editor-layer">
<div class="editor-top">
<input id="editor-title" type="text" class="editor-title form-control" placeholder="标题">
<ul class="tools">
<li class="save"></li>
<li class="cancel"></li>
</ul>
</div>
<textarea id="editor-text-content" class="form-control" placeholder="内容"></textarea>
</div> -->

<div id="editor-doodle" class="editor-layer">
<div class="editor-top">
<input id="editor-title" type="text" class="form-control" placeholder="标题"></input>
<ul class="tools">
<li class="save"></li>
<li class="cancel"></li>
</ul>
</div>
<div id="canvas-wrapper">
<ul class="colors">
<li data-color="black"></li>
<li data-color="green"></li>
<li data-color="yellow"></li>
<li data-color="red"></li>
<li data-color="white"></li>
</ul>
<ul class="controllers">
<li class="undo"></li>
<li class="redo"></li>
<li class="clear"></li>
</ul>
<canvas id="editor-doodle-content" width='298' height=298></canvas>
</div>
</div>

</div>
<script src="http://code.jquery.com/jquery-3.1.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="src/main.js"></script>
<script src="dist/build.js"></script>
<!-- <div class="cover-layer"></div> -->
<div id="vue-memo"></div>
<!-- <script src="http://code.jquery.com/jquery-3.1.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/bootstrap/3.3.7/js/bootstrap.min.js"></script> -->
<!-- <script src="dist/build.js"></script> -->
</body>
</html>
3 changes: 2 additions & 1 deletion package.json
@@ -1,5 +1,5 @@
{
"name": "z-memo",
"name": "vue-memo",
"description": "A Vue.js project",
"author": "youknowznm <znm_92@163.com>",
"scripts": {
Expand All @@ -21,6 +21,7 @@
"envify": "^3.4.1",
"http-server": "^0.9.0",
"npm-run-all": "^2.1.2",
"stylus": "^0.54.5",
"uglify-js": "^2.5.0",
"vueify": "^9.1.0",
"watchify": "^3.4.0"
Expand Down

0 comments on commit 54fb152

Please sign in to comment.