mirror of
https://github.com/wassname/HackFlowy.git
synced 2026-07-08 00:10:39 +08:00
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:
+106
-62
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user