mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-05-26 10:40:08 +02:00
Merge branch 'master' into node-6.9
This commit is contained in:
3470
services/web/npm-shrinkwrap.json
generated
3470
services/web/npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load Diff
@@ -93,7 +93,7 @@
|
||||
"grunt-postcss": "^0.8.0",
|
||||
"grunt-sed": "^0.1.1",
|
||||
"sandboxed-module": "0.2.0",
|
||||
"sinon": "",
|
||||
"sinon": "^1.17.0",
|
||||
"timekeeper": "",
|
||||
"translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master"
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ define [
|
||||
controls.css({
|
||||
position: "absolute"
|
||||
right: state.east.size
|
||||
"z-index": 10
|
||||
"z-index": 3
|
||||
})
|
||||
|
||||
resetOpenStates = () ->
|
||||
@@ -106,7 +106,14 @@ define [
|
||||
, 0
|
||||
|
||||
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()
|
||||
onInternalResize()
|
||||
|
||||
@@ -149,12 +149,7 @@
|
||||
}
|
||||
|
||||
.rp-entry-list {
|
||||
.rp-size-expanded & {
|
||||
width: @review-panel-width;
|
||||
}
|
||||
.rp-size-mini & {
|
||||
width: @review-off-width;
|
||||
}
|
||||
width: 100%;
|
||||
|
||||
.rp-state-current-file & {
|
||||
position: absolute;
|
||||
|
||||
Reference in New Issue
Block a user