From c59fec7f2442e974d24b585fa8691020b401c200 Mon Sep 17 00:00:00 2001 From: magicII <83399130@qq.com> Date: Mon, 31 Aug 2015 11:44:14 +0800 Subject: [PATCH 1/9] Replace master branch with page content via GitHub --- index.html | 53 +++++ params.json | 1 + stylesheets/github-light.css | 116 ++++++++++ stylesheets/normalize.css | 424 +++++++++++++++++++++++++++++++++++ stylesheets/stylesheet.css | 245 ++++++++++++++++++++ 5 files changed, 839 insertions(+) create mode 100644 index.html create mode 100644 params.json create mode 100644 stylesheets/github-light.css create mode 100644 stylesheets/normalize.css create mode 100644 stylesheets/stylesheet.css diff --git a/index.html b/index.html new file mode 100644 index 0000000000..16cc0df5bb --- /dev/null +++ b/index.html @@ -0,0 +1,53 @@ + + + + + Magicii.GitHub.io by magicII + + + + + + + + + +
+

+Welcome to GitHub Pages.

+ +

This automatic page generator is the easiest way to create beautiful pages for all of your projects. Author your page content here using GitHub Flavored Markdown, select a template crafted by a designer, and publish. After your page is generated, you can check out the new gh-pages branch locally. If you’re using GitHub Desktop, simply sync your repository and you’ll see the new branch.

+ +

+Designer Templates

+ +

We’ve crafted some handsome templates for you to use. Go ahead and click 'Continue to layouts' to browse through them. You can easily go back to edit your page before publishing. After publishing your page, you can revisit the page generator and switch to another theme. Your Page content will be preserved.

+ +

+Creating pages manually

+ +

If you prefer to not use the automatic generator, push a branch named gh-pages to your repository to create a page manually. In addition to supporting regular HTML content, GitHub Pages support Jekyll, a simple, blog aware static site generator. Jekyll makes it easy to create site-wide headers and footers without having to copy them across every page. It also offers intelligent blog support and other advanced templating features.

+ +

+Authors and Contributors

+ +

You can @mention a GitHub username to generate a link to their profile. The resulting <a> element will link to the contributor’s GitHub Profile. For example: In 2007, Chris Wanstrath (@defunkt), PJ Hyett (@pjhyett), and Tom Preston-Werner (@mojombo) founded GitHub.

+ +

+Support or Contact

+ +

Having trouble with Pages? Check out our documentation or contact support and we’ll help you sort it out.

+ + + +
+ + + + diff --git a/params.json b/params.json new file mode 100644 index 0000000000..3d6f67aaa4 --- /dev/null +++ b/params.json @@ -0,0 +1 @@ +{"name":"Magicii.GitHub.io","tagline":"My Blog. ","body":"### Welcome to GitHub Pages.\r\nThis automatic page generator is the easiest way to create beautiful pages for all of your projects. Author your page content here [using GitHub Flavored Markdown](https://guides.github.com/features/mastering-markdown/), select a template crafted by a designer, and publish. After your page is generated, you can check out the new `gh-pages` branch locally. If you’re using GitHub Desktop, simply sync your repository and you’ll see the new branch.\r\n\r\n### Designer Templates\r\nWe’ve crafted some handsome templates for you to use. Go ahead and click 'Continue to layouts' to browse through them. You can easily go back to edit your page before publishing. After publishing your page, you can revisit the page generator and switch to another theme. Your Page content will be preserved.\r\n\r\n### Creating pages manually\r\nIf you prefer to not use the automatic generator, push a branch named `gh-pages` to your repository to create a page manually. In addition to supporting regular HTML content, GitHub Pages support Jekyll, a simple, blog aware static site generator. Jekyll makes it easy to create site-wide headers and footers without having to copy them across every page. It also offers intelligent blog support and other advanced templating features.\r\n\r\n### Authors and Contributors\r\nYou can @mention a GitHub username to generate a link to their profile. The resulting `` element will link to the contributor’s GitHub Profile. For example: In 2007, Chris Wanstrath (@defunkt), PJ Hyett (@pjhyett), and Tom Preston-Werner (@mojombo) founded GitHub.\r\n\r\n### Support or Contact\r\nHaving trouble with Pages? Check out our [documentation](https://help.github.com/pages) or [contact support](https://github.com/contact) and we’ll help you sort it out.\r\n","google":"","note":"Don't delete this file! It's used internally to help with page regeneration."} \ No newline at end of file diff --git a/stylesheets/github-light.css b/stylesheets/github-light.css new file mode 100644 index 0000000000..872a6f4b27 --- /dev/null +++ b/stylesheets/github-light.css @@ -0,0 +1,116 @@ +/* + Copyright 2014 GitHub Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ + +.pl-c /* comment */ { + color: #969896; +} + +.pl-c1 /* constant, markup.raw, meta.diff.header, meta.module-reference, meta.property-name, support, support.constant, support.variable, variable.other.constant */, +.pl-s .pl-v /* string variable */ { + color: #0086b3; +} + +.pl-e /* entity */, +.pl-en /* entity.name */ { + color: #795da3; +} + +.pl-s .pl-s1 /* string source */, +.pl-smi /* storage.modifier.import, storage.modifier.package, storage.type.java, variable.other, variable.parameter.function */ { + color: #333; +} + +.pl-ent /* entity.name.tag */ { + color: #63a35c; +} + +.pl-k /* keyword, storage, storage.type */ { + color: #a71d5d; +} + +.pl-pds /* punctuation.definition.string, string.regexp.character-class */, +.pl-s /* string */, +.pl-s .pl-pse .pl-s1 /* string punctuation.section.embedded source */, +.pl-sr /* string.regexp */, +.pl-sr .pl-cce /* string.regexp constant.character.escape */, +.pl-sr .pl-sra /* string.regexp string.regexp.arbitrary-repitition */, +.pl-sr .pl-sre /* string.regexp source.ruby.embedded */ { + color: #183691; +} + +.pl-v /* variable */ { + color: #ed6a43; +} + +.pl-id /* invalid.deprecated */ { + color: #b52a1d; +} + +.pl-ii /* invalid.illegal */ { + background-color: #b52a1d; + color: #f8f8f8; +} + +.pl-sr .pl-cce /* string.regexp constant.character.escape */ { + color: #63a35c; + font-weight: bold; +} + +.pl-ml /* markup.list */ { + color: #693a17; +} + +.pl-mh /* markup.heading */, +.pl-mh .pl-en /* markup.heading entity.name */, +.pl-ms /* meta.separator */ { + color: #1d3e81; + font-weight: bold; +} + +.pl-mq /* markup.quote */ { + color: #008080; +} + +.pl-mi /* markup.italic */ { + color: #333; + font-style: italic; +} + +.pl-mb /* markup.bold */ { + color: #333; + font-weight: bold; +} + +.pl-md /* markup.deleted, meta.diff.header.from-file */ { + background-color: #ffecec; + color: #bd2c00; +} + +.pl-mi1 /* markup.inserted, meta.diff.header.to-file */ { + background-color: #eaffea; + color: #55a532; +} + +.pl-mdr /* meta.diff.range */ { + color: #795da3; + font-weight: bold; +} + +.pl-mo /* meta.output */ { + color: #1d3e81; +} + diff --git a/stylesheets/normalize.css b/stylesheets/normalize.css new file mode 100644 index 0000000000..30366a6e98 --- /dev/null +++ b/stylesheets/normalize.css @@ -0,0 +1,424 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} diff --git a/stylesheets/stylesheet.css b/stylesheets/stylesheet.css new file mode 100644 index 0000000000..b5f20c235f --- /dev/null +++ b/stylesheets/stylesheet.css @@ -0,0 +1,245 @@ +* { + box-sizing: border-box; } + +body { + padding: 0; + margin: 0; + font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 16px; + line-height: 1.5; + color: #606c71; } + +a { + color: #1e6bb8; + text-decoration: none; } + a:hover { + text-decoration: underline; } + +.btn { + display: inline-block; + margin-bottom: 1rem; + color: rgba(255, 255, 255, 0.7); + background-color: rgba(255, 255, 255, 0.08); + border-color: rgba(255, 255, 255, 0.2); + border-style: solid; + border-width: 1px; + border-radius: 0.3rem; + transition: color 0.2s, background-color 0.2s, border-color 0.2s; } + .btn + .btn { + margin-left: 1rem; } + +.btn:hover { + color: rgba(255, 255, 255, 0.8); + text-decoration: none; + background-color: rgba(255, 255, 255, 0.2); + border-color: rgba(255, 255, 255, 0.3); } + +@media screen and (min-width: 64em) { + .btn { + padding: 0.75rem 1rem; } } + +@media screen and (min-width: 42em) and (max-width: 64em) { + .btn { + padding: 0.6rem 0.9rem; + font-size: 0.9rem; } } + +@media screen and (max-width: 42em) { + .btn { + display: block; + width: 100%; + padding: 0.75rem; + font-size: 0.9rem; } + .btn + .btn { + margin-top: 1rem; + margin-left: 0; } } + +.page-header { + color: #fff; + text-align: center; + background-color: #159957; + background-image: linear-gradient(120deg, #155799, #159957); } + +@media screen and (min-width: 64em) { + .page-header { + padding: 5rem 6rem; } } + +@media screen and (min-width: 42em) and (max-width: 64em) { + .page-header { + padding: 3rem 4rem; } } + +@media screen and (max-width: 42em) { + .page-header { + padding: 2rem 1rem; } } + +.project-name { + margin-top: 0; + margin-bottom: 0.1rem; } + +@media screen and (min-width: 64em) { + .project-name { + font-size: 3.25rem; } } + +@media screen and (min-width: 42em) and (max-width: 64em) { + .project-name { + font-size: 2.25rem; } } + +@media screen and (max-width: 42em) { + .project-name { + font-size: 1.75rem; } } + +.project-tagline { + margin-bottom: 2rem; + font-weight: normal; + opacity: 0.7; } + +@media screen and (min-width: 64em) { + .project-tagline { + font-size: 1.25rem; } } + +@media screen and (min-width: 42em) and (max-width: 64em) { + .project-tagline { + font-size: 1.15rem; } } + +@media screen and (max-width: 42em) { + .project-tagline { + font-size: 1rem; } } + +.main-content :first-child { + margin-top: 0; } +.main-content img { + max-width: 100%; } +.main-content h1, .main-content h2, .main-content h3, .main-content h4, .main-content h5, .main-content h6 { + margin-top: 2rem; + margin-bottom: 1rem; + font-weight: normal; + color: #159957; } +.main-content p { + margin-bottom: 1em; } +.main-content code { + padding: 2px 4px; + font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; + font-size: 0.9rem; + color: #383e41; + background-color: #f3f6fa; + border-radius: 0.3rem; } +.main-content pre { + padding: 0.8rem; + margin-top: 0; + margin-bottom: 1rem; + font: 1rem Consolas, "Liberation Mono", Menlo, Courier, monospace; + color: #567482; + word-wrap: normal; + background-color: #f3f6fa; + border: solid 1px #dce6f0; + border-radius: 0.3rem; } + .main-content pre > code { + padding: 0; + margin: 0; + font-size: 0.9rem; + color: #567482; + word-break: normal; + white-space: pre; + background: transparent; + border: 0; } +.main-content .highlight { + margin-bottom: 1rem; } + .main-content .highlight pre { + margin-bottom: 0; + word-break: normal; } +.main-content .highlight pre, .main-content pre { + padding: 0.8rem; + overflow: auto; + font-size: 0.9rem; + line-height: 1.45; + border-radius: 0.3rem; } +.main-content pre code, .main-content pre tt { + display: inline; + max-width: initial; + padding: 0; + margin: 0; + overflow: initial; + line-height: inherit; + word-wrap: normal; + background-color: transparent; + border: 0; } + .main-content pre code:before, .main-content pre code:after, .main-content pre tt:before, .main-content pre tt:after { + content: normal; } +.main-content ul, .main-content ol { + margin-top: 0; } +.main-content blockquote { + padding: 0 1rem; + margin-left: 0; + color: #819198; + border-left: 0.3rem solid #dce6f0; } + .main-content blockquote > :first-child { + margin-top: 0; } + .main-content blockquote > :last-child { + margin-bottom: 0; } +.main-content table { + display: block; + width: 100%; + overflow: auto; + word-break: normal; + word-break: keep-all; } + .main-content table th { + font-weight: bold; } + .main-content table th, .main-content table td { + padding: 0.5rem 1rem; + border: 1px solid #e9ebec; } +.main-content dl { + padding: 0; } + .main-content dl dt { + padding: 0; + margin-top: 1rem; + font-size: 1rem; + font-weight: bold; } + .main-content dl dd { + padding: 0; + margin-bottom: 1rem; } +.main-content hr { + height: 2px; + padding: 0; + margin: 1rem 0; + background-color: #eff0f1; + border: 0; } + +@media screen and (min-width: 64em) { + .main-content { + max-width: 64rem; + padding: 2rem 6rem; + margin: 0 auto; + font-size: 1.1rem; } } + +@media screen and (min-width: 42em) and (max-width: 64em) { + .main-content { + padding: 2rem 4rem; + font-size: 1.1rem; } } + +@media screen and (max-width: 42em) { + .main-content { + padding: 2rem 1rem; + font-size: 1rem; } } + +.site-footer { + padding-top: 2rem; + margin-top: 2rem; + border-top: solid 1px #eff0f1; } + +.site-footer-owner { + display: block; + font-weight: bold; } + +.site-footer-credits { + color: #819198; } + +@media screen and (min-width: 64em) { + .site-footer { + font-size: 1rem; } } + +@media screen and (min-width: 42em) and (max-width: 64em) { + .site-footer { + font-size: 1rem; } } + +@media screen and (max-width: 42em) { + .site-footer { + font-size: 0.9rem; } } From 020ed4d0469b26147623d5c58b9389941606d264 Mon Sep 17 00:00:00 2001 From: magicII <83399130@qq.com> Date: Mon, 31 Aug 2015 16:59:04 +0800 Subject: [PATCH 2/9] Replace master branch with page content via GitHub From 2f72facc729a4e7bd87c5ac097cc28be72e0b83a Mon Sep 17 00:00:00 2001 From: magicII <83399130@qq.com> Date: Mon, 31 Aug 2015 17:01:10 +0800 Subject: [PATCH 3/9] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 8d2094ad3d..0000000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -yansu.org \ No newline at end of file From 47e5f37f8ecab655be965f77707587958b24cb56 Mon Sep 17 00:00:00 2001 From: magicII <83399130@qq.com> Date: Mon, 31 Aug 2015 17:35:39 +0800 Subject: [PATCH 4/9] Delete index.html --- index.html | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index 16cc0df5bb..0000000000 --- a/index.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Magicii.GitHub.io by magicII - - - - - - - - - -
-

-Welcome to GitHub Pages.

- -

This automatic page generator is the easiest way to create beautiful pages for all of your projects. Author your page content here using GitHub Flavored Markdown, select a template crafted by a designer, and publish. After your page is generated, you can check out the new gh-pages branch locally. If you’re using GitHub Desktop, simply sync your repository and you’ll see the new branch.

- -

-Designer Templates

- -

We’ve crafted some handsome templates for you to use. Go ahead and click 'Continue to layouts' to browse through them. You can easily go back to edit your page before publishing. After publishing your page, you can revisit the page generator and switch to another theme. Your Page content will be preserved.

- -

-Creating pages manually

- -

If you prefer to not use the automatic generator, push a branch named gh-pages to your repository to create a page manually. In addition to supporting regular HTML content, GitHub Pages support Jekyll, a simple, blog aware static site generator. Jekyll makes it easy to create site-wide headers and footers without having to copy them across every page. It also offers intelligent blog support and other advanced templating features.

- -

-Authors and Contributors

- -

You can @mention a GitHub username to generate a link to their profile. The resulting <a> element will link to the contributor’s GitHub Profile. For example: In 2007, Chris Wanstrath (@defunkt), PJ Hyett (@pjhyett), and Tom Preston-Werner (@mojombo) founded GitHub.

- -

-Support or Contact

- -

Having trouble with Pages? Check out our documentation or contact support and we’ll help you sort it out.

- - - -
- - - - From ccc3c42a889e23404fd62f846ff7f5e0c4f426ce Mon Sep 17 00:00:00 2001 From: migic Date: Mon, 31 Aug 2015 18:04:15 +0800 Subject: [PATCH 5/9] modified file --- .gitignore | 2 ++ index.md | 15 ++------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e8c2e76523..cbe3264074 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ _site/ _drafts/ .DS_Store .idea/ +github +github.pub \ No newline at end of file diff --git a/index.md b/index.md index cf8d89d3f9..b4872810dd 100755 --- a/index.md +++ b/index.md @@ -3,16 +3,5 @@ layout: post title: Welcome --- -## 对博客的理解 - -我们每个人的在网络上产生的数据越来越多,这些信息是我们在互联网上存在过的痕迹,值得我们认真对待。但是它们被分散分布在各个网站上。很多时候我们很难将它们聚合在一起,而且各个网站的信息排布方式也没有办法自由控制,所以我们需要一个可以由自己主宰的空间——博客。 - -通过博客,我们可以记录自己的生活和成长的轨迹。它不像 Twitter 那样碎片化,也不像 Facebook 那样关系化,它是私人的空间。 - -分类有助于我们对信息的隔离,例如我把自己的记录分成这几类:技术、工具、资源、生活、读书和旅游。这是我生活重中最重要的几个类别,我希望把自己的一些心得和尝试写在相应分类中。 - -## 博客平台 - -这个博客通过 [Jekyll](http://jekyllrb.com/) 生成,部署在 [Github](https://pages.github.com),主题基于 [3-Jekyll](https://github.com/P233/3-Jekyll) 修改生成,非常感谢 [Peiwen Lu](https://github.com/P233) 开发出这么漂亮的主题。 - -我博客的源码托管在[Github](https://github.com/suyan/suyan.github.io)上,如果有任何改进意见,欢迎讨论。 \ No newline at end of file +## +摘自项目[Github](https://github.com/suyan/suyan.github.io) \ No newline at end of file From 5128015a3f48383f1e7e7586f1cc47ee39b92e39 Mon Sep 17 00:00:00 2001 From: tramp Date: Tue, 1 Sep 2015 09:56:00 +0800 Subject: [PATCH 6/9] update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3aa22e135d..c6c401e282 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -### 我的博客 - -地址:[http://yansu.org](http://yansu.org) +### 代码地址 +fork自: `https://github.com/suyan/suyan.github.io` ### 安装说明 From fa29f04af8be41b0928986814dad7fba2c3ddde1 Mon Sep 17 00:00:00 2001 From: tramp Date: Wed, 9 Sep 2015 11:32:04 +0800 Subject: [PATCH 7/9] del post --- _config.yml | 28 +++---- _posts/book/2013-12-20-book-list-of-2013.md | 44 ----------- _posts/book/2014-03-14-book-list-of-2014.md | 35 --------- ...06-17-the-end-of-regular-college-course.md | 31 -------- .../2013-08-01-the-importent-of-writing.md | 25 ------- _posts/life/2014-01-02-my-2013.md | 64 ---------------- .../2014-04-15-we-should-be-better-than-us.md | 57 -------------- .../life/2014-12-12-travel-of-california.md | 75 ------------------- _posts/life/2015-01-01-my-2014.md | 50 ------------- .../2015-01-30-microsoft-openhack-2015.md | 32 -------- _posts/life/2015-04-13-rent-car-by-zipcar.md | 61 --------------- index.md | 3 +- 12 files changed, 16 insertions(+), 489 deletions(-) delete mode 100644 _posts/book/2013-12-20-book-list-of-2013.md delete mode 100644 _posts/book/2014-03-14-book-list-of-2014.md delete mode 100644 _posts/life/2013-06-17-the-end-of-regular-college-course.md delete mode 100644 _posts/life/2013-08-01-the-importent-of-writing.md delete mode 100644 _posts/life/2014-01-02-my-2013.md delete mode 100644 _posts/life/2014-04-15-we-should-be-better-than-us.md delete mode 100644 _posts/life/2014-12-12-travel-of-california.md delete mode 100644 _posts/life/2015-01-01-my-2014.md delete mode 100644 _posts/life/2015-01-30-microsoft-openhack-2015.md delete mode 100644 _posts/life/2015-04-13-rent-car-by-zipcar.md diff --git a/_config.yml b/_config.yml index 377d250a25..6fcda85e20 100755 --- a/_config.yml +++ b/_config.yml @@ -6,28 +6,28 @@ kramdown: input: GFM # 作者信息 -author: - name: 闫肃 - email: suyan0830@gmail.com - link: http://yansu.org - weibo: http://weibo.com/yansu0711 - github: http://github.com/suyan +# author: +# name: Tramp +# email: suyan0830@gmail.com +# link: http://yansu.org +# weibo: http://weibo.com/yansu0711 +# github: http://github.com/suyan # 站点信息 -title: 闫肃的博客 -description: 闫肃的博客 -url: http://yansu.org -rss_url: /pages/atom.xml +title: X-Focus +description: X的博客 +url: http://magicii.github.io/ +# rss_url: /pages/atom.xml # avatar头像及Favicon avatar: http://7u2ho6.com1.z0.glb.clouddn.com/site-avatar.png favicon: http://7u2ho6.com1.z0.glb.clouddn.com/site-favicon.ico # google analytics 设置 -ga: - id: UA-54767140-1 - url: yansu.org +# ga: +# id: UA-54767140-1 +# url: yansu.org # disqus 设置 disqus: - shortname: suyan-zh \ No newline at end of file + shortname: focus \ No newline at end of file diff --git a/_posts/book/2013-12-20-book-list-of-2013.md b/_posts/book/2013-12-20-book-list-of-2013.md deleted file mode 100644 index 18b7b4e8ac..0000000000 --- a/_posts/book/2013-12-20-book-list-of-2013.md +++ /dev/null @@ -1,44 +0,0 @@ ---- -layout: post -title: 2013阅读书单 -category: 读书 -keywords: 阅读,书单,2013 ---- - -## Pro Git - -- status: 在读 -- author: Scott Chacon -- publisher: Apress -- language: English -- link: http://git-scm.com/book -- cover: http://7u2ho6.com1.z0.glb.clouddn.com/book-pro-git.jpg -- description: 整本书写的非常通俗易懂,而且有大量例子和图示来简化理解过程,非常值得一读。 - -## The Little Mongodb Book - -- status: 已读 -- author: Karl Seguin -- publisher: github -- language: English -- link: https://github.com/karlseguin/the-little-mongodb-book/blob/master/en/mongodb.markdown -- cover: http://7u2ho6.com1.z0.glb.clouddn.com/book-the-little-mongodb-book.png -- description: 这本书非常之简洁,读起来非常易懂,其实这还归功于MongoDB的简洁。NoSQL与MySQL最大的区别在于它是为一些特定的场景设计的,如MongoDB、Redis、Cassandra等。MongoDB是其中更加通用的一个方案,从MySQL往MongoDB转,几乎不需要太大变化。 - -## 白帽子讲Web安全 - -- status: 已读 -- author: 吴翰清 -- publisher: 电子工业出版社 -- language: 中文 -- link: http://book.douban.com/subject/10546925/ -- cover: http://7u2ho6.com1.z0.glb.clouddn.com/book-the-safety-of-web-by-white-hat.jpg - -## 浪潮之巅 - -- status: 已读 -- author: 吴军 -- publisher: 电子工业出版社 -- language: 中文 -- link: http://book.douban.com/subject/6709783/ -- cover: http://7u2ho6.com1.z0.glb.clouddn.com/book-on-top-of-tides.jpg \ No newline at end of file diff --git a/_posts/book/2014-03-14-book-list-of-2014.md b/_posts/book/2014-03-14-book-list-of-2014.md deleted file mode 100644 index 558ab19870..0000000000 --- a/_posts/book/2014-03-14-book-list-of-2014.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -layout: post -title: 2014阅读书单 -category: 读书 -keywords: 阅读,书单,2014 ---- - -## Web前端黑客技术揭秘 - -- status: 已读 -- author: 钟晨鸣/徐少培 -- publisher: 电子工业出版社 -- language: 中文 -- link: http://book.douban.com/subject/20451827/ -- cover: http://img3.douban.com/lpic/s24562945.jpg - -## The Little Redis Book - -- status: 已读 -- author: Karl Seguin -- publisher: Github -- language: English -- link: https://github.com/karlseguin/the-little-redis-book -- cover: https://raw.githubusercontent.com/karlseguin/the-little-redis-book/master/en/title.png -- description: - -## 打造Facebook - -- status: 已读 -- author: 王淮/祝文让 -- publisher: 印刷工业出版社 -- language: 中文 -- link: http://book.douban.com/subject/20471120/ -- cover: http://img3.douban.com/lpic/s24581301.jpg -- description: \ No newline at end of file diff --git a/_posts/life/2013-06-17-the-end-of-regular-college-course.md b/_posts/life/2013-06-17-the-end-of-regular-college-course.md deleted file mode 100644 index e23339cfab..0000000000 --- a/_posts/life/2013-06-17-the-end-of-regular-college-course.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -layout: post -title: 本科生涯结束了 -category: 生活 -tags: Essay -keywords: 本科,结束 -description: 毕设答辩完了,大概大学四年也等于交代了吧 ---- - -今天上午答辩完了,准备了几个月的毕业设计,也算是给了自己一个交代。 - - -回想自己本科四年,有过得失,有过起伏。自己在学校做了很多自己大学之前不敢,也没有机会做的事情。 - - -这四年每天都有新鲜事情发生,现在却一件都想不起来了,唯一的感觉就是自己淡然了很多。 - - -每天混迹在V2EX、微博还有微信中,这些都是我的消息来源,我奋力搜集着自己感兴趣的内容,漫无目的。 - - -出去实习过,也有过干一番事情的冲动,但最后还是选择了安稳读研。曾经一边努力获得保研名额,却又暗暗希望保研失败,这样我就可以有别的选择,不是这样漫无目的走下去。 - - -除了人,这个学校没有什么让我值得留恋的地方,但我却选择继续留在这里。可我决的我天性应该适合陌生的环境,在陌生环境中我有极强的求生欲,内心的斗志会被激发出来,就像我刚来大学时候的状态。 - - -唯一让我难以忘怀的是我在大学遇到的几个人,他们是我这辈子可能都不会忘掉的。另外更值得一提的是大二追到的女友,我们一直走了三年,再过13天就是我们三周年纪念日,她是我大学最大的收获。 - - -在我看来,一段理想的生活即将结束,未来的路谁都没法预测,坚持做自己认为对的事情,就够了。 \ No newline at end of file diff --git a/_posts/life/2013-08-01-the-importent-of-writing.md b/_posts/life/2013-08-01-the-importent-of-writing.md deleted file mode 100644 index ec66a089df..0000000000 --- a/_posts/life/2013-08-01-the-importent-of-writing.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: post -title: 持续写作的重要性 -category: 生活 -tags: Essay -keywords: 写作,writing -description: 不再学习技术或做项目,就不再产生内容,这就是我从6月中旬到现在都没有更新的原因 ---- - -最近都没有怎么上微博,昨天上去看到这样一句话,让我挺有感触 - -![写作的重要性](http://7u2ho6.com1.z0.glb.clouddn.com/life-programmer-writing.png) - -我自己写的东西大部分都是一些遇到问题记录和总结,很少能有一些“创造性”的东西。 - -记得Fenng在一篇文章里讲到现在的社交网站中,98%的人在消费信息,只有2%的人在产生信息。 - -我一直属于这98%的人,没有办法,在大学之前从来没有觉得写作的重要性,写出来的东西也是为了完成作文800字的限制。现在想象一下,感觉自己真是太文盲了,自己能写的好像也只有议论文了。提一个议论点,然后摆一些论据,最后总结一下,800字搞定收工。甚至在写一些个人技术学习总结的时候都没有很好的利用好议论文方法,仅仅是一个流水陈述,想到哪里写到哪里。 - -曾经也想过提高一下个人写作水平,想过的一个方式是翻译外文,把今天的hacker news上或者techmeme上感兴趣的一篇文章翻译下来。尝试过一次太受打击,就放弃了。虽然看这些文章基本上没有什么问题,但是要翻译的时候就英语水平捉急了,翻译一篇可能要耗费好多小时的时间。以前翻译过一篇[OpenStack Nova内部机制的文章](/2012/11/08/openstack-nova-internal.html),因为没有找到译文,自己又比较需要这方面的信息,所以尝试了一下,结果发现就这样一个自己比较了解的东西,都翻译的惨不忍睹。 - -现在每天除了学习英语,其余时间最多的就是看看微信上的公众帐号,小道消息、道哥黑板报、Mac Talk都是我比较喜欢的公众帐号。虽然我没有他们那样深的积累和话题,或许我能从个人理解上写一些容易上手的话题。 - - - diff --git a/_posts/life/2014-01-02-my-2013.md b/_posts/life/2014-01-02-my-2013.md deleted file mode 100644 index 8a918468d2..0000000000 --- a/_posts/life/2014-01-02-my-2013.md +++ /dev/null @@ -1,64 +0,0 @@ ---- -layout: post -title: 2013个人总结 -category: 生活 -tags: Essay -keywords: 总结,2013 -description: ---- - -### 动机 - -不知不觉已经进入2014年,今年是我的本命年,实际上从去年到今年也是我人生轨迹变化极快的一年。昨天晚上很晚才睡,有幸读了几个关注的人的2013总结,收益颇多。 - -- [2013 年个人总结](http://dbanotes.net/mylife/2013_personal_review.html) -- [Tinyfool的2013年总结————在困惑和挣扎中试图前行](http://tiny4.org/blog/2014/01/tinyfool-2013/) -- [我在App Store这三年](http://www.iwangke.me/2014/01/01/three-years-in-app-store-as-indie-developer/) - -于是我打算自己也写一篇2013总结,未来自己回顾一年历程的时候,能感觉到自己成长了多少。 - -### 实习 -2013最早的4个月一直是在研究OpenStack是什么,它的作用机制,它的应用方向以及怎么把它运行起来。着手研究OpenStack其实从2012年10月就开始了,我刚刚进入大四,保研后的研究生导师把我推荐到联想实习。 - -OpenStack的学习对我来说真的算是一次不一样的体验,因为它足够大。从概念上如云计算,到技术层面如虚拟化,再到运维层面如自动化运维,最后到开源项目编程,每一部分的学习都让我获益颇丰。我在其中主要的研究虚拟机的监控,这个组件让我更能了解到它各个部分协调运行的机制。 - -4月的时候由于导师需要,从联想回来给实验室弄OpenStack环境,同时我也准备就这个方向写我的毕业论文。 - -### 毕业设计 -回来以后的感觉真的是...节奏缓慢,没有项目的驱动,没有任务的督促。因为老师也不知道要拿这个东西干什么,甚至都不去看我们给他弄好的环境。为了不让自己就这样轻轻松松毕业,我打算继续研究OpenStack,至少完全搞定一个组件。 - -当时正好在于Grizzly版本发布,OpenStack自己的监控组件Ceilometer正式发布(之前我们用新浪开源的Kanyun),对我来说正好是个千载难逢的学习机会。 - -从4月到7月毕业,3个月的时间,我读完了Ceilometer组件的代码,顺便基于它还有Horizon搞了二次开发,顺利毕业。为了阅读代码,我感觉到自己的Python水平提升了不少,最让我满意的应该是还写了几篇有关这个组件的博客。这算是自己真正首次原创了吧。 - -### 放弃读研&出国准备 -从保研开始呆在研究生实验室有快1年,曾经保研只是为了让家人放心,毕业后能找个不错的工作拿到北京户口,这似乎是生活在小县城中父母眼里最好的归宿。但我感受到这里并不适合我,我不希望把自己最有干劲的几年浪费在这个地方。 - -我没有办法改变环境,那我只能换一个环境。 - -一个解决方式是去留学。 - -本科能聊的来的2个哥们,一个已经去了美国,另一个在准备去美国的路上...在他们给我各种灌输之下,以及对北京兴趣的减少,我动摇了。 - -但是我错误判断了自己的英语实力和学习速度...以为我可以像学编程语言一样学英语,但事实显然不是这样的。4个月,GRE+TOEFL几乎把我累死,另一方面还要不停地给家人做工作。最后分数是有了,但是完全达不到自己的预期。 - -另一个解决方式是去工作。 - -### 一个工作 -眼看想去的几个学校无望,我甚至做了最坏的打算,再准备一年再出去。 - -我完全没有想到我轨迹又变了,因为一个偶然的工作机会。 - -英语的准备过程真的有些枯燥,我止不住想去写点东西(码农的命..)。看到V2EX上的一则低调招聘贴,澳洲公司,还能远程,这对于正在学习英语,又想编程的我是最佳选择,没多想就交了简历。 - -电话+QQ联系之后就开始实习了,不得不说这个效率... - -至今为止一个半月的实习,感觉自己在这里有很大的发挥空间,也能在这个方面提升不少。如果能在年后顺利去澳洲工作,或许也是不错的选择。 - -### 总结 - -> 但行好事,莫问前程 - -> 埋头干事,抬头看路 - -这两句似乎有些矛盾,不过我总拿它们来作为自己选择的标准。前者从Fenng听来,后者忘了。 \ No newline at end of file diff --git a/_posts/life/2014-04-15-we-should-be-better-than-us.md b/_posts/life/2014-04-15-we-should-be-better-than-us.md deleted file mode 100644 index 5ee182a7ef..0000000000 --- a/_posts/life/2014-04-15-we-should-be-better-than-us.md +++ /dev/null @@ -1,57 +0,0 @@ ---- -layout: post -title: 我们得比自己更努力 -category: 生活 -tags: Essay -keywords: -description: ---- - -> 选择了与众不同,就要准备好面对自己选择的道路的曲折,以及周围人们的不解。 - -我们的家庭乃至这个社会,都已经为我们设计好了一条道路。 - - -如果你听从父母的建议,或者接受社会舆论的引导, - - -那么你只需要埋头把事情做好,即可过上大家认为不错的日子。 - - -这条路是大家踩出来的,有方向有同伴,走起来不会太累,但是路途的风景确大同小异。 - - -有一部分人天生就不喜欢条条框框,以变化为美,以差异为美,那么我们是同一类人。 - - -我们希望自己去探索生命的意义,我们经常问自己为什么要这么做, - - -我们时常在思考,这个世界是不是可以更好。 - - -但是,选择了与众不同,就要准备好面对自己选择的道路的曲折,以及周围人们的不解。 - - -我们都在荆棘中探索,希望找到一个属于自己的世外桃源。 - - -有些人会不断的来打听我们的状况然后提出一些他们认为对的意见,这些人都是好意, - - -但是他们却不断在影响我们的决心。 - - -也许你还在路途中,也许你已经找到一个归属, - - -让我们坚持下去的,从来不是别人的看法, - - -而是对自己十足的信心。 - - -差异和个性从来不是我们的最终目标, - - -我们只为不断超越和完善自己,因此我们得比自己更努力。 \ No newline at end of file diff --git a/_posts/life/2014-12-12-travel-of-california.md b/_posts/life/2014-12-12-travel-of-california.md deleted file mode 100644 index 3a71ce1ebb..0000000000 --- a/_posts/life/2014-12-12-travel-of-california.md +++ /dev/null @@ -1,75 +0,0 @@ ---- -layout: post -title: 美西加州三日游 -category: 生活 -tags: essay -keywords: 加州,生活,California ---- - -> 来美3个月了,终于迎来第一个小假期。由于时间有限,还没有车,所以选择了跟团先粗略了解一下加州。 - -![map of travel](http://7u2ho6.com1.z0.glb.clouddn.com/life-travel-of-california.png) - -## 丹麦村 (Solvang) - -丹麦村是我们的第一站停歇点。 - -![solvang street](http://7u2ho6.com1.z0.glb.clouddn.com/life-solvang-street.jpg) - -这里的建筑风格都特别小清醒,多重色彩穿插点缀整条大街。 - -![solvang windmill](http://7u2ho6.com1.z0.glb.clouddn.com/life-solvang-windmill.jpg) - -这个风车是这儿的标志建筑,配合加州的大蓝天,可以拍很多不错的照片。 - -## 赫氏古堡 (Hearst Castle) - -第二站是赫氏古堡,在地图上的C点。 - -![hearst castle appearance](http://7u2ho6.com1.z0.glb.clouddn.com/life-hearst-castle-appearance.jpg) - -这座城堡建在一座山头,城堡中收藏了各种珍贵的雕像和油画。 - -![hearst castle outside](http://7u2ho6.com1.z0.glb.clouddn.com/life-hearst-castle-outside.jpg) - -向西眺望就是沙滩和太平洋,视野非常开阔。 - -## 罗马艺术宫 (Palace of Fine Arts) - -罗马艺术宫就坐落在进门大桥旁边,据说是当初万国博览会举办的地方。 - -![palace of fine arts](http://7u2ho6.com1.z0.glb.clouddn.com/life-palace-of-fine-arts.jpg) - -## 九曲花街 (Lombard Street) - -很多人推荐九曲花街这个地方,但是我们来的时候两边花并没有开,所以看起来就是一个大家练车的地方 0_0 - -![lombard street](http://7u2ho6.com1.z0.glb.clouddn.com/life-lombard-street.jpg) - -## 渔人码头 (Fisherman's Wharf) - -渔人码头这个地方就像一个游客集散地,来的都是外地游客。这里有各种海鲜可以尝,另外广场的歌手唱的也挺不错。 - -![fisherman's wharf](http://7u2ho6.com1.z0.glb.clouddn.com/life-fishermans-wharf-gate-1.jpg) - -## 恶魔岛 (Alcatraz Island) - -从渔人码头上船,可以绕恶魔岛一圈。恶魔岛以前是关政治罪犯的地方,孤立在海中央,非常难越狱,不过据说有人挖了地道到了对岸。 - -![alcatraz island](http://7u2ho6.com1.z0.glb.clouddn.com/life-alcatraz-island.jpg) - -## 金门大桥 (Golden Gate Bridge) - -金门大桥算是旧金山的标志之一。 - -![golden gate bridge](http://7u2ho6.com1.z0.glb.clouddn.com/life-golden-gate-bridge.jpg) - -## 优胜美地国家公园 (Yosemite) - -![Yosemite Artist's Point](http://7u2ho6.com1.z0.glb.clouddn.com/life-yosemite-artists-point.jpg) - -![Yosemite Trees](http://7u2ho6.com1.z0.glb.clouddn.com/life-yosemite-trees.jpg) - -![Yosemite Fall](http://7u2ho6.com1.z0.glb.clouddn.com/life-yosemite-fall.jpg) - -![Yosemite EI Captain](http://7u2ho6.com1.z0.glb.clouddn.com/life-yosemite-ei-captain.jpg) \ No newline at end of file diff --git a/_posts/life/2015-01-01-my-2014.md b/_posts/life/2015-01-01-my-2014.md deleted file mode 100644 index 5654eebf34..0000000000 --- a/_posts/life/2015-01-01-my-2014.md +++ /dev/null @@ -1,50 +0,0 @@ ---- -layout: post -title: 2014 个人总结 -category: 生活 -tags: Essay -keywords: 个人总结,2014 -description: ---- - -> 在2014年里,我在求学、职业生涯以及家庭关系上都有过多次尝试和选择。 - -## 留学申请 - -英语考试和学校申请总的时间大概是从去年8月中旬到今年1月中旬,历时5个月,这段时间是我有记忆以来最困难的一段时期。其中包括说服家人支持我留学,考过TOEFL和GRE,以及学校的选择和申请。 - -最后由于考试结果不理想,只申请了一个学校尝试,之后打算继续考试和准备来年的申请。 - -## 远程工作 - -从13年底加入澳洲这家公司,到今年5月离开,是我第一次尝试远程工作。由于那边公司节奏也不快,所以除了工作外,我可以有闲暇的时间完成留学的各种琐事,以及处理研究生学校退学的一些事情。 - -工作中收获很多,一方面要熟悉远程工作方式,另一方面为了实现项目的需求需要不断学习提升自己。最后积累了比较多的网络安全知识和实际开发经验。 - -但是后来由于公司重组,原定的很多计划都不能再继续,因此我有了很长一段空闲期。 - -## 几次旅行 - -这段空闲期里,正好给了我很多机会出去旅行。我在14年上半年去游了华山和普陀山。一直想抽空把图片整理一下,写一下游记... 但是一直没有完成,看来只能拖到15年了。 - -## 新公司 - -旅行归来以后开始考虑自己接下来的计划,选择一个既有利于自己发展,又对个人限制比较少的公司工作,这样可以让我继续自己留学的目标。 - -在几次面试和选择以后,最后加入了一个创业公司,开始全职工作。 - -## 留学 - -5月中旬,我不幸被一波拒信AOE砸中。14Fall的入学没戏了,不过学校接着给我发来一封调剂录取,说我如果愿意接受学校国际学校的语言课程,可以14Fall加入国际学院,然后15Spring或者15Fall再进入正式的Master学院。 - -和家人和老板都商量过以后,确定接受调剂,先到美帝熟悉环境。 - -## 语言学习 - -语言学习过程其实也是熟悉未来生活和学习环境的过程。事实证明早来也有早来的好处,经过几个月的学习,我的英文水平可以应付了日常生活和学术的基本要求。 - -其间除了探索洛杉矶,还去过一次旧金山旅行,感受了一下湾区风光。 - -## 总结 - -总得说来,这一年经历了很多,也成长了很多。 diff --git a/_posts/life/2015-01-30-microsoft-openhack-2015.md b/_posts/life/2015-01-30-microsoft-openhack-2015.md deleted file mode 100644 index 07c25513be..0000000000 --- a/_posts/life/2015-01-30-microsoft-openhack-2015.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -layout: post -title: 微软 Openhack 2015 -category: 生活 -tags: Essay -keywords: ---- - -Hackathon 在国内也见过不少,不过一直没有参加过,一是熬夜实在是伤身体,二是以前不太好找队伍。这回室友喊我去参加,因为好奇这边IT的工作环境,就去参加了。 - -这次 Hackathon 的主题是 USC vs UCLA,这俩学校的 Football 一直是死敌,导致各方面也都开始竞争,在 [Wikipedia](http://en.wikipedia.org/wiki/UCLA–USC_rivalry) 上还有专门的词条来记录两校的竞争。 - -![USC vs UCLA](http://7u2ho6.com1.z0.glb.clouddn.com/life-openhack-usc-vs-ucla.png) - -上图是 Hackathon 一组队伍最终展示PPT时候的封面~ - -这次 Openhack 的奖品还好,第一是去西雅图总部玩,第二是人手一台XBOX. - -![Prize](http://7u2ho6.com1.z0.glb.clouddn.com/life-openhack-prize.png) - -不过在中间每隔一个小时有一次小活动,奖品包含了XBOX和Surface Pro等 0_0 可惜活动都没法参加,对游戏规则都不明白。不过这边的工程师们还是挺逗的,唱歌跳舞神马的各种玩 High。 - -下图是洛杉矶微软办公室,这天里面基本上能坐的地方都被参加 Hackathon 的队伍挤满了。 - -![Office](http://7u2ho6.com1.z0.glb.clouddn.com/life-openhack-microsoft-office.png) - -我们的4个人的桌面~ 隔壁一哥带外星人来写代码,不过据说装了10个小时,Visual Studio 都没装完。 - -![table](http://7u2ho6.com1.z0.glb.clouddn.com/life-openhack-table.png) -
最后是队伍合影 =_= 我是那个比较正常的 - -![team](http://7u2ho6.com1.z0.glb.clouddn.com/life-openhack-team.png) \ No newline at end of file diff --git a/_posts/life/2015-04-13-rent-car-by-zipcar.md b/_posts/life/2015-04-13-rent-car-by-zipcar.md deleted file mode 100644 index 5ae5ee1779..0000000000 --- a/_posts/life/2015-04-13-rent-car-by-zipcar.md +++ /dev/null @@ -1,61 +0,0 @@ ---- -layout: post -title: 使用 Zipcar 在加州租车 -category: 生活 -tags: Essay -keywords: Zipcar,Rent,Car ---- - - -> 在洛杉矶这个“大饼”中生活,没有车真的是各种艰难。2月初把驾照考过了,接下来就考虑买车或者租车。买车算了算不是很划算,而且对车也不太懂,就考虑先租车。 - -> 在 [USC Transportation](http://transnet.usc.edu/index.php/getting-around/) 上排名最靠前的两个公司是 Enterprise 和 Zipcar。前者是传统的租车公司,后者稍微不一样一点。我还没有在 Enterprise 上租过车,所以先说说 Zipcar. - -## Zipcar 简介 - -[Zipcar](http://www.zipcar.com) 是会员制的,在注册以后会给发一张 Zipcard 过来,有了这张卡你就可以随时去订车和提车了。Zipcar 不像其他租车行一样你得去固定地方统一取车,它的车就停在路边,他们有固定的停车位。来看一下 Zipcar 在 USC 附近的停车点。 - -![zipcar map](http://7u2ho6.com1.z0.glb.clouddn.com/life-zipcar-map.png) - -## Zipcar 使用 - -### 1. 注册获得会员卡 - -大部分学校应该都和 Zipcar 有合作,所以注册之前应该去学校网站看一下。学生可以将会员费缩减到 25刀/年。 - -注册地址在[这里](http://members.zipcar.com/registration),注册的时候去搜一下 Promo Code,我就是注册完才看到一个免费40刀的 Code T_T。在美国注册帐号一看到 Code 填空就应该去搜搜~ - -### 2. 租车 - -租车可以在网站上或者手机 APP 上进行。租车非常方便,只要选择相应车辆,以及使用时间预订即可。然后在预订时间的前15分钟内取车。取车很简单,拿自己的 Zipcard 刷一下车前部的一个感应器门就开了。然后上车发动走人。 - -### 3. 加油 - -Zipcar 租的车带了加油卡,就在司机座位上面。虽然看起来比较贴心,但是这个卡经常不能用,因为它似乎是个信用卡,然后一旦有人尝试多次失败就被锁了,导致后面的人们也不能用。 - -加油卡的使用方式是: - -1. 刷一下加油卡 (Gas Card) -2. 输入汽车里程表上的数 -3. 输入 Zipcard 上面那个 6 位的 Gas ID -4. 加油 - -如果加油卡失效,这个时候会提示:Find your cashier。不用担心,直接用自己的信用卡加油就好了,然后记得要收据 (Receipt),然后把收据发到 support@zipcar.com 报销就好。记得在邮件里加上自己的 Zipcard ID. - -### 4. 还车 - -还车记得一定要还到原车的位置。 - -### 5. 保险 - -在帐号注册的时候有个保险选项 - -![damage fee](http://7u2ho6.com1.z0.glb.clouddn.com/life-zipcar-damage-fee.png) - -我建议选择那个complete waiver,毕竟开车难免磕碰。 - -## 注意 - -### 1. 逾期罚款 - -租车的时候宁可多不可少,因为逾期惩罚是非常重的,应该是一个小时50刀左右。 \ No newline at end of file diff --git a/index.md b/index.md index b4872810dd..1f6fcc7962 100755 --- a/index.md +++ b/index.md @@ -3,5 +3,6 @@ layout: post title: Welcome --- -## +### +练习git使用.并搭成个人blog 摘自项目[Github](https://github.com/suyan/suyan.github.io) \ No newline at end of file From 107d8590af97f4c69d0f803329da44f3300ceacb Mon Sep 17 00:00:00 2001 From: tramp Date: Fri, 11 Sep 2015 10:47:23 +0800 Subject: [PATCH 8/9] Add Posts --- _includes/nav.html | 12 ++--- .../2015-09-11-linux-install-packages.md | 48 +++++++++++++++++++ _posts/php/2015-09-09-phpunit.md | 41 ++++++++++++++++ 3 files changed, 92 insertions(+), 9 deletions(-) create mode 100644 _posts/Linux/2015-09-11-linux-install-packages.md create mode 100644 _posts/php/2015-09-09-phpunit.md diff --git a/_includes/nav.html b/_includes/nav.html index 6aeaec1c16..3633b3b54c 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -9,19 +9,13 @@ {% endfor %} -
+ -
-
- - - -
- +