← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/app/webbrowser/SadTab.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/webbrowser/SadTab.qml
1
1
/*
2
 
 * Copyright 2015 Canonical Ltd.
 
2
 * Copyright 2015-2016 Canonical Ltd.
3
3
 *
4
4
 * This file is part of webbrowser-app.
5
5
 *
84
84
            Button {
85
85
                objectName: "reloadButton"
86
86
                text: i18n.tr("Reload")
87
 
                color: UbuntuColors.green
 
87
                color: theme.palette.normal.positive
88
88
                onClicked: webview.reload()
89
89
            }
90
90
        }