← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/app/AuthenticationDialog.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/AuthenticationDialog.qml
1
1
/*
2
 
 * Copyright 2013-2015 Canonical Ltd.
 
2
 * Copyright 2013-2016 Canonical Ltd.
3
3
 *
4
4
 * This file is part of webbrowser-app.
5
5
 *
45
45
 
46
46
    Button {
47
47
        text: i18n.tr("OK")
48
 
        color: "green"
 
48
        color: theme.palette.normal.positive
49
49
        onClicked: accept()
50
50
    }
51
51
 
52
52
    Button {
53
53
        text: i18n.tr("Cancel")
54
 
        color: UbuntuColors.coolGrey
55
54
        onClicked: model.reject()
56
55
    }
57
56