Skip to content

M
mui
Commit 71de472e authored by fxy060608's avatar fxy060608
Browse files
Options

Merge branch 'gh-pages' of https://github.com/dcloudio/mui into gh-pages 

Conflicts:
	about/index.html
	components/index.html
	getting-started-old/index.html
	getting-started/index.html
	index.html
	javascript-old/index.html
	javascript/index.html
	sitemap.xml
parents cc53bbda d7a76149
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 0 deletions
about/index.html
View file @ 71de472e
......@@ -10,8 +10,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-13 19:37:35 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-13 19:37:35 +0800">
=======
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-11 14:42:27 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-11 14:42:27 +0800">
>>>>>>> FETCH_HEAD
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
......@@ -144,8 +149,13 @@
</ul>
</div>
<script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
<<<<<<< HEAD
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-13 19:37:35 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-13 19:37:35 +0800"></script>
=======
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-11 14:42:27 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-11 14:42:27 +0800"></script>
>>>>>>> FETCH_HEAD
</div>
</div>
......
components/index.html
View file @ 71de472e
......@@ -10,8 +10,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-13 19:37:35 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-13 19:37:35 +0800">
=======
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-11 14:42:27 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-11 14:42:27 +0800">
>>>>>>> FETCH_HEAD
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
......@@ -3607,8 +3612,13 @@
</ul>
</div>
<script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
<<<<<<< HEAD
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-13 19:37:35 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-13 19:37:35 +0800"></script>
=======
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-11 14:42:27 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-11 14:42:27 +0800"></script>
>>>>>>> FETCH_HEAD
</div>
</div>
......
getting-started-old/index.html
View file @ 71de472e
......@@ -10,8 +10,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-13 19:37:35 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-13 19:37:35 +0800">
=======
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-11 14:42:27 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-11 14:42:27 +0800">
>>>>>>> FETCH_HEAD
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
......@@ -252,8 +257,13 @@ Copy any changes made here over to the README too. -->
</ul>
</div>
<script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
<<<<<<< HEAD
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-13 19:37:35 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-13 19:37:35 +0800"></script>
=======
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-11 14:42:27 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-11 14:42:27 +0800"></script>
>>>>>>> FETCH_HEAD
</div>
</div>
......
getting-started/index.html
View file @ 71de472e
......@@ -10,8 +10,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-13 19:37:35 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-13 19:37:35 +0800">
=======
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-11 14:42:27 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-11 14:42:27 +0800">
>>>>>>> FETCH_HEAD
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
......@@ -138,8 +143,13 @@
</ul>
</div>
<script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
<<<<<<< HEAD
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-13 19:37:35 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-13 19:37:35 +0800"></script>
=======
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-11 14:42:27 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-11 14:42:27 +0800"></script>
>>>>>>> FETCH_HEAD
</div>
</div>
......
index.html
View file @ 71de472e
......@@ -10,8 +10,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-13 19:37:35 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-13 19:37:35 +0800">
=======
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-11 14:42:27 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-11 14:42:27 +0800">
>>>>>>> FETCH_HEAD
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
......@@ -72,8 +77,13 @@
</ul>
</div>
<script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
<<<<<<< HEAD
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-13 19:37:35 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-13 19:37:35 +0800"></script>
=======
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-11 14:42:27 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-11 14:42:27 +0800"></script>
>>>>>>> FETCH_HEAD
</div>
</div>
......
javascript-old/index.html
View file @ 71de472e
......@@ -10,8 +10,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-13 19:37:35 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-13 19:37:35 +0800">
=======
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-11 14:42:27 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-11 14:42:27 +0800">
>>>>>>> FETCH_HEAD
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
......@@ -127,8 +132,13 @@
</ul>
</div>
<script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
<<<<<<< HEAD
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-13 19:37:35 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-13 19:37:35 +0800"></script>
=======
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-11 14:42:27 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-11 14:42:27 +0800"></script>
>>>>>>> FETCH_HEAD
</div>
</div>
......
javascript/index.html
View file @ 71de472e
......@@ -10,8 +10,13 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-13 19:37:35 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-13 19:37:35 +0800">
=======
<link rel="stylesheet" href="http://dcloudio.github.io/mui/dist/css/mui.min.css?v=2014-09-12 17:26:05 +0800">
<link rel="stylesheet" href="http://dcloudio.github.io/mui/assets/css/docs.css?v=2014-09-12 17:26:05 +0800">
>>>>>>> FETCH_HEAD
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://dcloudio.github.io/mui/assets/img/apple-touch-icon-114x114.png">
......@@ -578,8 +583,13 @@ mui的解决思路是：单webview只承载单个页面的dom，减少dom层级
</ul>
</div>
<script src="http://dcloudio.github.io/mui/dist/js/jquery-2.1.1.js"></script>
<<<<<<< HEAD
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-13 19:37:35 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-13 19:37:35 +0800"></script>
=======
<script src="http://dcloudio.github.io/mui/dist/js/mui.min.js?v=2014-09-12 17:26:05 +0800"></script>
<script src="http://dcloudio.github.io/mui/assets/js/docs.min.js?v=2014-09-12 17:26:05 +0800"></script>
>>>>>>> FETCH_HEAD
</div>
</div>
......
sitemap.xml
View file @ 71de472e
......@@ -2,7 +2,11 @@
<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>http://dcloudio.github.io/mui/</loc>
<<<<<<< HEAD
<lastmod>2014-09-13T19:37:35+08:00</lastmod>
=======
<lastmod>2014-09-12T17:26:05+08:00</lastmod>
>>>>>>> FETCH_HEAD
<changefreq>daily</changefreq>
<priority>1.0</priority>
</url>
......@@ -10,7 +14,11 @@
<url>
<loc>http://dcloudio.github.io/mui/about/</loc>
<<<<<<< HEAD
<lastmod>2014-09-13T19:37:35+08:00</lastmod>
=======
<lastmod>2014-09-12T17:26:05+08:00</lastmod>
>>>>>>> FETCH_HEAD
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
......@@ -19,7 +27,11 @@
<url>
<loc>http://dcloudio.github.io/mui/components/</loc>
<<<<<<< HEAD
<lastmod>2014-09-13T19:37:35+08:00</lastmod>
=======
<lastmod>2014-09-12T17:26:05+08:00</lastmod>
>>>>>>> FETCH_HEAD
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
......@@ -28,7 +40,11 @@
<url>
<loc>http://dcloudio.github.io/mui/getting-started-old/</loc>
<<<<<<< HEAD
<lastmod>2014-09-13T19:37:35+08:00</lastmod>
=======
<lastmod>2014-09-12T17:26:05+08:00</lastmod>
>>>>>>> FETCH_HEAD
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
......@@ -37,7 +53,11 @@
<url>
<loc>http://dcloudio.github.io/mui/getting-started/</loc>
<<<<<<< HEAD
<lastmod>2014-09-13T19:37:35+08:00</lastmod>
=======
<lastmod>2014-09-12T17:26:05+08:00</lastmod>
>>>>>>> FETCH_HEAD
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
......@@ -48,7 +68,11 @@
<url>
<loc>http://dcloudio.github.io/mui/javascript-old/</loc>
<<<<<<< HEAD
<lastmod>2014-09-13T19:37:35+08:00</lastmod>
=======
<lastmod>2014-09-12T17:26:05+08:00</lastmod>
>>>>>>> FETCH_HEAD
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
......@@ -57,7 +81,11 @@
<url>
<loc>http://dcloudio.github.io/mui/javascript/</loc>
<<<<<<< HEAD
<lastmod>2014-09-13T19:37:35+08:00</lastmod>
=======
<lastmod>2014-09-12T17:26:05+08:00</lastmod>
>>>>>>> FETCH_HEAD
<changefreq>weekly</changefreq>
<priority>0.7</priority>
</url>
......
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