diff --git a/CHANGELOG.md b/CHANGELOG.md index a28042c..8f2462a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.5.8 +**2017-10-6** +* added vimeo branded dropdown colors. + ### 1.5.7 **2017-10-5** * added vimeo blue buttons to forms. diff --git a/VERSION b/VERSION index f01291b..1cc9c18 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.7 +1.5.8 diff --git a/app/public/app.js b/app/public/app.js index 0ead280..e90d7a0 100644 --- a/app/public/app.js +++ b/app/public/app.js @@ -1062,7 +1062,7 @@ Q.components.guide.styleguide.ui.forms.container = { name: 'domain_name', placeholder: 'Enter your domain name' }), - m('button.btn.btn-vimeo-blue.btn--small', 'Verify Domain') + m('button.btn.btn-teal.btn--small', 'Verify Domain') ]) ]), m('fieldset.margin-bottom-medium', [ @@ -1086,7 +1086,7 @@ Q.components.guide.styleguide.ui.forms.container = { }) ]), m('.clearfix', - m('button.btn-vimeo-blue.right', { + m('button.btn-teal.right', { type: 'submit' }, 'Submit') ) @@ -3360,4 +3360,4 @@ m.route.mode = 'pathname'; m.route(document.getElementById('quartz'), '/', { '/:type/:guide': Q.layouts.standard.ui.container -}); +}); \ No newline at end of file diff --git a/app/public/quartz.css b/app/public/quartz.css index 8b12e37..c17eca5 100644 --- a/app/public/quartz.css +++ b/app/public/quartz.css @@ -3494,6 +3494,8 @@ hr.column { .form .inner-button .button, .form .inner-button .btn-gray, .form .inner-button .btn-dropdown-gray, + .form .inner-button .btn-vimeo-blue, + .form .inner-button .btn-dropdown-vimeo-blue, .form .inner-button .btn-search, .form .inner-button .btn, .form .inner-button .btn-gray, diff --git a/app/public/quartz.js b/app/public/quartz.js index c6eb9e5..fb4f8f3 100644 --- a/app/public/quartz.js +++ b/app/public/quartz.js @@ -1081,7 +1081,7 @@ vhxm.components.shared.select.ui.container = { ctrl.state.highlightIndex(-1); }, onkeydown: ctrl.handleKeydown - }, [opts.trigger ? opts.trigger : m('a.c-select--trigger.truncate.btn-dropdown-' + (opts.color ? opts.color : 'gray') + '.btn--fill' + (ctrl.state.isDropdownOpen() ? '.is-active' : ''), { + }, [opts.trigger ? opts.trigger : m('a.c-select--trigger.truncate.btn-dropdown-' + (opts.color ? opts.color : 'vimeo-secondary') + '.btn--fill' + (ctrl.state.isDropdownOpen() ? '.is-active' : ''), { href: '#', onclick: ctrl.handleClick }, ctrl.selectedLabel()), m('.c-select--dropdown.bg-white.border.radius.fill-width' + (ctrl.state.isDropdownOpen() ? '.is-open' : ''), { @@ -1114,7 +1114,7 @@ vhxm.components.shared.select.ui.container = { oninput: ctrl.handleInput })]) : '', m.component(vhxm.components.shared.select.ui.list.container, opts, ctrl), opts.action && ctrl.state.searchInputValue().length ? // show Create New Category dropdown footer action - m('.c-select--footer.border-top', [m('a.btn-teal.btn--fill' + (ctrl.state.footerLoading() ? '.is-loading' : ''), { + m('.c-select--footer.border-top', [m('a.btn-vimeo-blue.btn--fill' + (ctrl.state.footerLoading() ? '.is-loading' : ''), { onclick: ctrl.handleAction, href: '#' }, opts.action + (ctrl.state.searchInputValue().length ? ' \'' + ctrl.state.searchInputValue() + '\'' : ''))]) : ''])]); diff --git a/dist/component-select.js b/dist/component-select.js index 92cc37f..ae1f37d 100644 --- a/dist/component-select.js +++ b/dist/component-select.js @@ -246,7 +246,7 @@ vhxm.components.shared.select.ui.container = { ctrl.state.highlightIndex(-1); }, onkeydown: ctrl.handleKeydown - }, [opts.trigger ? opts.trigger : m('a.c-select--trigger.truncate.btn-dropdown-' + (opts.color ? opts.color : 'gray') + '.btn--fill' + (ctrl.state.isDropdownOpen() ? '.is-active' : ''), { + }, [opts.trigger ? opts.trigger : m('a.c-select--trigger.truncate.btn-dropdown-' + (opts.color ? opts.color : 'vimeo-secondary') + '.btn--fill' + (ctrl.state.isDropdownOpen() ? '.is-active' : ''), { href: '#', onclick: ctrl.handleClick }, ctrl.selectedLabel()), m('.c-select--dropdown.bg-white.border.radius.fill-width' + (ctrl.state.isDropdownOpen() ? '.is-open' : ''), { @@ -279,7 +279,7 @@ vhxm.components.shared.select.ui.container = { oninput: ctrl.handleInput })]) : '', m.component(vhxm.components.shared.select.ui.list.container, opts, ctrl), opts.action && ctrl.state.searchInputValue().length ? // show Create New Category dropdown footer action - m('.c-select--footer.border-top', [m('a.btn-teal.btn--fill' + (ctrl.state.footerLoading() ? '.is-loading' : ''), { + m('.c-select--footer.border-top', [m('a.btn-vimeo-blue.btn--fill' + (ctrl.state.footerLoading() ? '.is-loading' : ''), { onclick: ctrl.handleAction, href: '#' }, opts.action + (ctrl.state.searchInputValue().length ? ' \'' + ctrl.state.searchInputValue() + '\'' : ''))]) : ''])]); diff --git a/package.json b/package.json index f99816d..518cc7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vhx/quartz", - "version": "1.5.7", + "version": "1.5.8", "description": "VHX Style Guide and JS Components.", "homepage": "https://github.com/vhx/quartz", "author": "VHX", diff --git a/quartz-js/components/select/select.ui.js b/quartz-js/components/select/select.ui.js index 11355e4..be2a7ee 100644 --- a/quartz-js/components/select/select.ui.js +++ b/quartz-js/components/select/select.ui.js @@ -23,7 +23,7 @@ vhxm.components.shared.select.ui.container = { onkeydown: ctrl.handleKeydown }, [ opts.trigger ? opts.trigger : - m('a.c-select--trigger.truncate.btn-dropdown-' + (opts.color ? opts.color : 'gray') + '.btn--fill' + (ctrl.state.isDropdownOpen() ? '.is-active' : ''), { + m('a.c-select--trigger.truncate.btn-dropdown-' + (opts.color ? opts.color : 'vimeo-secondary') + '.btn--fill' + (ctrl.state.isDropdownOpen() ? '.is-active' : ''), { href: '#', onclick: ctrl.handleClick }, ctrl.selectedLabel()), @@ -63,7 +63,7 @@ vhxm.components.shared.select.ui.container = { opts.action && ctrl.state.searchInputValue().length ? // show Create New Category dropdown footer action m('.c-select--footer.border-top', [ - m('a.btn-teal.btn--fill' + (ctrl.state.footerLoading() ? '.is-loading' : ''), { + m('a.btn-vimeo-blue.btn--fill' + (ctrl.state.footerLoading() ? '.is-loading' : ''), { onclick: ctrl.handleAction, href: '#' }, opts.action + (ctrl.state.searchInputValue().length ? (' \'' + ctrl.state.searchInputValue() + '\'') : ''))