Commit 32e5e5f8 authored by Fabian Riethmayer's avatar Fabian Riethmayer

Merged master

parents 307e902d d86380c1
...@@ -88,7 +88,7 @@ Appearance ...@@ -88,7 +88,7 @@ Appearance
---------- ----------
- Do not change the button style from the default, which is - Do not change the button style from the default, which is
:doc:`text beside icons </content/iconandtext>`. :doc:`text beside icons </patterns/content/iconandtext>`.
- Use and design toolbar icons with special care. Users remember - Use and design toolbar icons with special care. Users remember
location of an object but rely as well on icon properties. location of an object but rely as well on icon properties.
- A distinct association between the underlying function and its visual - A distinct association between the underlying function and its visual
......
...@@ -34,6 +34,7 @@ Size ...@@ -34,6 +34,7 @@ Size
time the user opens this dialog, set its dimensions to those that the time the user opens this dialog, set its dimensions to those that the
user last resized it to. user last resized it to.
- Size controls with a minimum of - Size controls with a minimum of
- Icon:16x16px - Icon:16x16px
- Buttons: 72 x 32px - Buttons: 72 x 32px
- Line edits, Drop-downs, Combo boxes ≥80 x 32 px - Line edits, Drop-downs, Combo boxes ≥80 x 32 px
......
...@@ -16,9 +16,8 @@ Pattern for a flat content structure. ...@@ -16,9 +16,8 @@ Pattern for a flat content structure.
- These patterns are useful when multiple pieces of content are - These patterns are useful when multiple pieces of content are
intended to be shown at once, alongside a larger, more complete intended to be shown at once, alongside a larger, more complete
presentation of the selected item. presentation of the selected item.
- See the :doc:`wizard </pattern/wizard>` pattern guidelines for - See the :doc:`wizard </patterns/navigation/wizard>` pattern guidelines for
more details on using that more details on using that pattern.
pattern.
- Examples include a contact list that shows the full details of the - Examples include a contact list that shows the full details of the
selected contact, a slideshow with a "film-strip" to select selected contact, a slideshow with a "film-strip" to select
photographs, or setup for newly installed software. photographs, or setup for newly installed software.
......
...@@ -36,4 +36,4 @@ Actions ...@@ -36,4 +36,4 @@ Actions
.. figure:: /img/Krunner-1.png .. figure:: /img/Krunner-1.png
:alt: Krunner showing a placeholder instead of a label with an action. :alt: Krunner showing a placeholder instead of a label with an action.
.. Krunner showing a placeholder instead of a label with an action. Krunner showing a placeholder instead of a label with an action.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment