Bläddra i källkod

Style drag and drop, also renaming and inputs.

Paulo Reis 9 år sedan
förälder
incheckning
ead190bf23

+ 15 - 6
services/web/public/stylesheets/app/editor/file-tree.less

@@ -67,10 +67,15 @@ aside#file-tree {
 				input {
 				input {
 					line-height: 1.6;
 					line-height: 1.6;
 				}
 				}
-				&.droppable-hover {
-					// TODO pick right color for the OL Beta theme.
-					background-color: fade(@file-tree-droppable-background-color, 60%);
+				&.droppable-hover when (@is-overleaf = false) {
+					background-color: fade(@file-tree-droppable-bg-color, 60%);
 				}
 				}
+
+				&.droppable-hover when (@is-overleaf = true) {
+					background-color: @file-tree-droppable-bg-color;
+					box-shadow: -200px 0 0 @file-tree-droppable-bg-color;
+				}
+
 			}
 			}
 
 
 			i.fa {
 			i.fa {
@@ -130,6 +135,7 @@ aside#file-tree {
 				top: 1px;
 				top: 1px;
 				left: 44px;
 				left: 44px;
 				right: 32px;
 				right: 32px;
+				color: @file-tree-item-input-color;
 				input {
 				input {
 					width: 100%;
 					width: 100%;
 				}
 				}
@@ -182,9 +188,12 @@ aside#file-tree {
 		}
 		}
 	}
 	}
 
 
-	// TODO pick right color for the OL Beta theme.
-	ul.droppable-hover {
-		background-color: fade(@file-tree-droppable-background-color, 60%);
+	ul.droppable-hover when (@is-overleaf = false) {
+		background-color: fade(@file-tree-droppable-bg-color, 60%);
+	}
+	ul.droppable-hover when (@is-overleaf = true) {
+		background-color: @file-tree-droppable-bg-color;
+		box-shadow: -200px 0 0 @file-tree-droppable-bg-color;
 	}
 	}
 }
 }
 
 

+ 2 - 1
services/web/public/stylesheets/core/_common-variables.less

@@ -796,7 +796,7 @@
 @toolbar-border-color: @gray-lighter;
 @toolbar-border-color: @gray-lighter;
 @common-border-color: @gray-lighter;
 @common-border-color: @gray-lighter;
 @editor-border-color: @gray-lighter;
 @editor-border-color: @gray-lighter;
-@file-tree-droppable-background-color: rgb(252, 231, 199);
+@file-tree-droppable-bg-color: rgb(252, 231, 199);
 
 
 @editor-dark-background-color: #333;
 @editor-dark-background-color: #333;
 @editor-dark-toolbar-border-color: #222;
 @editor-dark-toolbar-border-color: #222;
@@ -908,6 +908,7 @@
 @file-tree-item-color            : @gray-darker;
 @file-tree-item-color            : @gray-darker;
 @file-tree-item-toggle-color     : @gray;
 @file-tree-item-toggle-color     : @gray;
 @file-tree-item-icon-color       : @gray-light;
 @file-tree-item-icon-color       : @gray-light;
+@file-tree-item-input-color      : inherit;
 @file-tree-item-folder-color     : lighten(desaturate(@link-color, 10%), 5%);
 @file-tree-item-folder-color     : lighten(desaturate(@link-color, 10%), 5%);
 @file-tree-item-hover-bg         : @gray-lightest;
 @file-tree-item-hover-bg         : @gray-lightest;
 @file-tree-item-selected-bg      : transparent;
 @file-tree-item-selected-bg      : transparent;

+ 11 - 9
services/web/public/stylesheets/core/ol-variables.less

@@ -173,15 +173,17 @@
 @toolbar-icon-btn-hover-shadow  : none;
 @toolbar-icon-btn-hover-shadow  : none;
 
 
 // Editor file-tree
 // Editor file-tree
-@file-tree-bg                    : @ol-blue-gray-4;
-@file-tree-item-color            : #FFF;
-@file-tree-item-toggle-color     : @ol-blue-gray-2;
-@file-tree-item-icon-color       : @ol-blue-gray-2;
-@file-tree-item-folder-color     : @ol-blue-gray-2;
-@file-tree-item-hover-bg         : @ol-blue-gray-5;
-@file-tree-item-selected-bg      : @ol-green;
-@file-tree-multiselect-bg        : @ol-blue;
-@file-tree-multiselect-hover-bg  : @ol-dark-blue;
+@file-tree-bg                   : @ol-blue-gray-4;
+@file-tree-item-color           : #FFF;
+@file-tree-item-input-color     : @ol-blue-gray-5;
+@file-tree-item-toggle-color    : @ol-blue-gray-2;
+@file-tree-item-icon-color      : @ol-blue-gray-2;
+@file-tree-item-folder-color    : @ol-blue-gray-2;
+@file-tree-item-hover-bg        : @ol-blue-gray-5;
+@file-tree-item-selected-bg     : @ol-green;
+@file-tree-multiselect-bg       : @ol-blue;
+@file-tree-multiselect-hover-bg : @ol-dark-blue;
+@file-tree-droppable-bg-color   : tint(@ol-green, 5%);
 //== Colors
 //== Colors
 //
 //
 //## Gray and brand colors for use across Bootstrap.
 //## Gray and brand colors for use across Bootstrap.