github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into node-6.9

Browse source
This commit is contained in:
Shane Kilkelly 2017-02-27 11:25:39 +00:00
commit 8d7c39ff42
4 changed files with 3480 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3470
services/web/npm-shrinkwrap.json generated
View file

File diff suppressed because it is too large Load diff

2
services/web/package.json
View file

@ -93,7 +93,7 @@
"grunt-postcss": "^0.8.0", "grunt-postcss": "^0.8.0",
"grunt-sed": "^0.1.1", "grunt-sed": "^0.1.1",
"sandboxed-module": "0.2.0", "sandboxed-module": "0.2.0",
"sinon": "", "sinon": "^1.17.0",
"timekeeper": "", "timekeeper": "",
"translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master" "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master"
} }

11
services/web/public/coffee/ide/directives/layout.coffee
View file

@ -55,7 +55,7 @@ define [
controls.css({ controls.css({
position: "absolute" position: "absolute"
right: state.east.size right: state.east.size
"z-index": 10 "z-index": 3
}) })
resetOpenStates = () -> resetOpenStates = () ->
@ -106,7 +106,14 @@ define [
, 0 , 0
if attrs.allowOverflowOn? if attrs.allowOverflowOn?
element.layout().allowOverflow(scope.$eval(attrs.allowOverflowOn)) layoutObj = element.layout()
overflowPane = scope.$eval(attrs.allowOverflowOn)
overflowPaneEl = layoutObj.panes[overflowPane]
# Set the panel as overflowing (gives it higher z-index and sets overflow rules)
layoutObj.allowOverflow overflowPane
# Read the given z-index value and increment it, so that it's higher than synctex controls.
overflowPaneZVal = overflowPaneEl.css "z-index"
overflowPaneEl.css "z-index", overflowPaneZVal + 1
resetOpenStates() resetOpenStates()
onInternalResize() onInternalResize()

7
services/web/public/stylesheets/app/editor/review-panel.less
View file

@ -149,12 +149,7 @@
} }
.rp-entry-list { .rp-entry-list {
.rp-size-expanded & { width: 100%;
width: @review-panel-width;
}
.rp-size-mini & {
width: @review-off-width;
}
.rp-state-current-file & { .rp-state-current-file & {
position: absolute; position: absolute;