← Back to branch summary

~system-apps-team/webbrowser-app/multiple-windows

« back to all changes in this revision

Viewing changes to src/app/MediaAccessDialog.qml

  • Committer: Olivier Tilloy
  • Date: 2016-09-02 13:59:45 UTC
  • mfrom: (1465.1.67 webbrowser-app)
  • Revision ID: olivier.tilloy@canonical.com-20160902135945-dzw3f1ly39hdpf2v
Merge the latest changes from trunk and resolve a minor conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/MediaAccessDialog.qml
70
70
        Button {
71
71
            objectName: "mediaAccessDialog.allowButton"
72
72
            text: i18n.tr("Yes")
73
 
            color: UbuntuColors.green
 
73
            color: theme.palette.normal.positive
74
74
            width: units.gu(10)
75
75
            onClicked: {
76
76
                request.allow()
81
81
        Button {
82
82
            objectName: "mediaAccessDialog.denyButton"
83
83
            text: i18n.tr("No")
84
 
            color: UbuntuColors.lightGrey
85
84
            width: units.gu(10)
86
85
            onClicked: {
87
86
                request.deny()