← Back to branch summary

~ci-train-bot/ubuntu-settings-components/ubuntu-settings-components-ubuntu-zesty-2202

« back to all changes in this revision

Viewing changes to plugins/Ubuntu/Settings/Menus/StandardMenu.qml

  • Committer: Bileto Bot
  • Date: 2016-11-16 18:52:43 UTC
  • mfrom: (146.4.57 touch+pointer-styles)
  • Revision ID: ci-train-bot@canonical.com-20161116185243-o399ryjh002umz1a
* Menus: add Pointer and Touch styles to be used depending on the user
  interaction with components
  Menu items now have a new Style property that defines some common properties
  such as shared colors and sizes that change depending on the UX journey. I'm
  only defining Pointer and TouchStyles for now, but they can be easily
  overridden in case.
  Removed some deprecated properties and adapted colors and sizes to new
  style.
* Bump package version as there's a new API for various components

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Ubuntu/Settings/Menus/StandardMenu.qml
31
31
    slots: Icon {
32
32
        id: icon
33
33
        objectName: "standardMenuIcon"
34
 
        color: theme.palette.normal.backgroundText
 
34
        color: menuStyle.iconColor
35
35
        visible: source != ""
36
 
        height: units.gu(3)
 
36
        height: menuStyle.iconSize
37
37
        width: height
38
38
        SlotsLayout.position: SlotsLayout.Leading
39
39
    }