Skip to content

Commit f462107

Browse files
authored
Merge pull request #8961 from michaelchadwick/6669-replace-ilios-browser-defaults-sass-mixin
Replaced `ilios-browser-defaults` SASS mixin with shared class
2 parents 2fa3764 + 03a3525 commit f462107

9 files changed

Lines changed: 38 additions & 46 deletions

File tree

packages/ilios-common/addon/components/learningmaterial-manager.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ export default class LearningMaterialManagerComponent extends Component {
364364
<label>
365365
{{t "general.description"}}:
366366
</label>
367-
<span class="description">
367+
<span class="description normalize-external-editor">
368368
{{#if (and @editable this.isLinkedOnlyOnce)}}
369369
<HtmlEditor @content={{this.description}} @update={{set this "description"}} />
370370
{{else}}
@@ -376,7 +376,7 @@ export default class LearningMaterialManagerComponent extends Component {
376376
</span>
377377
</div>
378378
<div class="item">
379-
<div class="notes">
379+
<div class="notes normalize-external-editor">
380380
<label>
381381
{{t "general.instructionalNotes"}}:
382382
</label>

packages/ilios-common/addon/components/new-learningmaterial.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ export default class NewLearningmaterialComponent extends Component {
405405
<label>
406406
{{t "general.description"}}:
407407
</label>
408-
<span>
408+
<span class="description normalize-external-editor">
409409
<HtmlEditor @content={{this.description}} @update={{fn (mut this.description)}} />
410410
</span>
411411
</div>

packages/ilios-common/addon/components/session/overview.gjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ export default class SessionOverview extends Component {
599599
{{/if}}
600600
</div>
601601
<hr />
602-
<div class="sessiondescription" data-test-description>
602+
<div class="sessiondescription normalize-external-editor" data-test-description>
603603
<label>{{t "general.description"}}:</label>
604604
<FadeText @text={{this.description}} as |ft|>
605605
{{#if @editable}}
@@ -634,7 +634,10 @@ export default class SessionOverview extends Component {
634634
{{/if}}
635635
</FadeText>
636636
</div>
637-
<div class="instructional-notes" data-test-instructional-notes>
637+
<div
638+
class="instructional-notes normalize-external-editor"
639+
data-test-instructional-notes
640+
>
638641
<label>{{t "general.instructionalNotes"}}:</label>
639642
<FadeText @text={{this.instructionalNotes}} as |ft|>
640643
{{#if @editable}}

packages/ilios-common/app/styles/ilios-common/components/learningmaterial-manager.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@
4545
background-color: var(--green);
4646
}
4747

48-
.notes,
49-
.description {
50-
@include m.ilios-browser-defaults;
51-
}
52-
5348
.loading {
5449
@include m.ilios-heading-h1;
5550
display: block;

packages/ilios-common/app/styles/ilios-common/components/new-learningmaterial.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
@include m.ilios-form-buttons;
3131
}
3232

33-
.notes,
34-
.description {
35-
@include m.ilios-browser-defaults;
36-
}
37-
3833
input,
3934
textarea {
4035
&.error {

packages/ilios-common/app/styles/ilios-common/components/session-overview.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393

9494
.sessiondescription,
9595
.instructional-notes {
96-
@include m.ilios-browser-defaults;
9796
grid-column: 1 / -1;
9897
}
9998

packages/ilios-common/app/styles/ilios-common/mixins/ilios-list.scss

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,6 @@
6464
}
6565
}
6666

67-
@mixin ilios-browser-defaults {
68-
ul {
69-
list-style-position: inside;
70-
list-style-type: disc;
71-
}
72-
73-
ol {
74-
list-style-position: inside;
75-
list-style-type: decimal;
76-
}
77-
78-
ul ul,
79-
ol ul {
80-
list-style-position: inside;
81-
list-style-type: circle;
82-
margin-left: 15px;
83-
}
84-
85-
ol ol,
86-
ul ol {
87-
list-style-position: inside;
88-
list-style-type: lower-latin;
89-
margin-left: 15px;
90-
}
91-
92-
p {
93-
margin: 0;
94-
}
95-
}
96-
9767
@mixin ilios-selectable-list {
9868
@include ilios-list-reset;
9969

packages/ilios-common/app/styles/ilios-common/shared.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@forward "shared/loading-shimmer";
55
@forward "shared/loading-text";
66
@forward "shared/main-section";
7+
@forward "shared/normalize-external-editor";
78
@forward "shared/text-wrap";
89
@forward "shared/user-search";
910
@forward "shared/visually-hidden";
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
.normalize-external-editor {
2+
ul {
3+
list-style-position: inside;
4+
list-style-type: disc;
5+
}
6+
7+
ol {
8+
list-style-position: inside;
9+
list-style-type: decimal;
10+
}
11+
12+
ul ul,
13+
ol ul {
14+
list-style-position: inside;
15+
list-style-type: circle;
16+
margin-left: 15px;
17+
}
18+
19+
ol ol,
20+
ul ol {
21+
list-style-position: inside;
22+
list-style-type: lower-latin;
23+
margin-left: 15px;
24+
}
25+
26+
p {
27+
margin: 0;
28+
}
29+
}

0 commit comments

Comments
 (0)