p71924506
/
GitCodeTree
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into zoom-bug

This commit is contained in:
Ephemera 2014-06-07 17:06:27 +09:00
parent 6b5d9ac6d4 05a35eb5d0
commit 189a0330d2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gulpfile.js
View File

@ -104,7 +104,8 @@ gulp.task('safari', function() {
gulp.task('firefox', function() { gulp.task('firefox', function() {
return es.merge( return es.merge(
pipe('./icons/**/*', './tmp/firefox/data/icons'), pipe('./icons/**/*', './tmp/firefox/data/icons'),
pipe(['./tmp/inject.js', './tmp/inject.css', './src/firefox/**'], './tmp/firefox/data') pipe(['./tmp/inject.js', './tmp/inject.css', './src/firefox/**.js'], './tmp/firefox/data'),
pipe('./src/firefox/package.json', './tmp/firefox')
) )
}) })

8
src/main.less
View File

@ -195,7 +195,7 @@ html, .header > .container, .repohead > .container, .site > .container {
} }
} }
label { label {
font-weight: normal; font-weight: normal !important;
} }
input[type=text], textarea { input[type=text], textarea {
width: 100%; width: 100%;
@ -206,12 +206,12 @@ html, .header > .container, .repohead > .container, .site > .container {
} }
a.octotree_toggle, a.octotree_opts { a.octotree_toggle, a.octotree_opts {
position: absolute; position: absolute !important;
text-align: center; text-align: center;
line-height: 1; line-height: 1;
z-index: 999992; z-index: 999992;
cursor: pointer; cursor: pointer;
color: black; color: black !important;
& > span { & > span {
line-height: 1; line-height: 1;
@ -219,7 +219,7 @@ a.octotree_toggle, a.octotree_opts {
text-decoration: none; text-decoration: none;
} }
&:hover, &.selected { &:hover, &.selected {
color: #4183C4; color: #4183C4 !important;
} }
} }