Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nr/fix/styling amends #64

Merged
merged 5 commits into from
Dec 17, 2020
Merged

Nr/fix/styling amends #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1e7b71
update: banner bg colour to transparent
rolorogan Dec 17, 2020
aa30b06
update: remove header v2 and cards from patterns
rolorogan Dec 17, 2020
6fd1aec
remove: custom accordion
rolorogan Dec 17, 2020
32316f4
update: make table bg transparent
rolorogan Dec 17, 2020
8362ab4
update: dropdown arrow data:image
rolorogan Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wmcads/components/form-elements/dropdown/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
border-radius: 0;
// sass-lint:disable-all
background: $white
url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='256' height='256' viewBox='0 0 256 256'%3E%3Crect x='-1' y='-1' width='258' height='258' id='canvas_background' fill='%23c05701'/%3E%3Cpath fill='white' d='M40.525 71h173.95c12.034 0 18.051 14.533 9.533 23.05l-86.942 86.996c-5.273 5.272-13.859 5.272-19.132 0L30.992 94.05C22.474 85.533 28.491 71 40.525 71z'/%3E%3C/svg%3E%0A")
url("data:image/svg+xml,%3Csvg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 46 46' style='enable-background:new 0 0 46 46;' xml:space='preserve'%3E%3Cstyle type='text/css'%3E .st0%7Bfill:%23FE811B;stroke:%23FE811B;%7D .st1%7Bfill:%23FFFFFF;%7D%0A%3C/style%3E%3Cg%3E%3Cpath class='st0' d='M0.5,0.5h45v45h-45V0.5z'/%3E%3Cpath class='st1' d='M15,18.9h17c1.2,0,1.8,1.4,0.9,2.2l-8.5,8.5c-0.5,0.5-1.4,0.5-1.9,0L14,21.2C13.2,20.4,13.8,18.9,15,18.9z'/%3E%3C/g%3E%3C/svg%3E%0A")
no-repeat right;
appearance: none;
background-size: contain;
Expand Down
2 changes: 0 additions & 2 deletions src/wmcads/components/table/_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ $border: #979797;
width: 100%;
table-layout: fixed;
border-collapse: collapse;
background: $white;

&__caption {
background: $white;
font-weight: bold;
text-align: left;
}
Expand Down
2 changes: 1 addition & 1 deletion src/wmcads/patterns/banner/_banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$self: &;
padding: $size-md 0;
border-bottom: 1px solid get-color(text);
background-color: $white;
background-color: transparent;

&--emergency {
padding: $size-md;
Expand Down
6 changes: 0 additions & 6 deletions src/www/assets/json/merged.njk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,12 @@
{
"name": "Contact Details"
},
{
"name": "Content cards"
},
{
"name": "Feedback loop"
},
{
"name": "Header and footer"
},
{
"name": "Header v2"
},
{
"name": "Question Form"
},
Expand Down
6 changes: 0 additions & 6 deletions src/www/data.njk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,12 @@
{
"name": "Contact details"
},
{
"name": "Content cards"
},
{
"name": "Feedback loop"
},
{
"name": "Header and footer"
},
{
"name": "Header v2"
},
{
"name": "Question form"
},
Expand Down
31 changes: 0 additions & 31 deletions src/www/pages/components/accordion/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,35 +86,4 @@
})
}}

<br><br>
{# Custom #}
<h2>Custom</h2>
<p>
In the example below, you can see that we have cusomised the summary section of the accordion so that it contains an <a href="/components/disruption-indicator/" title="Disruption indicator component" target="_self" class="wmcads-link"> disruption indicator</a> and some text.
</p>
<p>
The accordion has been built so that it can easily be customised. You can customise both the summary and the content elements.
</p>
<p>
To customise the summary (title) section of the accordion, ensure that you nest valid and accessible html within the <code class="wmcads-website-inline-code">.wmcads-accordion__summary</code> element.
</p>
<p>
To customise the content section of the accordion, ensure that you nest valid and accessible html within the <code class="wmcads-website-inline-code">.wmcads-accordion__content</code> element.
</p>
{{
compExample([
wmcadsAccordion({
id: 'accordion-custom-01',
isOpen: true,
customSummary: true
}) | trim
],
{
componentPath: "wmcads/components/accordion/",
njk: false,
js: true,
iframe: false
})
}}

{% endblock %}