0616

EkoWang · Jun 16, 2015 · 8c49873 · 8c49873
1 parent e46f799
commit 8c49873
Show file tree

Hide file tree

Showing 242 changed files with 40,308 additions and 4,659 deletions.
diff --git a/Booklist.md b/Booklist.md
@@ -2,14 +2,14 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Booklist](#booklist)
+- [书单](#%E4%B9%A6%E5%8D%95)
   - [HTML](#html)
   - [CSS](#css)
   - [JavaScript](#javascript)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-# Booklist
+# 书单
 
 ## HTML
 

diff --git a/DO_NOT_OPEN/Quiz0.html b/DO_NOT_OPEN/Quiz0.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title>图书畅销榜</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <style type="text/css" media="screen">
+    body {
+        margin: 30px;
+    }
+
+    h3 {
+      margin-bottom: 0;
+    }
+
+    ol {
+        border-top: 3px solid rgba(224, 224, 224, 1);
+        padding-left: 20px;
+    }
+
+    ol li {
+      border-bottom: 1px dashed rgba(224, 224, 224, 1);
+      padding: 10px 0;
+    }
+
+    ol li:nth-child(-n+3) > a {
+      color: RED;
+    }
+
+    ol li a {
+        text-decoration: none;
+        color: BLACK;
+        margin: 10px 0;
+    }
+
+    ol li a:hover {
+        color: ORANGE;
+    }
+    </style>
+</head>
+
+<body>
+    <div class="booklist">
+        <h3>图书畅销榜</h3>
+        <ol>
+            <li><a href="#" title="当我足够好，才能遇见你">当我足够好，才能遇见你</a></li>
+            <li><a href="#" title="皮囊">皮囊</a></li>
+            <li><a href="#" title="李光耀论中国与世界">李光耀论中国与世界</a></li>
+            <li><a href="#" title="乖，摸摸头">乖，摸摸头</a></li>
+            <li><a href="#" title="男女内参">男女内参</a></li>
+        </ol>
+    </div>
+</body>
+
+</html>
diff --git a/DO_NOT_OPEN/Quiz1.html b/DO_NOT_OPEN/Quiz1.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>运费详情</title>
+  <style type="text/css" media="screen">
+    body {
+      margin: 30px;
+    }
+  </style>
+</head>
+<body>
+  <table>
+    <caption>运费详情</caption>
+    <thead>
+      <tr>
+        <th>地域</th>
+        <th>寄达地</th>
+        <th>首重（元/1000g）</th>
+        <th>续重（元/1000g）</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="2">一区</td>
+        <td>浙江、上海、江苏</td>
+        <td>6</td>
+        <td>1</td>
+      </tr>
+      <tr>
+        <td>江西、安徽</td>
+        <td>7</td>
+        <td>1</td>
+      </tr>
+      <tr>
+        <td>二区</td>
+        <td>吉利、黑龙江、云南</td>
+        <td>10</td>
+        <td>6</td>
+      </tr>
+      <tr>
+        <td>三区</td>
+        <td>新疆、西藏</td>
+        <td>15</td>
+        <td>10</td>
+      </tr>
+    </tbody>
+  </table>
+</body>
+</html>
diff --git a/DO_NOT_OPEN/Quiz3.html b/DO_NOT_OPEN/Quiz3.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>表单</title>
+  <style type="text/css" media="screen">
+    body {
+      margin: 30px;
+    }
+  </style>
+</head>
+<body>
+  <form action="/" method="get" accept-charset="utf-8">
+    <div>
+      <label for="avatar">头像</label>
+      <input type="file" name="avatar" id="avatar">
+    </div>
+    <div>
+      <label for="user-name">昵称</label>
+      <input type="text" name="user-name" id="user-name">
+    </div>
+    <div>
+      <label for="education">学历</label>
+      <select name="education" id="education">
+        <option value="0">专科</option>
+        <option value="1">本科</option>
+      </select>
+    </div>
+    <div>
+      <label for="gender">性别</label>
+      <input type="radio" name="gender" id="gender-male" value="male">
+      <label for="gender-male">Male</label>
+      <input type="radio" name="gender" id="gender-female" value="female">
+      <label for="gender-female">Female</label>
+    </div>
+    <div>
+      <label for="interests">爱好</label>
+      <label><input type="checkbox" name="interests" value="interests-movie">电影</label>
+      <label><input type="checkbox" name="interests" value="interests-photo">摄影</label>
+      <label><input type="checkbox" name="interests" value="interests-music">音乐</label>
+      <label><input type="checkbox" name="interests" value="interests- reading">阅读</label>
+    </div>
+    <div>
+      <label for="note">签名</label>
+      <textarea name="note" id="note"></textarea>
+    </div>
+    <button type="submit">保存</button>
+  </form>
+</body>
+</html>
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Li Xinyang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Progress.md b/Progress.md
@@ -2,40 +2,12 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 - [Javascript程序设计 20/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-2023)
-=======
-<<<<<<< HEAD
->>>>>>> li-xinyang/master
-- [Javascript程序设计 16/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-1623)
-=======
-- [Javascript程序设计 20/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-2023)
->>>>>>> li-xinyang/master
-<<<<<<< HEAD
-=======
->>>>>>> Note
->>>>>>> li-xinyang/master
 - [页面制作 39/41](#%E9%A1%B5%E9%9D%A2%E5%88%B6%E4%BD%9C-3941)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-# Javascript程序设计 20/23
-=======
-<<<<<<< HEAD
->>>>>>> li-xinyang/master
-# Javascript程序设计 16/23
-=======
 # Javascript程序设计 20/23
->>>>>>> li-xinyang/master
-<<<<<<< HEAD
-=======
->>>>>>> Note
->>>>>>> li-xinyang/master
 
 |章节|课题|状态|时间戳|
 |----|----|----|------|
@@ -61,7 +33,7 @@
 |闭包|闭包|★|1506091529|
 |面向对象|简介|||
 |面向对象|原型|||
-|面向对象|JS面向对象|||
+|面向对象|JS面向对象||||
 
 # 页面制作 39/41
 

diff --git a/README.md b/README.md
@@ -1,62 +1,32 @@
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+# 前端开发笔记本
 
-- [知识体系内容记录](#%E7%9F%A5%E8%AF%86%E4%BD%93%E7%B3%BB%E5%86%85%E5%AE%B9%E8%AE%B0%E5%BD%95)
-  - [Javascript 程序设计](#javascript-%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1)
-  - [页面制作](#%E9%A1%B5%E9%9D%A2%E5%88%B6%E4%BD%9C)
-  - [DOM 编程](#dom-%E7%BC%96%E7%A8%8B)
-  - [页面架构](#%E9%A1%B5%E9%9D%A2%E6%9E%B6%E6%9E%84)
-  - [产品前端架构](#%E4%BA%A7%E5%93%81%E5%89%8D%E7%AB%AF%E6%9E%B6%E6%9E%84)
-- [相关资源](#%E7%9B%B8%E5%85%B3%E8%B5%84%E6%BA%90)
-- [相关链接](#%E7%9B%B8%E5%85%B3%E9%93%BE%E6%8E%A5)
+点击[这里](https://www.gitbook.com/read/book/li-xinyang/frontend-notebook)开始阅读！
 
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+前端开发笔记本的 GitHub 地址在[这里](https://github.com/li-xinyang/FEND_Note)。如果你觉得这个项目不错，请点击 Star 一下，您的支持是我最大的动力。
 
-## 知识体系内容记录
+<!-- Place this tag where you want the button to render. -->
+<a class="github-button" href="https://github.com/li-xinyang/FEND_Note" data-style="mega" data-count-href="/li-xinyang/FEND_Note/stargazers" data-count-api="/repos/li-xinyang/FEND_Note#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star li-xinyang/FEND_Note on GitHub">Star</a>
+&nbsp;&nbsp;<a class="github-button" href="https://github.com/li-xinyang/FEND_Note" data-style="mega" data-count-href="/li-xinyang/FEND_Note/watchers" data-count-api="/repos/li-xinyang/FEND_Note#subscribers_count" data-count-aria-label="# watchers on GitHub" aria-label="Watch li-xinyang/FEND_Note on GitHub">Watch</a>
+&nbsp;&nbsp;<a class="github-button" href="https://github.com/li-xinyang/FEND_Note/fork" data-style="mega" data-count-href="/li-xinyang/FEND_Note/network" data-count-api="/repos/li-xinyang/FEND_Note#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork li-xinyang/FEND_Note on GitHub">Fork</a>
+&nbsp;&nbsp;<a class="github-button" href="https://github.com/li-xinyang/FEND_Note/archive/master.zip" data-style="mega" aria-label="Download li-xinyang/FEND_Note on GitHub">Download</a>
 
 ![](img/C/career-path.jpg)
 
-### Javascript 程序设计
+### 写作进程
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-![](http://progressed.io/bar/87?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
-=======
-<<<<<<< HEAD
->>>>>>> li-xinyang/master
-![](http://progressed.io/bar/70?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
-=======
-![](http://progressed.io/bar/87?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
->>>>>>> li-xinyang/master
-<<<<<<< HEAD
-=======
->>>>>>> Note
->>>>>>> li-xinyang/master
+|章节|名称|进程|
+|----|----|----|
+|第一章|页面制作|![](http://progressed.io/bar/100)|
+|第二章|JavaScript 程序设计|![](http://progressed.io/bar/87)|
+|第三章|DOM 编程|![](http://progressed.io/bar/0)|
+|第四章|页面构架|![](http://progressed.io/bar/0)|
+|第五章|前端产品构架|![](http://progressed.io/bar/0)|
 
-### 页面制作
-
-![](http://progressed.io/bar/100?title=Progress) [详情](WebCreation/WebCreation.md)
-
-### DOM 编程
-
-![](http://progressed.io/bar/0?title=Progress) [详情](#)
-
-### 页面架构
-
-![](http://progressed.io/bar/0?title=Progress) [详情](#)
-
-### 产品前端架构
-
-![](http://progressed.io/bar/0?title=Progress) [详情](#)
-
-## 相关资源
-
-- [书单](Booklist.md)
-
-## 相关链接
+### 相关链接
 
 - [NEC](http://nec.netease.com/) {N: nice, E: easy, C: css;}
 
-<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png" /></a><br />This work by <a xmlns:cc="http://creativecommons.org/ns#" href="li-xinyang.com" property="cc:attributionName" rel="cc:attributionURL">Li Xinyang</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png" /></a><br />This work by <a xmlns:cc="http://creativecommons.org/ns#" href="li-xinyang.com" property="cc:attributionName" rel="cc:attributionURL">Li Xinyang</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+
+<!-- Place this tag right after the last button or just before your close body tag. -->
+<script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
diff --git a/SUMMARY.md b/SUMMARY.md
@@ -0,0 +1,41 @@
+# Summary
+
+- [页面制作](chapter1/00_intro.md)
+  - [Photoshop](chapter1/01_photoshop.md)
+    - [工具、面板、视图](chapter1/01_01_tool_panel_view.md)
+    - [测量及取色](chapter1/01_02_measurement_and_color.md)
+    - [切图](chapter1/01_03_slice.md)
+    - [图片保存](chapter1/01_04_save_image.md)
+    - [图片优化与合并](chapter1/01_05_image_optimisation.md)
+  - [开发及调试工具](chapter1/02_dev_tools.md)
+    - [Sublime 快捷键](chapter1/02_01_sublime.md)
+  - [HTML](chapter1/03_html.md)
+    - [HTML 简介](chapter1/03_01_html_intro.md)
+    - [HTML 语法](chapter1/03_02_html_sytax.md)
+    - [HTML 标签](chapter1/03_05_html_tags.md)
+    - [实体字符](chapter1/03_03_html_ascii_encoding.md)
+    - [浏览器兼容](chapter1/03_04_cross_browser.md)
+  - [CSS](chapter1/04_css_intro.md)
+    - [语法](chapter1/04_01_css_sytax.md)
+    - [选择器](chapter1/04_02_selector.md)
+    - [文本](chapter1/04_03_text.md)
+    - [盒模型](chapter1/04_04_box_model.md)
+    - [背景](chapter1/04_05_background.md)
+    - [布局](chapter1/04_06_layout.md)
+    - [变形](chapter1/04_07_transform.md)
+    - [动画](chapter1/04_08_animation.md)
+- [JavaScript 程序设计](chapter2/00_intro.md)
+  - [JavaScript 介绍](chapter2/01_javascript_intro.md)
+  - [调试器](chapter2/02_dev_tools.md)
+  - [基础语法](chapter2/03_basic_syntax.md)
+  - [类型系统](chapter2/04_data_type.md)
+  - [内置对象](chapter2/05_internal_object.md)
+  - [变量作用域](chapter2/06_scope.md)
+  - [表达式与运算符号](chapter2/07_statement_and_operator.md)
+  - [语句](chapter2/08_statement.md)
+  - [闭包](chapter2/09_closure.md)
+  - [面向对象](chapter2/10_object.md)
+- [DOM 编程]()
+- [页面架构]()
+- [产品前端架构]()
+- [附录 A：书单](Booklist.md)