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

Update placeholder text colour #3062

Merged
merged 4 commits into from
Mar 1, 2024
Merged

Update placeholder text colour #3062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f8e2f9
update placeholder text colour
rmccar Feb 29, 2024
8889732
update code formatting
rmccar Feb 29, 2024
49233a0
update snapshots
rmccar Feb 29, 2024
0a0e49c
update code formatting
rmccar Feb 29, 2024
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
4 changes: 2 additions & 2 deletions ..._components_input_example-input-search-with-placeholder_0_document_2_mobile.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 25 additions & 25 deletions src/components/card/_macro.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{%- macro onsCard(params) -%}

{% from "components/list/_macro.njk" import onsList %}
{% set titleSize = params.titleSize | default('2') %}

{% set titleSize = params.titleSize | default('2') %}
<div class="ons-card">
<a href="{{ params.url }}" class="ons-card__link">
{%- if params.image -%}
{% if params.image.smallSrc %}
<img class="ons-card__image ons-u-mb-s" height="200" width="303"{% if params.image.largeSrc %} srcset="{{ params.image.smallSrc }} 1x, {{ params.image.largeSrc }} 2x"{% endif %} src="{{ params.image.smallSrc }}" alt="{{ params.image.alt }}" loading="lazy">
{% elif params.image == true or params.image.placeholderURL %}
<img class="ons-card__image ons-u-mb-s " height="100" width="303" srcset="{{ params.image.placeholderURL if params.image.placeholderURL }}/img/small/placeholder-card.png 1x, {{ params.image.placeholderURL if params.image.placeholderURL }}/img/large/placeholder-card.png 2x" src="{{ params.image.placeholderURL if params.image.placeholderURL }}/img/small/placeholder-card.png" alt="" loading="lazy">
{% endif %}
{%- endif -%}
<h{{ titleSize }} class="ons-card__title {{ params.titleClasses | default('ons-u-fs-m')}}" id="{{ params.id }}">
{{ params.title }}
</h{{ titleSize }}>
</a>

<div class="ons-card">
<a href="{{ params.url }}" class="ons-card__link">
{%- if params.image -%}
{% if params.image.smallSrc %}
<img class="ons-card__image ons-u-mb-s" height="200" width="303"{% if params.image.largeSrc %} srcset="{{ params.image.smallSrc }} 1x, {{ params.image.largeSrc }} 2x"{% endif %} src="{{ params.image.smallSrc }}" alt="{{ params.image.alt }}" loading="lazy">
{% elif params.image == true or params.image.placeholderURL %}
<img class="ons-card__image ons-u-mb-s " height="100" width="303" srcset="{{ params.image.placeholderURL if params.image.placeholderURL }}/img/small/placeholder-card.png 1x, {{ params.image.placeholderURL if params.image.placeholderURL }}/img/large/placeholder-card.png 2x" src="{{ params.image.placeholderURL if params.image.placeholderURL }}/img/small/placeholder-card.png" alt="" loading="lazy">
{% endif %}
{%- endif -%}
<h{{ titleSize }} class="ons-card__title {{ params.titleClasses | default('ons-u-fs-m')}}" id="{{ params.id }}">
{{ params.title }}
</h{{ titleSize }}>
</a>
<p id="{{ params.textId }}">{{ params.text }}</p>

<p id="{{ params.textId }}">{{ params.text }}</p>
{% if params.itemsList -%}
{% from "components/list/_macro.njk" import onsList %}
{{
onsList({
"variants": 'dashed',
"itemsList": params.itemsList
})
}}
{% endif %}

{% if params.itemsList -%}
{{
onsList({
"variants": 'dashed',
"itemsList": params.itemsList
})
}}
{% endif %}
</div>

</div>
{%- endmacro -%}
2 changes: 1 addition & 1 deletion src/components/document-list/document-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
width: 100%;

&:focus {
background-color: var(--ons-color-placeholder) !important;
background-color: var(--ons-color-image-placeholder) !important;
border: 2px solid var(--ons-color-borders-document-image-focus);
box-shadow: none;
outline: 4px solid var(--ons-color-focus) !important;
Expand Down
6 changes: 3 additions & 3 deletions src/components/document-list/example-document-list-downloads.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"documents": [
{
"thumbnail": true,
"url": '#',
"url": '#',
"title": 'Including everyone in Census 2021',
"metadata": {
"type": {
Expand All @@ -19,7 +19,7 @@
},
{
"thumbnail": true,
"url": '#',
"url": '#',
"title": 'Community handbook for Census 2021',
"metadata": {
"type": {
Expand All @@ -35,7 +35,7 @@
},
{
"thumbnail": true,
"url": '#',
"url": '#',
"title": 'Census 2021 matters to everyone',
"metadata": {
"type": {
Expand Down
1 change: 1 addition & 0 deletions src/components/label/_label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
&--placeholder {
font-size: 1rem;
font-weight: $font-weight-regular;
color: var(--ons-color-text-placeholder);
left: 10px;
position: absolute;
top: 6px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/label/_macro.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</span>
{%- endset %}
{%- if params.description and params.accessiblePlaceholder -%}
{{- description | safe -}}
{{- description | safe -}}
{%- else -%}
<label
class="{% if params.inputType is not defined -%}ons-label{%- endif %}{{- ' ' + params.classes if params.classes else "" -}}{%- if params.description %} ons-label--with-description{%- endif %} {{- ' ons-label--placeholder' if params.accessiblePlaceholder else "" -}}"
Expand All @@ -43,5 +43,5 @@
{{- description | safe -}}
{%- endif -%}
{%- endif %}
{%- endif -%}
{%- endif -%}
{% endmacro %}
2 changes: 1 addition & 1 deletion src/patterns/guide/example-guide-overview.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ layout: ~

{% block main %}
<h1 class="ons-u-mb-l">
<span class="ons-u-fs-xxl ons-u-db">About the census </span>
<span class="ons-u-fs-xxl ons-u-db">About the census</span>
<span class="ons-u-vh">: Overview</span>
</h1>
{{-
Expand Down
3 changes: 2 additions & 1 deletion src/scss/vars/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
--ons-color-borders-document-image-focus: var(--ons-color-black);

// Placeholders
--ons-color-placeholder: var(--ons-color-grey-15);
--ons-color-text-placeholder: var(--ons-color-grey-75);
--ons-color-image-placeholder: var(--ons-color-grey-15);

// Form elements
--ons-color-button: var(--ons-color-leaf-green);
Expand Down
Loading