Skip to content

Notification primary action always right #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Aug 18, 2016
Merged

Notification primary action always right #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5c035
Always pull right like in the client
nickvergessen Aug 15, 2016
39e18d2
Clean up travis
nickvergessen Aug 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ php:
- 5.5
- 5.6
- 7
- hhvm

env:
global:
Expand Down Expand Up @@ -60,11 +59,6 @@ script:
- sh -c "if [ '$INTEGRATION' != '1' -a '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi"
- cd ../..

# Run Javascript unit tests
# - cd tests/js
# - sh -c "if [ '$JSTESTS' = '1' ]; then npm install --deps; node_modules/karma/bin/karma start karma.config.js --single-run; fi"
# - cd ../

matrix:
include:
- php: 5.4
Expand All @@ -79,9 +73,6 @@ matrix:
env: DB=mysql;CODECHECK=2
- php: 5.4
env: DB=mysql;INTEGRATION=1
# - php: 5.4
# env: DB=mysql;JSTESTS=1
allow_failures:
- php: hhvm
- env: DB=mysql;CODECHECK=2
fast_finish: true
2 changes: 1 addition & 1 deletion js/notification.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
_.each(actionsData, function(actionData) {
// FIXME: use handlebars template
actions.append(
'<button class="action-button' + (actionData.primary ? ' primary pull-right': '') + '" data-type="' + escapeHTML(actionData.type) + '" ' +
'<button class="action-button pull-right' + (actionData.primary ? ' primary': '') + '" data-type="' + escapeHTML(actionData.type) + '" ' +
'data-href="'+escapeHTML(actionData.link)+'">'+escapeHTML(actionData.label)+'</button>'
);
// TODO create event handler on click for given action type
Expand Down