Skip to content

fix(scss): Add necessary imports to _order-summary.scss#324

Merged
marijohannessen merged 2 commits into
carbon-design-system:masterfrom
mven:fix/orderSummary
Sep 25, 2017
Merged

fix(scss): Add necessary imports to _order-summary.scss#324
marijohannessen merged 2 commits into
carbon-design-system:masterfrom
mven:fix/orderSummary

Conversation

@mven

@mven mven commented Sep 22, 2017

Copy link
Copy Markdown
Contributor

Overview

importing the _order-summary.scss with Webpack was producing errors because it couldn't reference dependencies like font-size() mixin. I've added the necessary @imports that the .scss file relies on, so that there's no more errors in Webpack.

@tw15egan

Copy link
Copy Markdown
Contributor

👍 ✅ Thanks for fixing this

@marijohannessen

Copy link
Copy Markdown
Contributor

👍 ✅

@marijohannessen marijohannessen merged commit c0e779c into carbon-design-system:master Sep 25, 2017
paul-palade added a commit to paul-palade/carbon that referenced this pull request May 21, 2026
Submitting 14 new pictograms from June 2026 and updated categories.
Updated master file. All additions and updates approved by BXD.
Addressing issues carbon-design-system#319, carbon-design-system#321, carbon-design-system#324 and carbon-design-system#325 in brand/pictograms.

### Changelog

**New**

`Cities`
- [x] chennai.svg
- [x] denver.svg
- [x] frankfurt.svg
- [x] los-angeles.svg
- [x] miami.svg
- [x] oslo.svg
- [x] perth.svg
- [x] san-jose.svg
- [x] taipei.svg

`Design and development`
- [x] technology-zone--finger.svg

`Electronics`
- [x] laptop.svg

`Lifestyle`
- [x] lotus--flower.svg

`Workplace`
- [x] men--showers.svg
- [x] women--showers.svg

**Updated**

`Lifestyle`
- half-note.svg
- hard--ice--cream.svg
  Updated alphabetical order in categories.yml
adamalston pushed a commit to adamalston/carbon that referenced this pull request May 26, 2026
* feat(pictograms): new Pictograms June 2026

Submitting 14 new pictograms from June 2026 and updated categories.
Updated master file. All additions and updates approved by BXD.
Addressing issues carbon-design-system#319, carbon-design-system#321, carbon-design-system#324 and carbon-design-system#325 in brand/pictograms.

### Changelog

**New**

`Cities`
- [x] chennai.svg
- [x] denver.svg
- [x] frankfurt.svg
- [x] los-angeles.svg
- [x] miami.svg
- [x] oslo.svg
- [x] perth.svg
- [x] san-jose.svg
- [x] taipei.svg

`Design and development`
- [x] technology-zone--finger.svg

`Electronics`
- [x] laptop.svg

`Lifestyle`
- [x] lotus--flower.svg

`Workplace`
- [x] men--showers.svg
- [x] women--showers.svg

**Updated**

`Lifestyle`
- half-note.svg
- hard--ice--cream.svg
  Updated alphabetical order in categories.yml

* Update packages/pictograms/pictograms.yml

Resolved two instances of `men--showers` in pictograms.yml

Co-authored-by: Mahmoud <132728978+maradwan26@users.noreply.github.com>

* chore: update snapshots

---------

Co-authored-by: Mahmoud <132728978+maradwan26@users.noreply.github.com>
Co-authored-by: Mahmoud <maradwan26@gmail.com>
heloiselui added a commit to heloiselui/carbon that referenced this pull request Jun 5, 2026
…22366)

* feat(pictograms): new Pictograms June 2026

Submitting 14 new pictograms from June 2026 and updated categories.
Updated master file. All additions and updates approved by BXD.
Addressing issues carbon-design-system#319, carbon-design-system#321, carbon-design-system#324 and carbon-design-system#325 in brand/pictograms.

### Changelog

**New**

`Cities`
- [x] chennai.svg
- [x] denver.svg
- [x] frankfurt.svg
- [x] los-angeles.svg
- [x] miami.svg
- [x] oslo.svg
- [x] perth.svg
- [x] san-jose.svg
- [x] taipei.svg

`Design and development`
- [x] technology-zone--finger.svg

`Electronics`
- [x] laptop.svg

`Lifestyle`
- [x] lotus--flower.svg

`Workplace`
- [x] men--showers.svg
- [x] women--showers.svg

**Updated**

`Lifestyle`
- half-note.svg
- hard--ice--cream.svg
  Updated alphabetical order in categories.yml

* Update packages/pictograms/pictograms.yml

Resolved two instances of `men--showers` in pictograms.yml

Co-authored-by: Mahmoud <132728978+maradwan26@users.noreply.github.com>

* chore: update snapshots

* feat(pictograms): new Pictograms June 2026 (2)

Submitting 1 new pictogram from June 2026 and updated categories. Updated master file. All additions and updates approved by BXD. Addressing issue [carbon-design-system#322](https://github.ibm.com/brand/Pictograms/issues/322) in brand/pictograms.

### Changelog

**New**

`Cities`
- [x] ibm--atx-office.svg

* chore: update snapshots

---------

Co-authored-by: Mahmoud <132728978+maradwan26@users.noreply.github.com>
Co-authored-by: Mahmoud <maradwan26@gmail.com>
Co-authored-by: Heloise Lui <71858203+heloiselui@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants