diff --git a/services/web/app/views/project/editor/history.pug b/services/web/app/views/project/editor/history.pug
index 148a28f32e..c72c47135d 100644
--- a/services/web/app/views/project/editor/history.pug
+++ b/services/web/app/views/project/editor/history.pug
@@ -72,7 +72,7 @@ script(type="text/ng-template", id="historyV2DeleteLabelModalTemplate")
.modal-body
.alert.alert-danger(ng-show="state.error.message") {{ state.error.message}}
.alert.alert-danger(ng-show="state.error && !state.error.message") #{translate("generic_something_went_wrong")}
- p.help-block(ng-if="labelDetails")
+ p(ng-if="labelDetails")
| #{translate("history_are_you_sure_delete_label")}
strong "{{ labelDetails.comment }}"
| ?
diff --git a/services/web/app/views/project/editor/history/fileTreeV2.pug b/services/web/app/views/project/editor/history/fileTreeV2.pug
index 4deacd6489..aecd08cc2f 100644
--- a/services/web/app/views/project/editor/history/fileTreeV2.pug
+++ b/services/web/app/views/project/editor/history/fileTreeV2.pug
@@ -22,7 +22,7 @@ script(type="text/ng-template", id="historyFileEntityTpl")
.history-file-entity-wrapper
a.history-file-entity-link(
href
- ng-click="$ctrl.handleClick()"
+ ng-click="$ctrl.isSelected ? '' : $ctrl.handleClick()"
ng-class="{ 'history-file-entity-link-selected': $ctrl.isSelected }"
)
span.history-file-entity-name-container
diff --git a/services/web/frontend/stylesheets/app/editor/history-v2.less b/services/web/frontend/stylesheets/app/editor/history-v2.less
index 8f8c300ca0..f183c3ccca 100644
--- a/services/web/frontend/stylesheets/app/editor/history-v2.less
+++ b/services/web/frontend/stylesheets/app/editor/history-v2.less
@@ -78,7 +78,7 @@
.history-entry-day {
display: block;
background-color: @history-entry-day-bg;
- color: #fff;
+ color: @history-entry-day-color;
padding: 5px 10px;
line-height: 1;
position: sticky;
@@ -331,6 +331,7 @@
color: @file-tree-item-color;
line-height: @file-tree-line-height;
&:hover {
+ .fake-full-width-bg(@file-tree-item-hover-bg);
background-color: @file-tree-item-hover-bg;
color: @file-tree-item-color;
text-decoration: none;
@@ -340,20 +341,18 @@
outline: none;
text-decoration: none;
}
- &:hover {
- .fake-full-width-bg(@file-tree-item-hover-bg);
- }
}
.history-file-entity-link-selected {
background-color: @file-tree-item-selected-bg;
font-weight: bold;
color: #fff;
.fake-full-width-bg(@file-tree-item-selected-bg);
- &:hover {
- background-color: @file-tree-item-hover-bg;
- }
+ &:hover,
&:focus {
- color: @file-tree-item-focus-selected-color;
+ background-color: @file-tree-item-selected-bg;
+ .fake-full-width-bg(@file-tree-item-selected-bg);
+ color: #fff;
+ pointer-events: none;
}
}
.history-file-entity-name-container {
diff --git a/services/web/frontend/stylesheets/app/editor/review-panel.less b/services/web/frontend/stylesheets/app/editor/review-panel.less
index 302298323e..468f5c5f7b 100644
--- a/services/web/frontend/stylesheets/app/editor/review-panel.less
+++ b/services/web/frontend/stylesheets/app/editor/review-panel.less
@@ -942,25 +942,17 @@
.review-icon {
display: inline-block;
- background: url('/img/review-icon-sprite-ol.png') top/30px no-repeat;
+ background: url('/img/ol-icons/review-icon-dark-theme.svg') top/30px no-repeat;
width: 30px;
- background-position-y: -30px;
&::before {
content: '\00a0'; // Non-breakable space. A non-breakable character here makes this icon work like font-awesome.
}
-
- @media (min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image: url('/img/review-icon-sprite-ol@2x.png');
- }
}
.review-icon when (@is-overleaf-light = true) {
- background-position-y: 0;
- .toolbar .btn-full-height.active &,
- .toolbar .btn-full-height:active & {
- background-position-y: -30px;
- }
+ background: url('/img/ol-icons/review-icon-light-theme.svg') top/30px
+ no-repeat;
}
.resolved-comments-toggle {
diff --git a/services/web/frontend/stylesheets/core/ol-light-variables.less b/services/web/frontend/stylesheets/core/ol-light-variables.less
index 95c08f0c4c..48199518d6 100644
--- a/services/web/frontend/stylesheets/core/ol-light-variables.less
+++ b/services/web/frontend/stylesheets/core/ol-light-variables.less
@@ -1,12 +1,4 @@
// Styleguide colors
-@ol-blue-gray-0 : #F4F5FB;
-@ol-blue-gray-1 : #DFE2E8;
-@ol-blue-gray-2 : #9DA7B7;
-@ol-blue-gray-3 : #727E91;
-@ol-blue-gray-4 : #455265;
-@ol-blue-gray-5 : #2C3645;
-@ol-blue-gray-6 : #1E2530;
-
@ol-green : #138A07;
@ol-dark-green : #004A0E;
@ol-blue : #3E70BB;
@@ -19,7 +11,6 @@
// Sidebar
@sidebar-bg : #FFF;
@sidebar-color : @ol-blue-gray-2;
-@sidebar-link-color : @ol-blue-gray-3;
@sidebar-active-bg : @ol-green;
@sidebar-active-color : #FFF;
@sidebar-hover-bg : @ol-blue-gray-1;
@@ -43,7 +34,6 @@
@file-tree-line-height : 2.05;
@file-tree-item-color : @ol-blue-gray-3;
@file-tree-item-focus-color : @file-tree-item-color;
-@file-tree-item-focus-selected-color : #FFF;
@file-tree-item-selected-color : #FFF;
@file-tree-item-input-color : @ol-blue-gray-2;
@file-tree-item-toggle-color : @ol-blue-gray-2;
@@ -88,6 +78,8 @@
@toolbar-icon-btn-hover-color : @ol-blue-gray-3;
@editor-header-logo-background : url(/img/ol-brand/overleaf-o.svg) center / contain no-repeat;
@project-name-color : @ol-blue-gray-3;
+@project-rename-link-color: @ol-blue-gray-3;
+@project-rename-link-color-hover: @ol-blue-gray-4;
@pdf-bg : @ol-blue-gray-0;
@logs-pane-bg: @ol-blue-gray-1;
@@ -114,7 +106,6 @@
// v2 History
@history-toolbar-color : @ol-blue-gray-3;
-@history-entry-day-bg : @ol-blue-gray-2;
@history-base-bg : @ol-blue-gray-0;
@history-file-badge-bg : rgba(0, 0, 0, .25);
@history-file-badge-color : #FFF;
diff --git a/services/web/frontend/stylesheets/core/variables.less b/services/web/frontend/stylesheets/core/variables.less
index 2d8fe2f0b9..1481a332e2 100644
--- a/services/web/frontend/stylesheets/core/variables.less
+++ b/services/web/frontend/stylesheets/core/variables.less
@@ -1000,7 +1000,6 @@
@file-tree-line-height: 2.05;
@file-tree-item-color: #fff;
@file-tree-item-focus-color: @file-tree-item-color;
-@file-tree-item-focus-selected-color: @file-tree-item-color;
@file-tree-item-selected-color: @file-tree-item-color;
@file-tree-item-toggle-color: @ol-blue-gray-2;
@file-tree-item-icon-color: @ol-blue-gray-2;
@@ -1019,7 +1018,7 @@
@outline-item-h-padding: @outline-h-rhythm * 0.25;
@outline-line-guide-color: @ol-blue-gray-3;
@outline-expand-collapse-color: @ol-blue-gray-2;
-@outline-no-items-color: @ol-blue-gray-2;
+@outline-no-items-color: @file-tree-item-color;
@outline-header-hover-bg: @ol-blue-gray-6;
@outline-highlight-bg: tint(@file-tree-bg, 15%);
@vertical-resizable-resizer-bg: @ol-blue-gray-5;
@@ -1097,11 +1096,12 @@
@history-entry-selected-label-bg-color: #fff;
@history-entry-selected-label-color: @ol-blue;
@history-entry-selected-pseudo-label-color: @ol-green;
-@history-entry-day-bg: @ol-blue-gray-2;
+@history-entry-day-bg: @ol-blue-gray-1;
+@history-entry-day-color: @ol-blue-gray-3;
@history-entry-selected-bg: @ol-green;
@history-entry-handle-bg: darken(@ol-green, 10%);
@history-entry-handle-height: 8px;
-@history-base-color: @ol-blue-gray-2;
+@history-base-color: @ol-blue-gray-3;
@history-highlight-color: @ol-type-color;
@history-toolbar-bg-color: @editor-toolbar-bg;
@history-toolbar-color: #fff;
diff --git a/services/web/public/img/ol-icons/review-icon-dark-theme.svg b/services/web/public/img/ol-icons/review-icon-dark-theme.svg
new file mode 100644
index 0000000000..29f31aeaa9
--- /dev/null
+++ b/services/web/public/img/ol-icons/review-icon-dark-theme.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/services/web/public/img/ol-icons/review-icon-light-theme.svg b/services/web/public/img/ol-icons/review-icon-light-theme.svg
new file mode 100644
index 0000000000..46b91980e0
--- /dev/null
+++ b/services/web/public/img/ol-icons/review-icon-light-theme.svg
@@ -0,0 +1 @@
+
\ No newline at end of file