Merge remote-tracking branch 'origin/spartan'

Conflicts:
	test/data/test.db
This commit is contained in:
yackob03 2014-01-08 17:04:40 -05:00
commit 4234ceabe6
10 changed files with 246 additions and 10 deletions

View file

@ -1156,6 +1156,34 @@ p.editable:hover i {
font-size: 1.15em;
}
#tagContextMenu {
display: none;
position: absolute;
z-index: 100000;
outline: none;
}
#tagContextMenu ul {
display: block;
position: static;
margin-bottom: 5px;
}
.tag-controls {
display: inline-block;
margin-right: 20px;
margin-top: 2px;
opacity: 0;
float: right;
-webkit-transition: opacity 200ms ease-in-out;
-moz-transition: opacity 200ms ease-in-out;
transition: opacity 200ms ease-in-out;
}
.tag-heading:hover .tag-controls {
opacity: 1;
}
.right-title {
display: inline-block;
float: right;