Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: automatic logo width (backport #26273) #26278

Merged
merged 3 commits into from May 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 1, 2024

Before

Logo is set to a fixed with and height. Unless the logo is square, it will be distorted. The user has to figure out

(1) that the logo width is supposed to be entered in pixels,
(2) what the fixed height of the logo is, and
(3) what the width of their logo must be, relative to the fixed height.

This is all unnecessary, because CSS has width: auto.

Bildschirmfoto 2024-05-01 um 14 27 06

After

The user can upload any logo, the height is fixed to fit in the navbar, the browser automatically sets the appropriate width.

Bildschirmfoto 2024-05-01 um 14 25 20


This is an automatic backport of pull request #26273 done by [Mergify](https://mergify.com).

(cherry picked from commit 02ea846)

# Conflicts:
#	frappe/core/doctype/navbar_settings/navbar_settings.json
@mergify mergify bot requested a review from a team as a code owner May 1, 2024 13:47
@mergify mergify bot added the conflicts label May 1, 2024
@mergify mergify bot requested review from akhilnarang and removed request for a team May 1, 2024 13:47
Copy link
Contributor Author

mergify bot commented May 1, 2024

Cherry-pick of 02ea846 has failed:

On branch mergify/bp/version-15-hotfix/pr-26273
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 02ea846cd4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/core/doctype/navbar_settings/navbar_settings.py
	modified:   frappe/public/js/frappe/ui/toolbar/navbar.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/navbar_settings/navbar_settings.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the add-test-cases Add test case to validate fix or enhancement label May 1, 2024
@ankush ankush enabled auto-merge (squash) May 3, 2024 14:04
@ankush
Copy link
Member

ankush commented May 3, 2024

@Mergifyio update

Copy link
Contributor Author

mergify bot commented May 3, 2024

update

✅ Branch has been successfully updated

@ankush ankush merged commit f60be3c into version-15-hotfix May 3, 2024
17 of 18 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-26273 branch May 3, 2024 14:24
frappe-pr-bot pushed a commit that referenced this pull request May 7, 2024
# [15.26.0](v15.25.0...v15.26.0) (2024-05-07)

### Bug Fixes

* allow accessing reports without roles ([b2950d2](b2950d2))
* Apply configured perms on address list ([#26334](#26334)) ([#26336](#26336)) ([e2c8436](e2c8436))
* args is a stringified JSON ([5f25ae6](5f25ae6))
* automatic logo width ([#26273](#26273)) ([#26278](#26278)) ([f60be3c](f60be3c))
* changes for scheduler reliability (backport [#26292](#26292)) ([#26294](#26294)) ([d72c6ec](d72c6ec))
* **Data Import:** don't rely on permission for Data Import Log (backport [#26228](#26228)) ([#26251](#26251)) ([113de20](113de20))
* **Data Import:** scheduler not needed in dev mode (backport [#24667](#24667)) ([#26265](#26265)) ([9ce789e](9ce789e))
* disabled user login from login via link feature ([#26134](#26134)) ([#26141](#26141)) ([3ac1eda](3ac1eda))
* don't add creation index if one exists ([#26295](#26295)) ([f183a31](f183a31))
* **Geo:** change Canadian dates to ISO 8601 format ([9dec74b](9dec74b))
* init db conn for unbuffered cursor if not set ([#26220](#26220)) ([#26257](#26257)) ([1fac55d](1fac55d))
* like filter from meta filters ([#26311](#26311)) ([#26313](#26313)) ([13535a6](13535a6))
* lstrip for query writes detection ([#26180](#26180)) ([#26253](#26253)) ([97355f9](97355f9))
* misc sys health report fixes (backport [#26262](#26262)) ([#26290](#26290)) ([889eb9a](889eb9a))
* **Navbar Settings:** reload page after save ([#26274](#26274)) ([#26276](#26276)) ([20b3643](20b3643))
* **oauth2:** refresh token is optional ([#26266](#26266)) ([#26272](#26272)) ([e3f15d0](e3f15d0)), closes [/www.rfc-editor.org/rfc/rfc6749#section-5](https://github.com//www.rfc-editor.org/rfc/rfc6749/issues/section-5)
* only redirect to same domain ([#26304](#26304)) ([#26306](#26306)) ([475189c](475189c))
* QB name in error message ([#26345](#26345)) ([#26348](#26348)) ([6e8de81](6e8de81))
* reportview average of ints should be float ([#26284](#26284)) ([#26288](#26288)) ([11f041b](11f041b))
* Treeview DB lookup should perform the same preperation operations as method update_nsm in file nestedset.py ([#26199](#26199)) ([7d25aed](7d25aed))

### Features

* improved update notifications (backport [#26314](#26314)) ([#26320](#26320)) ([24be120](24be120))
* link field filter backport v15 ([#25966](#25966)) ([9a15191](9a15191)), closes [#22844](#22844)
* workspace extraction improvements ([#26169](#26169)) ([7d6a40a](7d6a40a))

### Performance Improvements

* Avoid caching `module_app` ([#26349](#26349)) ([#26351](#26351)) ([8961a96](8961a96))
* avoid two layer cache of timezone (backport [#26340](#26340)) ([#26342](#26342)) ([d802eb6](d802eb6))
* Reduce 1 redis call while dumping monitor logs ([#26337](#26337)) ([#26339](#26339)) ([32dbc5a](32dbc5a))
* Reuse cached user for `get_user_lang` ([#26350](#26350)) ([#26355](#26355)) ([e1048a8](e1048a8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.26.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
add-test-cases Add test case to validate fix or enhancement conflicts released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants