chore: 🤖 manual merge from main

This commit is contained in:
Randall Morey committed 2021-11-04 10:46:12 -04:00
commit 6f35594f2a
11 files changed
+82 -3

No files matched your search

@@ -0,0 +1,3 @@
<div ...attributes class="rose-toolbar">
{{yield}}
</div>
@@ -0,0 +1,24 @@
import { Meta, Story, Preview } from '@storybook/addon-docs/blocks';
import { hbs } from 'ember-cli-htmlbars';
import { action } from '@storybook/addon-actions';
<Meta title="Rose|Toolbar" component="Toolbar" />
# Toolbar
renders a toolbar
```htmlbars
<Rose::Toolbar as |toolbar|>
</Rose::Toolbar>
```
<Preview>
<Story name="Toolbar">{{
template: hbs`
<Rose::Toolbar as |toolbar|>
toolbar
</Rose::Toolbar>
`,
}}</Story>
</Preview>
@@ -18,3 +18,4 @@
@import 'message';
@import 'link-button';
@import 'badge';
@import 'toolbar';
@@ -0,0 +1 @@
@import 'toolbar';
@@ -0,0 +1,13 @@
@use '../../variables/sizing';
@use '../../variables/media';
$xxs: sizing.rems(xxs); // 4
$xxxxs: sizing.rems(xxxxs); // 1
.rose-toolbar {
background-color: var(--ui-gray-subtler-6);
.rose-form {
padding: $xxs + $xxxxs;
}
}
@@ -0,0 +1 @@
export { default } from 'rose/components/rose/toolbar';
@@ -0,0 +1,20 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, find } from '@ember/test-helpers';
import hbs from 'htmlbars-inline-precompile';
module('Integration | Component | rose/toolbar', function (hooks) {
setupRenderingTest(hooks);
test('it renders', async function (assert) {
assert.expect(1);
await render(hbs`<Rose::Toolbar />`);
assert.ok(find('.rose-toolbar'));
});
test('it renders with attributes', async function (assert) {
assert.expect(1);
await render(hbs`<Rose::Toolbar id="toolbar"/>`);
assert.ok(find('#toolbar'));
});
});
@@ -15,6 +15,18 @@
<page.body>
{{#if @model}}
{{#if (feature-flag 'filter')}}
<Rose::Toolbar>
<Rose::Form>
<section>
<Rose::Dropdown
@text={{t 'form.status.label'}}
@ignoreClickInside={{true}}
/>
</section>
</Rose::Form>
</Rose::Toolbar>
{{/if}}
<Rose::Table as |table|>
<table.header as |header|>
+2
View File
@@ -132,6 +132,7 @@ module.exports = function (environment) {
// Enable features in development
ENV.featureFlags['capabilities'] = true;
ENV.featureFlags['filter'] = true;
}
if (environment === 'test') {
@@ -157,6 +158,7 @@ module.exports = function (environment) {
// Enable tests for development features
ENV.featureFlags['capabilities'] = true;
ENV.featureFlags['filter'] = true;
}
if (environment === 'production') {
+2
View File
@@ -81,6 +81,7 @@ module.exports = function (environment) {
// Enable features in development
ENV.featureFlags['capabilities'] = true;
ENV.featureFlags['filter'] = true;
}
if (environment === 'test') {
@@ -106,6 +107,7 @@ module.exports = function (environment) {
// Enable tests for development features
ENV.featureFlags['capabilities'] = true;
ENV.featureFlags['filter'] = true;
}
if (environment === 'production') {
+3 -3
View File
@@ -9590,9 +9590,9 @@ electron-rebuild@^2.0.3:
yargs "^16.0.0"
electron-to-chromium@^1.3.867:
version "1.3.880"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.880.tgz#58d1a298c5267f2faf440683d038c50ab39a6401"
integrity sha512-iwIP/6WoeSimzUKJIQtjtpVDsK8Ir8qQCMXsUBwg+rxJR2Uh3wTNSbxoYRfs+3UWx/9MAnPIxVZCyWkm8MT0uw==
version "1.3.883"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.883.tgz#cc409921469b3aa6ab6efd65cc2a4375128bb703"
integrity sha512-goyjNx4wB9j911PBteb+AXNbErug7rJVkmDXWdw5SCVn2JlARBwsqucPkvp1h5mXWxHUbBRK3bwXTrqSxSiAIQ==
element-resize-detector@^1.2.2:
version "1.2.3"