fix: remove/move styles in desk.less

frappe/public/build.json

@@ -179,7 +179,6 @@
 		"public/js/frappe/utils/preview_email.js",
 		"public/js/frappe/utils/file_manager.js",
 
-		"public/js/frappe/ui/upload.html",
 		"public/js/frappe/upload.js",
 		"public/js/frappe/ui/tree.js",
 

frappe/public/js/frappe/desk.js

@@ -498,6 +498,7 @@ frappe.Application = Class.extend({
 		if (frappe.utils.is_rtl()) {
 			var ls = document.createElement('link');
 			ls.rel="stylesheet";
+			ls.type = "text/css";
 			ls.href= "assets/css/frappe-rtl.css";
 			document.getElementsByTagName('head')[0].appendChild(ls);
 			$('body').addClass('frappe-rtl');

frappe/public/js/frappe/ui/upload.html

@@ -1,27 +0,0 @@
-<div class="file-upload">
-	<div class="input-upload">
-		<input class="input-upload-file hidden" type="file" {{ opts.allow_multiple ? "multiple" : "" }} name="filedata" />
-		<button class="btn btn-primary btn-sm btn-browse">{%= __("Browse") %}</button>
-	</div>
-	<div class="uploaded-filename hidden" style="width: 100%; margin-top: 12px;"></div>
-	<div class="web-link-wrapper" style="width: calc(100% - 80px);">
-		<span class="text-muted file-upload-or">{%= __("or") %}</span>
-		<div class="input-link" style="width: calc(100% - 30px);">
-			<div class="input-group">
-				<div class="input-group-addon">
-					<span class="hidden-xs">{%= __("Web Link") %}</span>
-					<i class="fa fa-link visible-xs"></i>
-				</div>
-				<input class="form-control" type="text" name="file_url"
-					placeholder="{%= (opts.sample_url || "e.g. http://example.com/somefile.png") %}"/>
-			</div>
-		</div>
-	</div>
-	<div class="private-file hidden">
-		<div class="checkbox">
-		    <label>
-		      <input type="checkbox" checked> {{ __("Private") }}
-		    </label>
-		  </div>
-	</div>
-</div>

frappe/public/less/chat.less

@@ -448,4 +448,11 @@
 textarea.form-control {
     resize: none;
     height: 3.2em;
+}
+
+@media (max-width: 767px) {
+    .nav-stacked > li + li {
+      margin-top: 0px;
+      margin-left: 2px;
+    }
 }

frappe/public/less/desk.less

@@ -128,22 +128,11 @@
 // 	position: relative;
 // }
 
-.input-xs {
-	height: 26px;
-	font-size: @text-medium;
-}
-
-.link-field.ui-front {
-	z-index: inherit;
-}
-
-.modal .hasDatepicker {
-	z-index: 1140;
-}
+// .input-xs {
+// 	height: 26px;
+// 	font-size: @text-medium;
+// }
 
-.link-field.ui-front {
-	z-index: inherit;
-}
 
 // .print-preview {
 // 	padding: 0px;
@@ -152,218 +141,191 @@
 // 	min-height: 11.69in;
 // }
 
-li.user-progress {
-	.progress-chart {
-		width: 50px;
-		margin-top: 8px;
-	}
+// li.user-progress {
+// 	.progress-chart {
+// 		width: 50px;
+// 		margin-top: 8px;
+// 	}
 
-	.progress {
-		margin-bottom: 0;
-		background-color: #fff;
-		border: 1px solid #e5e7e9;
-	}
+// 	.progress {
+// 		margin-bottom: 0;
+// 		background-color: #fff;
+// 		border: 1px solid #e5e7e9;
+// 	}
 
-	.progress-bar {
-		transition: unset;
-		background-color: #98d85b;
-	}
-}
+// 	.progress-bar {
+// 		transition: unset;
+// 		background-color: #98d85b;
+// 	}
+// }
 
 
 /* on small screens, show only icons on top */
-@media (max-width: 767px) {
-	.module-view-layout .nav-stacked > li {
-		float: left;
-		margin-bottom: 5px;
-	}
-
-	.nav-stacked > li + li {
-	  margin-top: 0px;
-	  margin-left: 2px;
-	}
-
-	li.user-progress .progress-chart {
-		width: 25px;
-	}
-
-	li.user-progress {
-		display: none;
-	}
-}
-
-.msg-box {
-	padding: 30px 15px;
-	text-align: center;
-	color: @text-muted;
-}
+// @media (max-width: 767px) {
+// 	.module-view-layout .nav-stacked > li {
+// 		float: left;
+// 		margin-bottom: 5px;
+// 	}
 
-.no-border {
-	border: none !important;
-}
+// 	.nav-stacked > li + li {
+// 	  margin-top: 0px;
+// 	  margin-left: 2px;
+// 	}
 
-.message-row {
-	padding: 10px 15px;
-}
+// 	li.user-progress .progress-chart {
+// 		width: 25px;
+// 	}
 
-.message-row .indicator {
-	margin-left: -5px;
-	margin-right: -20px;
-}
+// 	li.user-progress {
+// 		display: none;
+// 	}
+// }
 
-.message-box {
-	.indicator {
-		margin-right: 15px;
-		margin-top: 7px;
-	}
 
-	.timeline-head {
-		padding: 30px;
-		border: 0px;
-		border-bottom: 1px solid @border-color;
-	}
-}
+// .message-row {
+// 	padding: 10px 15px;
+// }
 
-.page-only-label {
-	margin-top: 5px;
-	text-align: center;
-}
+// .message-row .indicator {
+// 	margin-left: -5px;
+// 	margin-right: -20px;
+// }
 
-.intro-area {
-	padding: 15px 30px;
-}
+// .message-box {
+// 	.indicator {
+// 		margin-right: 15px;
+// 		margin-top: 7px;
+// 	}
 
-.file-upload {
-	.input-group-addon {
-		color: @text-muted;
-		font-size: 12px;
-	}
+// 	.timeline-head {
+// 		padding: 30px;
+// 		border: 0px;
+// 		border-bottom: 1px solid @border-color;
+// 	}
+// }
 
-	.file-upload-or {
-		font-size: 12px;
-		margin: 0px 7px;
-	}
+// .intro-area {
+// 	padding: 15px 30px;
+// }
 
-	.uploaded-filename,
-	.web-link-wrapper,
-	.input-upload,
-	.input-link {
-		display: inline-block;
-		vertical-align: middle;
-	}
+// .file-upload {
+// 	.input-group-addon {
+// 		color: @text-muted;
+// 		font-size: 12px;
+// 	}
 
-	.input-upload {
-		vertical-align: top;
-	}
+// 	.file-upload-or {
+// 		font-size: 12px;
+// 		margin: 0px 7px;
+// 	}
 
-	.uploaded-filename {
-		border: 1px solid @border-color;
-		border-radius: 3px;
-	}
+// 	.uploaded-filename,
+// 	.web-link-wrapper,
+// 	.input-upload,
+// 	.input-link {
+// 		display: inline-block;
+// 		vertical-align: middle;
+// 	}
 
-	.uploaded-filename .btn-group {
-		margin-right: 5px;
-		margin-bottom: 5px;
-	}
+// 	.input-upload {
+// 		vertical-align: top;
+// 	}
 
-	.uploaded-filename-display {
-		max-width: 150px;
-	}
+// 	.uploaded-filename {
+// 		border: 1px solid @border-color;
+// 		border-radius: 3px;
+// 	}
 
-	.file-public-column {
-		flex: 0 0 36px;
-		order: -1;
-		justify-content: flex-end;
-	}
+// 	.uploaded-filename .btn-group {
+// 		margin-right: 5px;
+// 		margin-bottom: 5px;
+// 	}
 
-}
+// 	.uploaded-filename-display {
+// 		max-width: 150px;
+// 	}
 
-.frappe-rtl input ,.frappe-rtl textarea {
-	direction: rtl;
-}
+// 	.file-public-column {
+// 		flex: 0 0 36px;
+// 		order: -1;
+// 		justify-content: flex-end;
+// 	}
 
-.frappe-rtl .checkbox .disp-area {
-	margin-right: -20px;
-	margin-left: 0px;
-}
+// }
 
-.text-editor {
-	height: 400px;
-	background-color: white;
-	border-collapse: separate;
-	border: 1px solid rgb(204, 204, 204);
-	padding: 4px;
-	box-sizing: content-box;
-	-webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset;
-	box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset;
-	border-radius: 3px;
-	overflow: scroll;
-	outline: none;
-}
+// .text-editor {
+// 	height: 400px;
+// 	background-color: white;
+// 	border-collapse: separate;
+// 	border: 1px solid rgb(204, 204, 204);
+// 	padding: 4px;
+// 	box-sizing: content-box;
+// 	-webkit-box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset;
+// 	box-shadow: rgba(0, 0, 0, 0.0745098) 0px 1px 1px 0px inset;
+// 	border-radius: 3px;
+// 	overflow: scroll;
+// 	outline: none;
+// }
 
-.markdown-text-editor {
-	height: 451px;
-	font-family: Monaco, "Courier New", monospace;
-}
+// .markdown-text-editor {
+// 	height: 451px;
+// 	font-family: Monaco, "Courier New", monospace;
+// }
 
-.breadcrumb {
-	font-size: 12px;
-	background-color: #fff;
-}
 
-.breadcrumb.for-file-list {
-	margin-bottom: 0px;
-	padding: 18px 15px;
-	border-bottom: 1px solid @border-color;
-	border-radius: 0px;
-}
+// .breadcrumb.for-file-list {
+// 	margin-bottom: 0px;
+// 	padding: 18px 15px;
+// 	border-bottom: 1px solid @border-color;
+// 	border-radius: 0px;
+// }
 
-.screenshot {
-	border: 1px solid @border-color;
-	box-shadow: 1px 1px 7px rgba(0,0,0,0.15);
-	margin: 8px 0px;
-	max-width: 100%;
-}
+// .screenshot {
+// 	border: 1px solid @border-color;
+// 	box-shadow: 1px 1px 7px rgba(0,0,0,0.15);
+// 	margin: 8px 0px;
+// 	max-width: 100%;
+// }
 
-.help-modal {
-	a {
-		color: @brand-primary;
-	}
+// .help-modal {
+// 	a {
+// 		color: @brand-primary;
+// 	}
 
-	.modal-dialog {
-		width: 768px;
-	}
+// 	.modal-dialog {
+// 		width: 768px;
+// 	}
 
-	.modal-body {
-		padding: 15px 27px;
-	}
+// 	.modal-body {
+// 		padding: 15px 27px;
+// 	}
 
-	.parent-link {
-		&:before {
-			font-family: 'Octicons';
-			content: '\f0a4';
-		}
-	}
+// 	.parent-link {
+// 		&:before {
+// 			font-family: 'Octicons';
+// 			content: '\f0a4';
+// 		}
+// 	}
 
-	.edit-container {
-		padding-bottom: 12px;
-	}
+// 	.edit-container {
+// 		padding-bottom: 12px;
+// 	}
 
-	@media (max-width: @screen-xs) {
-		.modal-dialog {
-			width: auto;
-		}
+// 	@media (max-width: @screen-xs) {
+// 		.modal-dialog {
+// 			width: auto;
+// 		}
 
-		.modal-content {
-			height: auto !important;
-		}
+// 		.modal-content {
+// 			height: auto !important;
+// 		}
 
-		iframe {
-			height: auto;
-			width: 100%;
-		}
-	}
-}
+// 		iframe {
+// 			height: auto;
+// 			width: 100%;
+// 		}
+// 	}
+// }
 
 .search-result {
 	margin-bottom: 24px;

frappe/public/scss/common/modal.scss

@@ -109,6 +109,11 @@ body.modal-open {
 			}
 		}
 	}
+
+	.hasDatepicker {
+		z-index: 1140;
+	}
+
 }
 
 .modal-minimize {

frappe/public/scss/desk/breadcrumb.scss

@@ -2,6 +2,7 @@
 	padding-left: 0;
 	padding-right: 0;
 	background-color: white;
+	font-size: var(--text-sm);
 }
 
 #navbar-breadcrumbs {

frappe/public/scss/desk/controls.scss

@@ -206,3 +206,7 @@ textarea.form-control {
 		width: 700px;
 	}
 }
+
+.link-field.ui-front {
+	z-index: inherit;
+}

frappe/public/scss/desk/global.scss

@@ -413,4 +413,28 @@ kbd {
 
 #freeze.in {
 	opacity: 0.5;
-}
+}
+
+.msg-box {
+	padding: var(--padding-xl) var(--padding-md);
+	text-align: center;
+	color: var(--text-muted);
+}
+
+.no-border {
+	border: none !important;
+}
+
+
+/*rtl styles*/
+
+.frappe-rtl {
+	input, textarea {
+		direction: rtl !important;
+	}
+
+	.checkbox .disp-area {
+		margin-right: -20px;
+		margin-left: 0px;
+	}
+}

frappe/public/scss/desk/grid.scss

@@ -257,14 +257,6 @@
 		.editor-toolbar-align-group {
 			display: none;
 		}
-
-		.text-editor {
-			height: 200px;
-		}
-
-		.markdown-text-editor {
-			height: 251px;
-		}
 	}
 }
 

frappe/public/scss/desk/page.scss

@@ -169,4 +169,9 @@
 			}
 		}
 	}
+}
+
+.page-only-label {
+	margin-top: var(--margin-xs);
+	text-align: center;
 }