Skip to content

add gitattributes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjixiang merged 2 commits into from
Aug 8, 2016
Merged

add gitattributes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e5ab6
add gitattributes
mjixiang Aug 8, 2016
0c15502
modify index.html
mjixiang Aug 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.js linguist-language=Vue
*.css linguist-language=Vue
*.html linguist-language=Vue
41 changes: 20 additions & 21 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,6 @@
.xa-bg-black-click:hover{background-color:#333;}
.xa-click:hover{background:#f2f2f2;}
</style>
</head>
<body>
<div id="app">
<button @click="dialog.show = true">显示弹框</button>
<dialog :show.sync="dialog.show" :title="dialog.title" :buttons="dialog.buttons">
<div style="min-height:500px;width:800px;">
<div style="text-align:center;padding:50px 0;">
<strong>点下面自定义按钮窗口切换主题</strong>
<p>弹框正文内容</p>
</div>
</div>
</dialog>
</div>

<script src="vue.min.js"></script>
<script>
Expand Down Expand Up @@ -133,14 +120,19 @@
})
//注册全局组件开始
</script>

<!-- 注释开始 -->
<br><br><br><br>
<div style="border-left:5px solid #987654;background:#eee;padding:8px 15px;line-height:40px;">
<div style="color:red;">注：该示例用了部分es6代码，请用较新版本的chrome打开,否则无法正常工作</div>
<div><a href="https://github.com/mjixiang/vue-dialog/blob/master/dialog.vue">dialog.vue</a>为项目中使用组件，本示例为了简化操作将其代码融入index.html</div>
</head>
<body>
<div id="app">
<button @click="dialog.show = true">显示弹框</button>
<dialog :show.sync="dialog.show" :title="dialog.title" :buttons="dialog.buttons">
<div style="min-height:450px;width:800px;">
<div style="text-align:center;padding:50px 0;">
<strong>点下面自定义按钮窗口切换主题</strong>
<p>弹框正文内容</p>
</div>
</div>
</dialog>
</div>
<!-- 注释结束 -->
<script>
//示例js
var buttons = [
Expand Down Expand Up @@ -207,7 +199,14 @@
}
}
});

</script>

<!-- 注解开始 -->
<br><br><br><br>
<div style="border-left:5px solid #987654;background:#eee;padding:8px 15px;line-height:40px;">
<div style="color:red;">注：该示例用了部分es6代码，请用较新版本的chrome或火狐打开,否则无法正常工作</div>
<div><a href="https://github.com/mjixiang/vue-dialog/blob/master/dialog.vue">dialog.vue</a>为项目中使用组件，本示例为了简化操作将其代码融入index.html</div>
</div>
<!-- 注解结束 -->
</body>
</html>