Skip to content
This repository has been archived by the owner on Nov 17, 2021. It is now read-only.

Commit

Permalink
Bump origami-ci-tools from 1.3.12 to 2.0.0 (#261)
Browse files Browse the repository at this point in the history
* Bump origami-ci-tools from 1.3.12 to 2.0.0

Bumps [origami-ci-tools](https://github.com/Financial-Times/origami-ci-tools) from 1.3.12 to 2.0.0.
- [Release notes](https://github.com/Financial-Times/origami-ci-tools/releases)
- [Commits](Financial-Times/origami-ci-tools@v1.3.12...v2.0.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* add stylelint config

* fix stylelint issues

* update to latest stylelint origami config

* fix stylelint issues

* fix stylelint issues

* remove circle badge

* update to latest stylelint origami config

* remove package-lock.json file

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Jake Champion <[email protected]>
Co-authored-by: Jake Champion <[email protected]>
  • Loading branch information
3 people authored May 6, 2020
1 parent 252555b commit 8ee1546
Show file tree
Hide file tree
Showing 13 changed files with 130 additions and 407 deletions.
3 changes: 3 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
"extends": "stylelint-config-origami-component"
};
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# o-colors [![Build Status](https://circleci.com/gh/Financial-Times/o-colors.png?style=shield&circle-token=0d3884dacba2fdd8aec8afbd2eaa84c79040ddd5)](https://circleci.com/gh/Financial-Times/o-colors) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](#licence)
# o-colors [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](#licence)

A component to manage colours. Includes the FT colour palette.

Expand Down
2 changes: 1 addition & 1 deletion demos/src/color-mixer/color-mixer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ body {
}
}

input[type=radio] { //sass-lint:disable-line no-qualifying-elements
input[type=radio] { // stylelint-disable-line selector-no-qualifying-type
appearance: none;
border: 1px solid var(--color);
display: inline-block;
Expand Down
13 changes: 7 additions & 6 deletions demos/src/contrast-checker/contrast-checker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ $o-colors-is-silent: false;
}

[role=tab][aria-selected=true] {
background-color: oColorsByName('black-10');
background-color: oColorsByName('black-10');

a {
font-weight: 600;
Expand All @@ -102,11 +102,12 @@ $o-colors-is-silent: false;
}
}

input[type=radio] { //sass-lint:disable-line no-qualifying-elements
input[type=radio] { // stylelint-disable-line selector-no-qualifying-type
@include swatchStyle();

// stylelint-disable-next-line selector-no-qualifying-type
&.o-overlay-trigger,
&.trigger-input {
&.trigger-input { // stylelint-disable-line selector-no-qualifying-type
background-image: url('https://www.ft.com/__origami/service/image/v2/images/raw/fticon-v1%3Aplus?source=o-colors&width=24&height=24&tint=gray');
}
}
Expand All @@ -120,7 +121,7 @@ $o-colors-is-silent: false;
right: 20px;
}

#add-mix { //sass-lint:disable-line no-ids
#add-mix { //stylelint-disable-line selector-max-id
background-image: none;
font-size: inherit;
float: none;
Expand All @@ -132,10 +133,10 @@ $o-colors-is-silent: false;
padding: 0;
}

input[type=radio] { //sass-lint:disable-line no-qualifying-elements
input[type=radio] { // stylelint-disable-line selector-no-qualifying-type
@include swatchStyle();

&[name=range] {
&[name=range] { // stylelint-disable-line selector-no-qualifying-type
height: 48px;
width: 22px;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/demo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ body {
.o-colors-border-#{$name} {
border-width: 2px 2px 0;
border-style: solid;
border-color: oColorsByName($name);
border-color: oColorsByName($name);

@if $name == 'white' {
border-color: oColorsMix(black, white, 20);
Expand Down
279 changes: 0 additions & 279 deletions package-lock.json

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"name": "o-colors",
"devDependencies": {
"eslint-config-origami-component": "^2.0.1",
"origami-ci-tools": "^1.3.12"
"origami-ci-tools": "^2.0.0",
"stylelint-config-origami-component": "^1.0.2"
}
}
Loading

0 comments on commit 8ee1546

Please sign in to comment.