Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui

cypress/integration/depends_on.js

@@ -92,7 +92,7 @@ context('Depends On', () => {
 		cy.fill_table_field('child_test_depends_on_field', '1', 'child_test_field', 'Some Value');
 		cy.fill_table_field('child_test_depends_on_field', '1', 'child_dependant_field', 'Some Other Value');
 
-		cy.get('@row1-form_in_grid').find('.octicon-triangle-up').click();
+		cy.get('@row1-form_in_grid').find('.grid-collapse-row').click();
 
 		// set the table to read-only
 		cy.fill_field('test_field', 'Some Other Value');

cypress/integration/file_uploader.js

@@ -29,6 +29,7 @@ context('FileUploader', () => {
 				subjectType: 'drag-n-drop',
 				force: true
 			});
+
 			cy.get_open_dialog().find('.file-name').should('contain', 'example.json');
 			cy.server();
 			cy.route('POST', '/api/method/upload_file').as('upload_file');
@@ -42,6 +43,7 @@ context('FileUploader', () => {
 		open_upload_dialog();
 
 		cy.get_open_dialog().find('.btn-file-upload div:contains("Library")').click();
+		cy.get('.file-filter').type('example.json');
 		cy.get_open_dialog().find('.tree-label:contains("example.json")').first().click();
 		cy.server();
 		cy.route('POST', '/api/method/upload_file').as('upload_file');

cypress/integration/form.js

@@ -44,7 +44,7 @@ context('Form', () => {
 	it('validates behaviour of Data options validations in child table', () => {
 		// test email validations for set_invalid controller
 		let website_input = 'website.in';
-		let expectBackgroundColor = 'rgb(255, 220, 220)';
+		let expectBackgroundColor = 'rgb(255, 245, 245)';
 
 		cy.visit('/app/contact/new');
 		cy.get('.frappe-control[data-fieldname="email_ids"]').as('table');

cypress/integration/list_view.js

@@ -11,6 +11,7 @@ context('List View', () => {
 		cy.go_to_list('ToDo');
 		cy.get('.list-row-container:contains("Pending") .list-row-checkbox').click({ multiple: true, force: true });
 		cy.get('.actions-btn-group button').contains('Actions').should('be.visible').click();
+		cy.wait(300);
 		cy.get('.dropdown-menu li:visible').should('have.length', 8).each((el, index) => {
 			cy.wrap(el).contains(actions[index]);
 		}).then((elements) => {

cypress/integration/list_view_settings.js

@@ -28,7 +28,7 @@ context('List View Settings', () => {
 
 		cy.get('.menu-btn-group button').click({ force: true });
 		cy.get('.dropdown-menu li').filter(':visible').contains('List Settings').click();
-		cy.get('.modal-dialog').should('contain', 'List Settings');
+		cy.get('.modal-dialog').should('contain', 'DocType Settings');
 		cy.get('input[data-fieldname="disable_count"]').uncheck({ force: true });
 		cy.get('input[data-fieldname="disable_sidebar_stats"]').uncheck({ force: true });
 		cy.get('button').filter(':visible').contains('Save').click();

cypress/integration/login.js

@@ -35,7 +35,7 @@ context('Login', () => {
 		cy.get('#login_password').type(Cypress.config('adminPassword'));
 
 		cy.get('.btn-login:visible').click();
-		cy.location('pathname').should('eq', '/app/home');
+		cy.location('pathname').should('eq', '/app');
 		cy.window().its('frappe.session.user').should('eq', 'Administrator');
 	});
 

frappe/public/js/frappe/ui/filters/filter_list.js

@@ -291,9 +291,9 @@ frappe.ui.FilterGroup = class {
 				</div>
 				<hr class="divider"></hr>
 				<div class="filter-action-buttons">
-					<div class="text-muted add-filter">
+					<button class="text-muted add-filter btn btn-xs">
 						${__('+ Add a Filter')}
-					</div>
+					</button>
 					<div>
 						<button class="btn btn-secondary btn-xs clear-filters">
 							${__('Clear Filters')}

frappe/public/scss/desk/filters.scss

@@ -40,7 +40,6 @@
 		justify-content: space-between;
 
 		.add-filter {
-			line-height: 2;
 			cursor: pointer;
 		}
 

frappe/public/scss/desk/index.scss

@@ -16,7 +16,7 @@
 @import "slides";
 @import "toast";
 @import "breadcrumb";
-@import "indicator";
+@import "../common/indicator";
 @import "tags";
 @import "page";
 @import "timeline";

frappe/public/scss/website/index.scss

@@ -8,6 +8,7 @@
 @import 'base';
 @import "../common/buttons";
 @import "../common/modal";
+@import "../common/indicator.scss";
 @import 'multilevel_dropdown';
 @import 'website_image';
 @import 'website_avatar';