Skip to content

Commit b881a4b

Browse files
FadhlanRFadhlanR
committed
Merge branch 'main' into cs-7985-implement-sliding-sync
2 parents 682d7ff + 1c5a948 commit b881a4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1616
-785
lines changed

‎packages/base/default-templates/atom.gts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import GlimmerComponent from '@glimmer/component';
2-
import { type CardDef, isCompoundField } from '../card-api';
2+
import { type CardDef } from '../card-api';
33
import { cn, not } from '@cardstack/boxel-ui/helpers';
44

55
export default class DefaultAtomViewTemplate extends GlimmerComponent<{
@@ -15,9 +15,6 @@ export default class DefaultAtomViewTemplate extends GlimmerComponent<{
1515
if (typeof this.args.model.title === 'string') {
1616
return this.args.model.title.trim();
1717
}
18-
if (isCompoundField(this.args.model)) {
19-
return;
20-
}
2118
return `Untitled ${this.args.model.constructor.displayName}`;
2219
}
2320
<template>

‎packages/boxel-ui/addon/src/components/select/index.gts

+14-5
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ const BoxelSelect: TemplateOnlyComponent<Signature> = <template>
6666
max-width: 100%;
6767
width: 100%;
6868
}
69+
.boxel-select:hover {
70+
cursor: pointer;
71+
}
6972
.ember-power-select-trigger {
7073
padding: 0;
7174
}
@@ -85,22 +88,28 @@ const BoxelSelect: TemplateOnlyComponent<Signature> = <template>
8588
overflow: auto;
8689
}
8790
.boxel-select__dropdown .ember-power-select-option {
88-
padding: var(--boxel-sp-xxs) var(--boxel-sp-xs);
91+
padding: var(--boxel-sp-xs);
92+
background-color: var(--boxel-light);
93+
color: var(--boxel-dark);
94+
transition: background-color var(--boxel-transition);
8995
}
9096
.boxel-select__dropdown .ember-power-select-option[aria-selected='true'] {
91-
background-color: var(--boxel-100);
97+
background-color: var(--boxel-highlight);
98+
}
99+
.boxel-select__dropdown
100+
.ember-power-select-option[aria-selected='true']:hover {
101+
background-color: var(--boxel-highlight-hover);
92102
}
93-
.boxel-select__dropdown .ember-power-select-option[aria-current='true'] {
103+
.boxel-select__dropdown .ember-power-select-option:hover {
94104
background-color: var(--boxel-100);
95-
color: black;
96105
}
97106
.boxel-select__dropdown .ember-power-select-search-input:focus {
98107
border: 1px solid var(--boxel-outline-color);
99108
box-shadow: var(--boxel-box-shadow-hover);
100109
outline: var(--boxel-outline);
101110
}
102111
.boxel-select__dropdown .ember-power-select-option--no-matches-message {
103-
padding: var(--boxel-sp-xxs) var(--boxel-sp-sm);
112+
padding: var(--boxel-sp-sm);
104113
}
105114
</style>
106115
</template>;

‎packages/boxel-ui/addon/src/components/select/trigger.gts

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class BoxelTriggerWrapper extends Component<TriggerSignature> {
5555
justify-content: space-between;
5656
width: 100%;
5757
gap: var(--boxel-sp-xxxs);
58-
padding: var(--boxel-sp-xxxs);
58+
padding: var(--boxel-sp-xs);
5959
}
6060
.boxel-trigger-content {
6161
display: flex;

‎packages/experiments-realm/Spec/a0bd867f-e0fc-46fb-9a0e-c4f5ee2953c6.json

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"data": {
3+
"type": "card",
4+
"attributes": {
5+
"readMe": null,
6+
"ref": {
7+
"name": "Toy",
8+
"module": "../pet"
9+
},
10+
"specType": "field",
11+
"containedExamples": [
12+
{
13+
"title": "Dragon"
14+
},
15+
{
16+
"title": "Tug rope"
17+
},
18+
{
19+
"title": "Lambchop"
20+
}
21+
],
22+
"title": "Toy Spec I",
23+
"description": null,
24+
"thumbnailURL": null
25+
},
26+
"relationships": {
27+
"linkedExamples": {
28+
"links": {
29+
"self": null
30+
}
31+
}
32+
},
33+
"meta": {
34+
"fields": {
35+
"containedExamples": [
36+
{
37+
"adoptsFrom": {
38+
"module": "../pet",
39+
"name": "Toy"
40+
}
41+
},
42+
{
43+
"adoptsFrom": {
44+
"module": "../pet",
45+
"name": "Toy"
46+
}
47+
},
48+
{
49+
"adoptsFrom": {
50+
"module": "../pet",
51+
"name": "Toy"
52+
}
53+
}
54+
]
55+
},
56+
"adoptsFrom": {
57+
"module": "https://cardstack.com/base/spec",
58+
"name": "Spec"
59+
}
60+
}
61+
}
62+
}

‎packages/experiments-realm/Spec/fc715f41-c280-4b0c-a732-e8e1a85a97dd.json

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"data": {
3+
"type": "card",
4+
"attributes": {
5+
"readMe": null,
6+
"ref": {
7+
"name": "Toy",
8+
"module": "../pet"
9+
},
10+
"specType": "field",
11+
"containedExamples": [
12+
{
13+
"title": "Orange ball"
14+
},
15+
{
16+
"title": "Large yellow ball"
17+
},
18+
{
19+
"title": "Small red ball"
20+
}
21+
],
22+
"title": "Toy Spec II",
23+
"description": null,
24+
"thumbnailURL": null
25+
},
26+
"relationships": {
27+
"linkedExamples": {
28+
"links": {
29+
"self": null
30+
}
31+
}
32+
},
33+
"meta": {
34+
"fields": {
35+
"containedExamples": [
36+
{
37+
"adoptsFrom": {
38+
"module": "../pet",
39+
"name": "Toy"
40+
}
41+
},
42+
{
43+
"adoptsFrom": {
44+
"module": "../pet",
45+
"name": "Toy"
46+
}
47+
},
48+
{
49+
"adoptsFrom": {
50+
"module": "../pet",
51+
"name": "Toy"
52+
}
53+
}
54+
]
55+
},
56+
"adoptsFrom": {
57+
"module": "https://cardstack.com/base/spec",
58+
"name": "Spec"
59+
}
60+
}
61+
}
62+
}

0 commit comments

Comments
 (0)