Merge branch 'version-15-hotfix' into version-15

frappe · Oct 20, 2023 · b8c1f49 · b8c1f49
2 parents 2b8c048 + 21b8ce3
commit b8c1f49
Show file tree

Hide file tree

Showing 22 changed files with 147 additions and 106 deletions.
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -124,12 +124,12 @@ export default class OnboardingWidget extends Widget {
 			set_description();
 
 			if (step.intro_video_url) {
-				$(`<button class="btn btn-primary btn-sm">${__("Watch Tutorial")}</button>`)
+				$(`<button class="btn btn-default btn-sm">${__("Watch Tutorial")}</button>`)
 					.appendTo(this.step_footer)
 					.on("click", toggle_video);
 			} else {
 				$(
-					`<button class="btn btn-primary btn-sm">${__(
+					`<button class="btn btn-default btn-sm">${__(
 						step.action_label || step.action
 					)}</button>`
 				)

diff --git a/frappe/public/scss/desk/avatar.scss b/frappe/public/scss/desk/avatar.scss
@@ -67,6 +67,7 @@
 .avatar {
 	display: inline-block;
 	vertical-align: middle;
+	line-height: 1;
 }
 
 .avatar-frame {

diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
@@ -194,7 +194,7 @@ $check-icon-dark: url("data:image/svg+xml, <svg viewBox='0 0 8 7' fill='none' xm
 		}
 	}
 	.comment-input-wrapper .ql-editor.ql-blank::before {
-		color: var(--text-muted);
+		color: var(--text-color);
 	}
 	// --appreciation-color: var(--dark-green-100);
 	// --appreciation-bg: var(--dark-green-600);

diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
@@ -551,9 +551,9 @@ body {
 		cursor: pointer;
 
 		&:hover {
-			--icon-stroke: var(--gray-600);
+			--icon-stroke: var(--invert-neutral);
 			.widget-title {
-				color: var(--gray-600) !important;
+				color: var(--invert-neutral) !important;
 			}
 		}
 
@@ -600,7 +600,7 @@ body {
 			.link-content {
 				flex: 1;
 				&:hover {
-					color: var(--gray-600);
+					color: var(--invert-neutral);
 				}
 			}
 

diff --git a/frappe/public/scss/desk/navbar.scss b/frappe/public/scss/desk/navbar.scss
@@ -1,7 +1,6 @@
 .navbar {
 	height: $navbar-height;
 	background: var(--navbar-bg);
-	box-shadow: var(--shadow-sm);
 	border-bottom: 1px solid var(--border-color);
 	padding: 0;
 	.navbar-brand {

diff --git a/frappe/public/scss/desk/page.scss b/frappe/public/scss/desk/page.scss
@@ -58,9 +58,13 @@
 		height: var(--btn-height);
 		margin-left: var(--margin-sm, 8px);
 		border-radius: var(--border-radius);
-		display: flex;
-		align-items: center;
-		gap: 8px;
+		line-height: 1;
+		padding: 4px 8px;
+		&, & .hidden-xs {
+			display: flex;
+			align-items: center;
+			gap: 6px;
+		}
 	}
 	.btn:not(.icon-btn) {
 		padding: 4px 8px;

diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss
@@ -183,7 +183,7 @@ body[data-route^="Module"] .main-menu {
 }
 
 .layout-side-section {
-	@include get_textstyle("base", "regular");
+	@include get_textstyle("sm", "regular");
 	padding-right: 30px;
 
 	&.hide-sidebar {
@@ -415,8 +415,7 @@ body[data-route^="Module"] .main-menu {
 	.data-pill {
 		background-color: unset;
 		box-shadow: none;
-		padding: 0;
-		padding-left: var(--padding-md);
+		padding:0 var(--padding-xs) 0 var(--padding-md);
 	}
 }
 
@@ -467,6 +466,11 @@ body[data-route^="Module"] .main-menu {
 	width: unset;
 	height: unset;
 	margin-right: 0;
+	padding: var(--padding-xs) !important;
+	border-radius: var(--border-radius-full);
+	&:hover {
+		background-color: var(--subtle-fg);
+	}
 	&:focus {
 		box-shadow: none;
 	}

diff --git a/frappe/public/scss/desk/slides.scss b/frappe/public/scss/desk/slides.scss
@@ -72,11 +72,10 @@
 }
 
 .slides-wrapper {
-	width: 520px;
 	max-width: 520px;
 	background: var(--card-bg);
 	padding: var(--padding-xl);
-	border: 1px solid var(--gray-400);
+	border: 1px solid var(--border-color);
 	border-radius: var(--border-radius-md);
 
 	.slide-wrapper:focus {

diff --git a/frappe/public/scss/desk/tree.scss b/frappe/public/scss/desk/tree.scss
@@ -1,5 +1,19 @@
 .tree {
 	padding: var(--padding-sm);
+	.btn-group {
+		.btn {
+			box-shadow: none;
+			outline: 1px solid var(--btn-group-border-color);
+
+			&:not(:first-child) {
+				margin-left: 1px;
+			}
+
+			&:focus {
+				outline: 2px solid var(--dark-border-color);
+			}
+		}
+	}
 }
 
 .tree li {

diff --git a/frappe/public/scss/login.bundle.scss b/frappe/public/scss/login.bundle.scss
@@ -4,6 +4,9 @@ body {
 	@include media-breakpoint-up(sm) {
 		background-color: var(--bg-light-gray);
 	}
+	.web-footer {
+		display: none;
+	}
 }
 
 .for-forgot,
@@ -18,17 +21,9 @@ body {
 .for-login-with-email-link,
 .for-signup,
 .for-email-login {
-	padding: max(10vh, 60px) 0;
-
-	@include media-breakpoint-up(sm) {
-		.page-card {
-			padding-top: 45px;
-			padding-bottom: 45px;
-			background-color: #fff;
-		}
-	}
-
 	.page-card {
+		padding: 45px 10px;
+		background-color: #fff;
 		max-width: 400px;
 		margin: 0 auto;
 		border-radius: var(--border-radius-md);
@@ -100,13 +95,6 @@ body {
 
 				input {
 					padding-left: 35px;
-					&:autofill, &:-webkit-autofill {
-						-webkit-background-clip: text;
-    					-webkit-text-fill-color: var(--text-color);
-						-webkit-box-shadow: 0 0 0 30px var(--gray-200) inset !important;
-						outline: 1px solid var(--gray-400);
-						transition: background-color 5000s ease-in-out 0s;
-					  }
 				}
 
 				.toggle-password {
@@ -172,26 +160,9 @@ body {
 		}
 	}
 
-	.page-card-head {
-		margin: 0 auto;
-		text-align: center;
-		font-size: var(--text-xl);
-		font-weight: 600;
-		margin-bottom: 2.5rem;
-
-		img {
-			max-height: 42px;
-		}
-
-		h4 {
-			margin-top: 1rem;
-			font-size: var(--text-xl);
-			color: var(--text-color);
-		}
-	}
-
 	.sign-up-message {
-		margin-top: 2rem;
+		margin-top: 1rem;
+		margin-bottom: 0;
 		color: var(--text-light);
 		@include get_textstyle("base", "regular");
 		a {
@@ -224,3 +195,23 @@ body {
 		}
 	}
 }
+
+.page-card-head {
+	padding: max(5vh, 30px) 0 14px 0px;
+	margin: 0 auto;
+	text-align: center;
+	font-size: var(--text-xl);
+	font-weight: 600;
+
+	img {
+		max-height: 42px;
+	}
+
+	h4 {
+		margin-top: 1rem;
+		font-size: var(--text-xl);
+		font-weight: var(--weight-semibold);
+		letter-spacing: 0.01em;
+		color: var(--text-color);
+	}
+}
diff --git a/frappe/public/scss/website/base.scss b/frappe/public/scss/website/base.scss
@@ -5,12 +5,21 @@ html {
 body {
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
-	font-size: 16px;
+	@include get_textstyle("base", "regular");
 	color: $body-color;
 	display: flex;
 	flex-direction: column;
 }
 
+kbd {
+	background-color: var(--control-bg);
+	font-family: var(--font-stack);
+	color: var(--text-light);
+	line-height: 1.2em;
+	letter-spacing: 0.02em;
+	height: 20px;
+	padding: 4px 8px;
+}
 img {
 	max-width: 100%;
 	height: auto;
@@ -86,6 +95,7 @@ h4 {
 
 	a {
 		color: $body-color;
+		text-decoration: underline !important;
 	}
 }
 

diff --git a/frappe/public/scss/website/blog.scss b/frappe/public/scss/website/blog.scss
@@ -117,14 +117,19 @@
 	}
 
 	.blog-feedback {
-		display: flex;
-
+		display: inline-flex;
 		.like-icon {
 			cursor: pointer;
 
-			&.gray use {
-				fill: var(--gray-600);
-				stroke: none;
+			use {
+				stroke: var(--gray-800);
+				--icon-stroke: transparent;
+			}
+		}
+		.like-icon.liked {
+			use {
+				stroke: var(--gray-800);
+				--icon-stroke: var(--red-500);
 			}
 		}
 	}

diff --git a/frappe/public/scss/website/css_variables.scss b/frappe/public/scss/website/css_variables.scss
@@ -1,21 +1,12 @@
 @import '../common/css_variables.scss';
+@import "../espresso/colors";
+@import "../espresso/spacing";
+@import "../espresso/typography";
+@import "../espresso/shadows";
+@import "../espresso/borders";
 
+// Deprecated but remove after all use is removed as well.
 :root {
-	--gray-50: #{$gray-50};
-	--gray-100: #{$gray-100};
-	--gray-200: #{$gray-200};
-	--gray-300: #{$gray-300};
-	--gray-400: #{$gray-400};
-	--gray-500: #{$gray-500};
-	--gray-600: #{$gray-600};
-	--gray-700: #{$gray-700};
-	--gray-800: #{$gray-800};
-	--gray-900: #{$gray-900};
-
-	--black: #{$black};
-	--primary: #{$primary};
-	--primary-color: #{$primary};
-	--primary-light: #{$primary-light};
 	--light: #{$light};
 
 	--font-size-xs: #{$font-size-xs};

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
@@ -87,6 +87,7 @@
 
 .dropdown-item {
 	border-radius: $dropdown-border-radius;
+	padding : var(--dropdown-padding) !important;
 }
 
 .dropdown-item:active {
@@ -166,6 +167,10 @@ a.card {
 	text-decoration: none;
 }
 
+a.card-link {
+	text-decoration: underline;
+}
+
 .hidden {
 	@extend .d-none;
 }

diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
@@ -35,7 +35,7 @@
 
 .account-info {
 	background-color: var(--fg-color);
-	box-shadow: var(--card-shadow);
+	border: 1px solid var(--border-color);
 	border-radius: var(--border-radius-md);
 	padding: var(--padding-sm) 25px;
 

diff --git a/frappe/public/scss/website/navbar.scss b/frappe/public/scss/website/navbar.scss
@@ -1,12 +1,10 @@
 .navbar {
-	padding-left: 0;
-	padding-right: 0;
+	padding: 0;
 }
 
 @media (max-width: map-get($grid-breakpoints, "lg")) {
 	.navbar {
-		padding-left: 1rem;
-		padding-right: 1rem;
+		padding: 0 1rem;
 	}
 }