Skip to content

[stable14] Fix size of icons in menus inside apps when shown as images #11276

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.

Sign up for GitHub

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

Merged
blizzz merged 1 commit into from
Sep 19, 2018
Merged

[stable14] Fix size of icons in menus inside apps when shown as images #11276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix size of icons in menus inside apps when shown as images 
Some popover menus, like the contacts menu, still show their icon using
an img element. The main CSS rules assume that a "content-box" sizing is
being used, and thus set the size and padding of the image to add up to
the line height.

However, ".app-*" descendants use a "border-box" sizing, so when a menu
with an image was shown in an app the icon was not properly shown. Now
both the width and height of the image is set to the item height in
those cases, which causes the visible size of the icon to be the item
height minus the padding (the same as when "content-box" sizing is
used).

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Sep 19, 2018
commit a9fa17eb7ebf81886b05ff1a14e1df67ad08bfef
21 changes: 21 additions & 0 deletions core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,27 @@ $popovericon-size: 16px;
}
}

/* "app-*" descendants use border-box sizing, so the height of the icon must be
* set to the height of the item (as well as its width to make it squared). */
#content[class*='app-'] {
.bubble,
.app-navigation-entry-menu,
.popovermenu {
li {
> button,
> a,
> .menuitem {
/* DEPRECATED! old img in popover fallback
* TODO: to remove */
> img {
width: $popoveritem-height;
height: $popoveritem-height;
}
}
}
}
}

/* CONTENT LIST ------------------------------------------------------------ */
.app-content-list {
width: 300px;
Expand Down