Merge branch 'master' into gh-pages

Conflicts:
	javascripts/vendor/custom.modernizr.js
	javascripts/vendor/zepto.js
	mockup.html
	stylesheets/normalize.css
This commit is contained in:
2016-02-01 17:05:29 +08:00
17 changed files with 343 additions and 2569 deletions
+106 -62
View File
@@ -5681,9 +5681,6 @@ body #hackflowy #main .children li.shift8 {
body #hackflowy #main .children li.shift9 {
margin-left: 270px;
}
body #hackflowy #main .children ul.shift {
margin-bottom: 0px;
}
/* line 167, ../sass/app.scss */
body #hackflowy #main > .children {
margin-left: 0;
@@ -5695,54 +5692,58 @@ body #hackflowy #footer {
font-size: 12px;
}
body #hackflowy #main .children ul.task-view {
margin-bottom: 0px;
margin-left: 0px;
}
.options-div{
display: none;
}
.options{
position: absolute;
z-index: 1000;
color: rgb(51, 51, 51);
cursor: auto;
display: none;
font-family: 'Helvetica Neue', Arial, sans-serif;
font-size: 16px;
font-weight: normal;
height: 0px;
line-height: 16px;
width: 675px;
position: absolute;
z-index: 1000;
color: rgb(51, 51, 51);
cursor: auto;
display: none;
font-family: 'Helvetica Neue', Arial, sans-serif;
font-size: 16px;
font-weight: normal;
height: 0px;
line-height: 16px;
width: 675px;
}
.options a {
display: inline-block;
width: 20px;
height: 20px;
cursor: pointer;
display: inline-block;
width: 20px;
height: 20px;
cursor: pointer;
}
.options-left {
background: #ddd;
border: 1px solid #bbb;
width: 80px;
min-height: 58px;
padding: 10px 0 5px 10px;
margin-bottom: 10px;
border-radius: 4px;
font-family: 'Helvetica Neue', Arial, Sans-serif;
z-index: 8;
margin-top: 8px;
margin-left: -29px;
background: #ddd;
border: 1px solid #bbb;
width: 80px;
min-height: 58px;
padding: 10px 0 5px 10px;
margin-bottom: 10px;
border-radius: 4px;
font-family: 'Helvetica Neue', Arial, Sans-serif;
z-index: 8;
margin-top: 16px;
margin-left: -29px;
}
.options-left a {
color: #555;
margin-bottom: 5px;
font-size: 12px;
display: block;
margin-right: 10px;
width: auto;
color: #555;
margin-bottom: 5px;
font-size: 12px;
display: block;
margin-right: 10px;
width: auto;
}
.options-left a:hover {
@@ -5750,42 +5751,85 @@ width: auto;
}
.options-left > .mouse-tip {
content: '';
position: absolute;
left: 0;
height: 25px;
width: 90px;
margin-top: -36px;
margin-left: -1%;
content: '';
position: absolute;
left: 0;
height: 25px;
width: 90px;
margin-top: -36px;
margin-left: -1%;
}
.options-left > .mouse-tip:before {
content: '';
position: absolute;
top: 10px;
left: 19%;
margin-left: -15px;
height: 0;
width: 0;
border-bottom: 15px solid #ddd;
border-left: 15px solid transparent;
border-right: 15px solid transparent;
content: '';
position: absolute;
top: 10px;
left: 19%;
margin-left: -15px;
height: 0;
width: 0;
border-bottom: 15px solid #ddd;
border-left: 15px solid transparent;
border-right: 15px solid transparent;
}
.mouse-tip:before {
content: '';
position: absolute;
top: 10px;
left: 50%;
margin-left: -15px;
height: 0;
width: 0;
border-bottom: 15px solid #ddd;
border-left: 15px solid transparent;
border-right: 15px solid transparent;
content: '';
position: absolute;
top: 10px;
left: 50%;
margin-left: -15px;
height: 0;
width: 0;
border-bottom: 15px solid #ddd;
border-left: 15px solid transparent;
border-right: 15px solid transparent;
}
.options-left > .fold-button {
position: absolute;
left: 0;
/*height: 25px;*/
/*width: 90px;*/
margin-top: -45px;
margin-left: -3%;
font-size: 1.5em;
}
.options-left > .fold-button:hover {
text-decoration: none;
}
/* By default show fold button */
.options-left>.fold-button:before {
content: "-";
}
/* no fold button on empty nodes */
.empty .options-left:first-child > .fold-button:before {
content: '';
}
/* expand button on folded nodes */
.folded .options-left:first-child>.fold-button:before {
content: "+";
}
.task-completed{
text-decoration: line-through;
}
.subtle-link {
color: rgb(51, 51, 51);
}
.subtle-link:hover {
color: rgb(51, 51, 51);
text-decoration: underline;
}
#task-breadcrumbs {
font-size: smaller;
}
#task-breadcrumbs a {
color: rgb(51, 51, 51);
}
#task-breadcrumbs a:hover {
color: rgb(51, 51, 51);
}
-405
View File
@@ -1,405 +0,0 @@
/* normalize.css v2.1.0 | MIT License | git.io/normalize */
/* ==========================================================================
HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined in IE 8/9.
*/
/* line 22, ../sass/normalize.scss */
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
nav,
section,
summary {
display: block;
}
/**
* Correct `inline-block` display not defined in IE 8/9.
*/
/* line 32, ../sass/normalize.scss */
audio,
canvas,
video {
display: inline-block;
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
/* line 41, ../sass/normalize.scss */
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Address styling not present in IE 8/9.
*/
/* line 50, ../sass/normalize.scss */
[hidden] {
display: none;
}
/* ==========================================================================
Base
========================================================================== */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
/* line 64, ../sass/normalize.scss */
html {
font-family: sans-serif;
/* 1 */
-webkit-text-size-adjust: 100%;
/* 2 */
-ms-text-size-adjust: 100%;
/* 2 */
}
/**
* Remove default margin.
*/
/* line 74, ../sass/normalize.scss */
body {
margin: 0;
}
/* ==========================================================================
Links
========================================================================== */
/**
* Address `outline` inconsistency between Chrome and other browsers.
*/
/* line 86, ../sass/normalize.scss */
a:focus {
outline: thin dotted;
}
/**
* Improve readability when focused and also mouse hovered in all browsers.
*/
/* line 95, ../sass/normalize.scss */
a:active,
a:hover {
outline: 0;
}
/* ==========================================================================
Typography
========================================================================== */
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
*/
/* line 108, ../sass/normalize.scss */
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
*/
/* line 117, ../sass/normalize.scss */
abbr[title] {
border-bottom: 1px dotted;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
*/
/* line 126, ../sass/normalize.scss */
b,
strong {
font-weight: bold;
}
/**
* Address styling not present in Safari 5 and Chrome.
*/
/* line 134, ../sass/normalize.scss */
dfn {
font-style: italic;
}
/**
* Address differences between Firefox and other browsers.
*/
/* line 142, ../sass/normalize.scss */
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
/**
* Address styling not present in IE 8/9.
*/
/* line 152, ../sass/normalize.scss */
mark {
background: #ff0;
color: #000;
}
/**
* Correct font family set oddly in Safari 5 and Chrome.
*/
/* line 164, ../sass/normalize.scss */
code,
kbd,
pre,
samp {
font-family: monospace, serif;
font-size: 1em;
}
/**
* Improve readability of pre-formatted text in all browsers.
*/
/* line 173, ../sass/normalize.scss */
pre {
white-space: pre-wrap;
}
/**
* Set consistent quote types.
*/
/* line 181, ../sass/normalize.scss */
q {
quotes: "\201C" "\201D" "\2018" "\2019";
}
/**
* Address inconsistent and variable font size in all browsers.
*/
/* line 189, ../sass/normalize.scss */
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
/* line 198, ../sass/normalize.scss */
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
/* line 205, ../sass/normalize.scss */
sup {
top: -0.5em;
}
/* line 209, ../sass/normalize.scss */
sub {
bottom: -0.25em;
}
/* ==========================================================================
Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9.
*/
/* line 221, ../sass/normalize.scss */
img {
border: 0;
}
/**
* Correct overflow displayed oddly in IE 9.
*/
/* line 229, ../sass/normalize.scss */
svg:not(:root) {
overflow: hidden;
}
/* ==========================================================================
Figures
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari 5.
*/
/* line 241, ../sass/normalize.scss */
figure {
margin: 0;
}
/* ==========================================================================
Forms
========================================================================== */
/**
* Define consistent border, margin, and padding.
*/
/* line 253, ../sass/normalize.scss */
fieldset {
border: 1px solid silver;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
/* line 264, ../sass/normalize.scss */
legend {
border: 0;
/* 1 */
padding: 0;
/* 2 */
}
/**
* 1. Correct font family not being inherited in all browsers.
* 2. Correct font size not being inherited in all browsers.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*/
/* line 278, ../sass/normalize.scss */
button,
input,
select,
textarea {
font-family: inherit;
/* 1 */
font-size: 100%;
/* 2 */
margin: 0;
/* 3 */
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
/* line 290, ../sass/normalize.scss */
button,
input {
line-height: normal;
}
/**
* 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 Chrome, Safari 5+, and IE 8+.
* Correct `select` style inheritance in Firefox 4+ and Opera.
*/
/* line 302, ../sass/normalize.scss */
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.
*/
/* line 317, ../sass/normalize.scss */
button,
html input[type="button"],
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button;
/* 2 */
cursor: pointer;
/* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
/* line 327, ../sass/normalize.scss */
button[disabled],
html input[disabled] {
cursor: default;
}
/**
* 1. Address box sizing set to `content-box` in IE 8/9.
* 2. Remove excess padding in IE 8/9.
*/
/* line 337, ../sass/normalize.scss */
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box;
/* 1 */
padding: 0;
/* 2 */
}
/**
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
* (include `-moz` to future-proof).
*/
/* line 348, ../sass/normalize.scss */
input[type="search"] {
-webkit-appearance: textfield;
/* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
/* 2 */
box-sizing: content-box;
}
/**
* Remove inner padding and search cancel button in Safari 5 and Chrome
* on OS X.
*/
/* line 361, ../sass/normalize.scss */
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
/* line 370, ../sass/normalize.scss */
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* 1. Remove default vertical scrollbar in IE 8/9.
* 2. Improve readability and alignment in all browsers.
*/
/* line 380, ../sass/normalize.scss */
textarea {
overflow: auto;
/* 1 */
vertical-align: top;
/* 2 */
}
/* ==========================================================================
Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
/* line 393, ../sass/normalize.scss */
table {
border-collapse: collapse;
border-spacing: 0;
}