chore: 🤖 merge from main

This commit is contained in:
Randall Morey committed 2021-04-09 11:32:20 -04:00
commit 68bf02ee25
12 files changed
+443 -334

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@ copy-to-clipboard: Copy to Clipboard
authenticate: Authenticate
deauthenticate: Deauthenticate
choose-org: Choose Scope
choose-different-org: Choose a Different Scope
choose-different-org: Choose a different scope
add-host-set: Create Host Set
add-host: Create Host
add-host-sets: Add Host Sets
+1 -1
View File
@@ -6,7 +6,7 @@ auth:
descriptions:
no-scopes: No scopes were found. To authenticate, ask your administrator to create an scope and grant you access.
choose-org: Choose a scope to authenticate.
authenticating-with-org: "You are authenticating with {name}."
authenticating-with-org: "Scope: You are authenticating with organization \"{name}\""
flow-success: You've successfully authenticated. You may now close this window and return to the client.
flow-error: Something went wrong while authenticating. Please close this window and try again. If the problem persists, notify your administrator.
origin:
@@ -0,0 +1,11 @@
<section ...attributes class="rose-frame">
<header class="rose-frame-header">
{{yield to="header"}}
</header>
<div class="rose-frame-body">
{{yield to="body"}}
</div>
</section>
@@ -0,0 +1,42 @@
import { Meta, Story, Preview } from '@storybook/addon-docs/blocks';
import { hbs } from 'ember-cli-htmlbars';
import { action } from '@storybook/addon-actions';
<Meta title="Rose|Frame" component="Frame" />
# Frame
A simple frame component with named blocks `:header` and `:body`. Note that
this component is unique to Boundary and is not part of the Structure design
system.
Prerequisite: `ember-named-blocks-polyfill` must be installed in your app's
`dependencies` rather than `devDependencies`.
<Preview>
<Story name="Frame" height="15rem">{{
template: hbs`
<Rose::Frame>
<:header>
<h2>Frame Header</h2>
</:header>
<:body>
<p>Frame body</p>
</:body>
</Rose::Frame>
`
}}</Story>
</Preview>
```htmlbars
<Rose::Frame>
<:header>
<h2>Frame Header</h2>
</:header>
<:body>
<p>Frame body</p>
</:body>
</Rose::Frame>
```
@@ -0,0 +1,46 @@
@use '../variables/sizing';
@use '../utilities/type';
@use '../variables/media';
$l: sizing.rems(l); // 16
$m: sizing.rems(m); // 16
$s: sizing.rems(s); // 12
$xs: sizing.rems(xs); // 8
$xxs: sizing.rems(xxs); // 4
$xxxs: sizing.rems(xxxs); // 2
$xxxxs: sizing.rems(xxxxs); // 1
.rose-frame {
--headerColor: var(--ui-gray-starker-3);
--headerIconColor: var(--headerColor);
--headerBackgroundColor: var(--ui-gray-subtler-5);
--headerBorderColor: var(--ui-gray-subtler-3);
@include type.type(s);
border: $xxxxs solid var(--ui-gray-subtler-3);
border-radius: $xxxs;
//margin: $m;
box-shadow: 0 $xxs $xxs rgba(var(--stark-components), var(--opacity-4));
background-color: var(--background-color);
.rose-frame-header {
padding: ($xs + $xxxs) $l;
min-height: $l;
color: var(--headerColor);
background-color: var(--headerBackgroundColor);
border-bottom: $xxxxs solid var(--headerBorderColor);
border-top-left-radius: $xxxs;
border-top-right-radius: $xxxs;
}
.rose-frame-body {
$bodyPadding: $l;
padding: $bodyPadding;
> .rose-separator {
margin-left: -$bodyPadding;
margin-right: -$bodyPadding;
}
}
}
@@ -2,6 +2,7 @@
@import 'dialog';
@import 'dropdown';
@import 'form';
@import 'frame';
@import 'header';
@import 'footer';
@import 'layout';
+1
View File
@@ -0,0 +1 @@
export { default } from 'rose/components/rose/frame';
+2 -1
View File
@@ -36,7 +36,8 @@
"ember-named-blocks-polyfill": "^0.2.4",
"ember-radio-button": "^2.0.1",
"ember-uuid": "^2.1.0",
"emberx-select": "github:adopted-ember-addons/emberx-select#bc5f774"
"emberx-select": "github:adopted-ember-addons/emberx-select#bc5f774",
"ember-named-blocks-polyfill": "^0.2.4"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
@@ -0,0 +1,20 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { render, find } from '@ember/test-helpers';
import { hbs } from 'ember-cli-htmlbars';
module('Integration | Component | rose/frame', function (hooks) {
setupRenderingTest(hooks);
test('it renders', async function (assert) {
await render(hbs`
<Rose::Frame>
<:header>Header</:header>
<:body>Body</:body>
</Rose::Frame>
`);
assert.ok(find('section > header'));
assert.ok(find('section > div'));
});
});