diff --git a/CHANGELOG.md b/CHANGELOG.md index 4568ff2..07f96c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## unreleased + +### Changed + +- Some font alternatives are provided instead of defaulting to sans-serif immediately on systems without Avenir. + +### Fixed + +- Pass `authParams` option in a social login. + ## [2.2.0] - 2016-01-14 ### Changed diff --git a/css/index.styl b/css/index.styl index ce8da3c..6f33c47 100644 --- a/css/index.styl +++ b/css/index.styl @@ -79,7 +79,7 @@ breakpoint(point, value = 0) transform none .auth0-lock.auth0-lock - font-family "Avenir", sans-serif + font-family "Avenir Next", Avenir, -apple-system, BlinkMacSystemFont, Roboto, Hevetica, sans-serif text-rendering optimizeLegibility pointer-events none position fixed diff --git a/src/social/actions.js b/src/social/actions.js index 4f7042a..fb5ca76 100644 --- a/src/social/actions.js +++ b/src/social/actions.js @@ -1,3 +1,4 @@ +import { Map } from 'immutable'; import { getEntity, read, swap, updateEntity } from '../store/index'; import { closeLock } from '../lock/actions'; import WebAPI from '../lock/web_api'; @@ -8,7 +9,7 @@ export function signIn(id, connection) { const lock = read(getEntity, "lock", id); - const options = { + const options = l.login.authParams(lock).merge(Map({ connection: connection.name, popup: l.ui.popup(lock), popupOptions: l.ui.popupOptions(lock), @@ -16,8 +17,7 @@ export function signIn(id, connection) { responseType: l.login.responseType(lock), callbackURL: l.login.callbackURL(lock), forceJSONP: l.login.forceJSONP(lock) - // sso: false - }; + })).toJS(); if (l.ui.popup(lock) && connection.strategy === "facebook") { options.display = "popup";