Skip to content

Commit

Permalink
Merge branch 'DES/enhancement/732-vlc-refactor/hr' into DES/enhancement/
Browse files Browse the repository at this point in the history
#732-vlc-refactor
  • Loading branch information
brenner-company committed Apr 16, 2021
2 parents 025679c + a6b7c41 commit 0199737
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 22 deletions.
4 changes: 3 additions & 1 deletion app/components/agenda/agenda-decisions.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
<p class="auk-u-text-bold auk-u-text-capitalized">
{{await title}}
</p>
<hr class="vlc-hr"/>
<div class="auk-hr">
<hr/>
</div>
</div>
</div>
<div style="page-break-after:always;">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@
{{/if}}
{{/if}}
{{#unless @isEditingFormallyOkStatus}}
<div class="vlc-hr"></div>
<div class="auk-hr">
<hr/>
</div>
<div class="vlc-agenda-items__remarks">
<div>
{{#if @agendaitem.explanation}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
{{else if @subcases.length}}
{{#each @subcases as |subcase|}}
<Subcases::SubcaseItem @subcase={{await subcase}} as |subcase|>
<hr class="vlc-hr"/>
<div class="auk-hr">
<hr/>
</div>
<div class="auk-u-mb-4">
<p>
{{subcase.title}}
Expand Down
8 changes: 6 additions & 2 deletions app/components/agenda/press-agenda.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
</h1>
</div>
<div class="auk-u-mb-8">
<hr class="vlc-hr"/>
<div class="auk-hr">
<hr/>
</div>
</div>
<div class="auk-u-mb-4">
{{#each (await agendaitemGroups) as |agendaitemGroup|}}
Expand Down Expand Up @@ -59,7 +61,9 @@
{{/if}}
{{/each}}
<div class="auk-u-mb-8">
<hr class="vlc-hr"/>
<div class="auk-hr">
<hr/>
</div>
</div>
</div>
{{/if}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<ul class="vlc-checkbox-tree">
<li>
{{#unless (eq index 0)}}
<div class="vlc-hr"></div>
<div class="auk-hr">
<hr/>
</div>
{{/unless}}
<WebComponents::VlCheckbox
@value={{domainSelection.isSelected}}
Expand Down
4 changes: 3 additions & 1 deletion app/components/newsletter/newsletter-meeting.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@
}}
{{/web-components/vl-modal}}
{{/if}}
<hr class="vlc-hr"/>
<div class="auk-hr">
<hr/>
</div>
4 changes: 3 additions & 1 deletion app/components/subcases/subcases-process.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<div class="auk-u-m-8">
{{#each @subcases as |subcase|}}
<Subcases::SubcaseItem @subcase={{subcase}} as |subcase|>
<hr class="vlc-hr"/>
<div class="auk-hr">
<hr/>
</div>
<div class="auk-u-mb-2">
<p class="vlc-subline">
{{await subcase.case.type.label}}
Expand Down
4 changes: 3 additions & 1 deletion app/components/utils/piece-details-edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
</div>
</div>

<div class="vlc-hr"></div>
<div class="auk-hr">
<hr/>
</div>

<div class="auk-form-group">
<WebComponents::AuLabel for="pages-amount">{{t "pages-amount"}}</WebComponents::AuLabel>
Expand Down
4 changes: 3 additions & 1 deletion app/pods/cases/case/subcases/subcase/overview/template.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{{#if model}}
<Subcases::SubcaseDescription @subcase={{this.subcase}}/>
<div class="auk-u-mb-8">
<div class="vlc-hr"></div>
<div class="auk-hr">
<hr/>
</div>
</div>
{{#if this.currentSession.isEditor}}
{{!-- TODO these classes do not exist and do nothing --}}
Expand Down
1 change: 0 additions & 1 deletion app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ $icon-font-location: '/fonts/'; // overrides the default location for flanders-i
@import 'custom-components/vlc-document-list';
@import 'custom-components/vlc-environment-pill';
@import 'custom-components/vlc-dropdown-menu';
@import 'custom-components/vlc-hr';
@import 'custom-components/vlc-input-field-block';
@import 'custom-components/vlc-list-section-header';
@import 'custom-components/vlc-minister';
Expand Down
2 changes: 1 addition & 1 deletion app/styles/au-kaleidos-css/_auk-hr.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.auk-hr {
margin: 2.4rem 0;
border-bottom: .1rem solid $au-gray-200;
border-bottom: .1rem solid $au-gray-300;
hr {
display: none;
}
Expand Down
2 changes: 1 addition & 1 deletion app/styles/custom-components/_vlc-agenda-items.scss
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ $i: 0;
border-bottom: .1rem solid $border-color;

// Override HR spacing
.vlc-hr {
.auk-hr {
margin: 1.5rem 0;
}
}
Expand Down
9 changes: 0 additions & 9 deletions app/styles/custom-components/_vlc-hr.scss

This file was deleted.

0 comments on commit 0199737

Please sign in to comment.