github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-15 09:42:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3073 from overleaf/pr-highlight-styling-and-beta

Browse source 
New highlight styling + highlight in beta

GitOrigin-RevId: e5d308bd725b4a1cfc4f0e564af05663ac4188dc
This commit is contained in:
Paulo Jorge Reis 2020-08-06 10:05:45 +01:00 committed by Copybot
parent 4e3a9d4fa8
commit 414f7397fa
5 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/frontend/js/ide/editor/directives/aceEditor.js
View file

@ -556,7 +556,6 @@ App.directive('aceEditor', function(
let currentFirstVisibleRow = null let currentFirstVisibleRow = null
const emitMiddleVisibleRowChanged = () => { const emitMiddleVisibleRowChanged = () => {
if (!window.user.alphaProgram) return
const firstVisibleRow = editor.getFirstVisibleRow() const firstVisibleRow = editor.getFirstVisibleRow()
if (firstVisibleRow === currentFirstVisibleRow) return if (firstVisibleRow === currentFirstVisibleRow) return

2
services/web/frontend/js/ide/outline/OutlineManager.js
View file

@ -39,7 +39,6 @@ class OutlineManager {
}) })
scope.$on('cursor:editor:update', (event, cursorPosition) => { scope.$on('cursor:editor:update', (event, cursorPosition) => {
if (!window.user.alphaProgram) return
if (this.ignoreNextCursorUpdate) { if (this.ignoreNextCursorUpdate) {
this.ignoreNextCursorUpdate = false this.ignoreNextCursorUpdate = false
return return
@ -49,7 +48,6 @@ class OutlineManager {
}) })
scope.$on('scroll:editor:update', (event, middleVisibleRow) => { scope.$on('scroll:editor:update', (event, middleVisibleRow) => {
if (!window.user.alphaProgram) return
if (this.ignoreNextScroll) { if (this.ignoreNextScroll) {
this.ignoreNextScroll = false this.ignoreNextScroll = false
return return

2
services/web/frontend/stylesheets/app/editor/outline.less
View file

@ -182,7 +182,7 @@
} }
.outline-item-link-highlight { .outline-item-link-highlight {
font-weight: bold; background-color: @outline-highlight-bg;
} }
.outline-caret-icon { .outline-caret-icon {

1
services/web/frontend/stylesheets/core/ol-light-variables.less
View file

@ -60,6 +60,7 @@
// File outline // File outline
@outline-line-guide-color: @ol-blue-gray-1; @outline-line-guide-color: @ol-blue-gray-1;
@outline-header-hover-bg: @file-tree-item-hover-bg; @outline-header-hover-bg: @file-tree-item-hover-bg;
@outline-highlight-bg: mix(@file-tree-bg, @ol-blue-gray-1);
@vertical-resizable-resizer-bg: @ol-blue-gray-1; @vertical-resizable-resizer-bg: @ol-blue-gray-1;
@vertical-resizable-resizer-hover-bg: @file-tree-item-hover-bg; @vertical-resizable-resizer-hover-bg: @file-tree-item-hover-bg;

2
services/web/frontend/stylesheets/core/variables.less
View file

@ -1020,7 +1020,7 @@
@outline-expand-collapse-color: @ol-blue-gray-2; @outline-expand-collapse-color: @ol-blue-gray-2;
@outline-no-items-color: @ol-blue-gray-2; @outline-no-items-color: @ol-blue-gray-2;
@outline-header-hover-bg: @ol-blue-gray-6; @outline-header-hover-bg: @ol-blue-gray-6;
@outline-highlight-bg: tint(@file-tree-bg, 15%);
@vertical-resizable-resizer-bg: @ol-blue-gray-5; @vertical-resizable-resizer-bg: @ol-blue-gray-5;
@vertical-resizable-resizer-hover-bg: @ol-blue-gray-6; @vertical-resizable-resizer-hover-bg: @ol-blue-gray-6;