feat: desk refresh by maharshivpatel [frappe] PR#22191 (!606) · Merge requests · Dokos / Dodock

Bot Dokos requested to merge ft-pr-22191 into develop Sep 22, 2023

From: https://github.com/frappe/frappe/pull/22191
Date: 2023-09-22 12:56:11+05:30

Merge pull request #22191 from maharshivpatel/feat-desk-refresh
fix(minor): change comment box color to control bg
chore: remove form builder not important and flaky ui test.
fix(minor): datatable header cell bg color
fix: sidebar tags as per espresso
fix: datepicker style as per espresso
fix(minor): form tour driver dark theme background color.
fix(minor): dark mode checkbox disabled state.
fix: awesome_bar & sidebar cypress test as per espresso.
fix: cypress, dark mode, grid search, timeline
fix: don't override label in set_action when icon is present
test: update tests for ui changes
fix: dark mode and misc
fix: dark mode, timeline, logo colors
fix: workspace title and onboarding widget typography
fix: typography added letter-spacing
style: changed primary arrow color
style: cosmetic changes in form builder
fix: contrast issue on major/prominent parts of design
fix: updated sidebar
fix: change datatable styles to match new design
fix: list view hover state and icons - updated icons and style for hover and focus state.
fix: grid padding and icon positions
fix(minor): update style for Configure Columns modal
fix: workspace widgets for new design
fix(minor): minor style changes
fix: handle onboarding widget different states
fix: issues shared by frappe team's initial review
fix(minor): remove unused timeline css
fix: form comment and timeline fixes
fix: made workspace indicator color customizable
fix: updated comment and activity section
fix: update form sidebar html for new design
fix(minor): updated minimal styles in datatable for new design
fix: update quill editor
fix: update form, grid and sidebar to new design
fix(minor): update list view to new design
fix: update icons to espresso for different pages
fix: update form, controls, dropdown styles
fix(minor): button text style
fix: update buttons, breadcrumb and global scss
fix(minor): import _borders file in variables
fix: workspace edit mode and private sidebar indicator
fix: update workspace icons for new designs
fix(minor): updated workspace widgets
fix: updated onboarding widget style
fix: updated workspace desktop and global css
fix: update indicator styles to match new design
fix: update page styles to new design
fix: update old icons to match new primary color
fix: update avatar style and notification popover
fix: update css_variable file for new design
fix: add espresso icons in frappe.utils.icon
fix: update navbar size and styles
fix(minor): change icons to espresso icons
fix: update website / login page design
fix(minor): updated variables file to use espresso files
fix: add espresso icons
fix: add font styles for new design
fix: add files spacing and borders as per new design
fix: add drop shadows based for new design
fix: add color variables for espresso
fix: add Inter V fonts for new design

Diagnostics

pre-commit failed for source commit: 3279e50c203b05ca8a89024803b9ce7ac1d986c4
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/ui/page.js


pre-commit failed for source commit: 6e078f5f61fb0d93095cb11a2a25eeddd5459734
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/scss/desk/desktop.scss


pre-commit failed for source commit: b374d2a9f61460eae6ae49064576c54f7e293288
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/views/workspace/workspace.js


pre-commit failed for source commit: 025a5d57cf207244bc595fa1ca259c7863946bf0
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/scss/element/checkbox.scss
Fixing frappe/public/scss/desk/navbar.scss


pre-commit failed for source commit: f6ebdc24f4dd08e95fab9f7d04ccbab102b21463
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/list/list_view.js


pre-commit failed for source commit: fd6c0e229130a469183a67a2794ec2769187807c
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/scss/common/grid.scss


pre-commit failed for source commit: 5f1ed0aa5409cba2b7683b66e121b284ae5d87eb
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/scss/desk/frappe_datatable.scss


pre-commit failed for source commit: cca791e947387341c6739f4adec9a9ae8b6561bf
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/form/footer/form_timeline.js


pre-commit failed for source commit: 1260da523c56b4791739e262785776561ba32ef6
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/utils/utils.js


pre-commit failed for source commit: 740c2ffc6b0cbfbfc5da49ef6d21736c007af45d
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/js/frappe/form/grid_row.js

prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/form/grid_row.js


pre-commit failed for source commit: 399ce7eb3b64f69c3744c576308c86c5e456d03e
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/scss/espresso/_typography.scss


pre-commit failed for source commit: 6590d24151c556321489b7c362d78bb224107c5b
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/js/frappe/form/footer/form_timeline.js

prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/form/footer/form_timeline.js


pre-commit failed for source commit: 969fd71d019a3d1773e5bde21e018ec25090ce5d
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/scss/desk/frappe_datatable.scss


pre-commit failed for source commit: 2cb6076b59b99ad0a2d732b99374792afbd72a01
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing frappe/public/js/frappe/form/grid.js

prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/form/grid.js

Checkout instructions

# Checkout locally
git fetch upstream
git switch ft-pr-22191

# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

feat: desk refresh by maharshivpatel [frappe] PR#22191

Diagnostics

Merge request reports