Skip to content

Commit

Permalink
chore(move over beta 0.16.1):
Browse files Browse the repository at this point in the history
  • Loading branch information
lzcabrera committed Jun 20, 2017
1 parent bf33db5 commit a47b337
Show file tree
Hide file tree
Showing 31 changed files with 271 additions and 931 deletions.
765 changes: 28 additions & 737 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Install [commitizen](https://github.com/commitizen/cz-cli) globally to be prompt
Clone this repository

git clone git@github.com:telusdigital/tds.git
cd tds
cd telus-thorium-core

Symlink the core & enriched modules so changes are immediately picked up by your local documentation site instance.

Expand Down
13 changes: 9 additions & 4 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,21 @@

### NEW CDN files
* New CSS CDN file path is
* https://cdn.telus.digital/thorium/core/v0.16.1/tds.min.css
* https://cdn.telus.digital/thorium/enriched/v0.16.1/tds-enriched.min.css
* https://cdn.telus.digital/thorium/core/v0.16.1/tds-lite.min.css (unstyled typography and anchor links and no form styles - barebones css for platform agnostic projects)
* https://cdn.telus.digital/thorium/core/v0.16.0/tds.min.css
* https://cdn.telus.digital/thorium/enriched/v0.16.0/tds-enriched.min.css
* https://cdn.telus.digital/thorium/core/v0.16.0/tds-lite.min.css (unstyled typography and anchor links and no form styles - barebones css for platform agnostic projects)
* New JS file path on CDN with Global Component
* https://cdn.telus.digital/thorium/enriched/v0.16.1/tds-enriched.min.js
* https://cdn.telus.digital/thorium/enriched/v0.16.0/tds-enriched.min.js
* Files with the latest files
* https://cdn.telus.digital/thorium/core/v0-latest/tds.min.css
* https://cdn.telus.digital/thorium/enriched/v0-latest/tds-enriched.min.css
* https://cdn.telus.digital/thorium/enriched/v0-latest/tds-enriched.min.js


### NPM Packages on npmjs.org
* tds-jenkins/telus-thorium-core has moved to telusdigital/tds-core
* tds-jenkins/telus-thorium-enriched has moved to telusdigital/tds-enriched

### Buttons
* button classes now have a minimum width of 180px
* removed styles from button html tag and if you need to remove default styling you can use `button--plain`
Expand Down
8 changes: 4 additions & 4 deletions ci.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ createJenkinsJob(
onlyIfSuccessful()
}

downstream 'telus-TDS--deploy-stage'
downstream 'telus-thorium--deploy-stage'
}
}

Expand All @@ -142,17 +142,17 @@ createJenkinsJob(
createJenkinsDeployJob('telus-tds--deploy-qa', 's3://cdn.telus-thorium-doc-qa/', 'telus-tds--qa-build')

/**
* telus-TDS--deploy-stage copies the static site contents to the Staging
* telus-thorium--deploy-stage copies the static site contents to the Staging
* web server. It takes those artifacts from its upstream job, which is dev.
*/
createJenkinsDeployJob('telus-TDS--deploy-stage', 's3://cdn.telus-thorium-doc-staging/', 'telus-TDS--build')
createJenkinsDeployJob('telus-thorium--deploy-stage', 's3://cdn.telus-thorium-doc-staging/', 'telus-TDS--build')

/**
* telus-thorium--deploy-prod copies the static site contents to the production
* web server. It takes those artifacts from the last successful staging
* deployment.
*/
createJenkinsDeployJob('telus-thorium--deploy-prod', 's3://cdn.telus-thorium-doc-production/', 'telus-TDS--deploy-stage')
createJenkinsDeployJob('telus-thorium--deploy-prod', 's3://cdn.telus-thorium-doc-production/', 'telus-thorium--deploy-stage')

createJenkinsJob(
'telus-thorium--release',
Expand Down
2 changes: 1 addition & 1 deletion core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"bugs": {
"url": "https://github.com/telusdigital/tds/issues"
},
"homepage": "http://tds.telus.com",
"homepage": "https://github.com/telusdigital/tds#readme",
"devDependencies": {
"autoprefixer": "^6.3.3",
"clean-css": "^3.4.10",
Expand Down
2 changes: 1 addition & 1 deletion core/scss/elements/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ a.button {
padding-left: 4px;
}

@include chevron-links($color-primary);
@include chevron-links($color-japanese-laurel);
}
}

Expand Down
10 changes: 5 additions & 5 deletions core/scss/elements/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $form-field-bottom-spacing: 18px;
input:not([type='radio']),
textarea,
select {
border: 1px solid $color-shuttle-grey;
border: 1px solid $color-raven;
border-radius: $form-field-border-radius;
box-shadow: 0 1px 8px rgba(0, 0, 0, .05);
color: $color-shark;
Expand All @@ -33,7 +33,7 @@ select {
}

.field--success & {
border-color: $color-primary;
border-color: $color-japanese-laurel;
}

&:focus {
Expand All @@ -49,7 +49,7 @@ input,
select {
&:disabled {
background-color: $color-athens-grey;
border-color: $color-shuttle-grey;
border-color: $color-raven;
}
}

Expand Down Expand Up @@ -151,7 +151,7 @@ textarea {

&--disabled {
&::after {
color: $color-shuttle-grey;
color: $color-raven;
}
}

Expand Down Expand Up @@ -257,7 +257,7 @@ $radio-checked-stroke-size: 6px;
&:active {
& + .choice__text {
&::before {
border-color: $color-primary;
border-color: $color-japanese-laurel;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/scss/foundation/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

html {
color: $color-shuttle-grey;
color: $color-raven;
font-family: $font-telus;
font-weight: 400;
font-kerning: normal;
Expand Down
8 changes: 4 additions & 4 deletions core/scss/foundation/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
&--primary {
&:link,
&:visited {
color: $color-primary;
color: $color-japanese-laurel;
}

&:hover {
Expand All @@ -44,14 +44,14 @@
&.link--descent {
&:link,
&:visited {
@include add-skinny-underline($color-primary, $color-athens-grey);
@include add-skinny-underline($color-japanese-laurel, $color-athens-grey);
}
}

&.link--inverted.link--descent {
&:link,
&:visited {
@include add-skinny-underline($color-athens-grey, $color-primary);
@include add-skinny-underline($color-athens-grey, $color-japanese-laurel);
}
}
}
Expand Down Expand Up @@ -99,7 +99,7 @@
&--primary {
&:link,
&:visited {
@include chevron-links($color-primary);
@include chevron-links($color-japanese-laurel);
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/scss/foundation/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ body {
//
// Headings
//
.display-heading-1 {
.h1--display {
color: $color-secondary;
font-size: rem(44px);
line-height: 1.14; // 48px
Expand Down
36 changes: 10 additions & 26 deletions core/scss/settings/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,17 @@
//
// Colours
//
$color-accessible-green: #248700;

@warn "$color-forest-green token has been deprecated as of 0.16.2, new name for this colour is $color-accessible-green";
$color-forest-green: $color-accessible-green;

@warn "$color-japanese-laurel token has been deprecated as of 0.16.2, please use $color-forest-green";
$color-japanese-laurel: $color-forest-green; // deprecated as of 0.16.2

$color-forest-green: #248700;
$color-japanese-laurel: #177a00;
$color-telus-green: #6c0;
$color-panache: #f4f9f2;

$color-raven: #6a6e74;
$color-shuttle-grey: #54595f;

@warn "$color-raven token has been deprecated as of 0.16.2, please use $color-shuttle-grey";
$color-raven: $color-shuttle-grey;

$color-shark: #2a2c2e;
$color-athens-grey: #f7f7f8;

$color-telus-purple: #4b286d;

@warn "$color-grape token has been deprecated as of 0.16.2, new name for this colour is $color-telus-purple";
$color-grape: $color-telus-purple;

@warn "$color-royal-purple token has been deprecated as of 0.16.2";
$color-grape: #4b286d;
$color-royal-purple: #6e3ba1;

$color-white-lilac: #f2eff4;
$color-cardinal: #c12335;
$color-lavender-blush: #fff6f8;
Expand All @@ -41,16 +25,16 @@ $color-gainsboro: #d8d8d8;
$color-link: $color-shuttle-grey;
$color-text: $color-shark;

// Tokens
$color-primary: $color-forest-green;
$color-secondary: $color-telus-purple;

// Icon colors
$color-icon-primary: $color-primary;
$color-icon-secondary: $color-secondary;
$color-icon-primary: $color-japanese-laurel;
$color-icon-secondary: $color-grape;
$color-icon-disabled: $color-shuttle-grey;
$color-icon-error: $color-cardinal;

// Background colours
$color-primary: $color-forest-green;
$color-secondary: $color-grape;

//
// Typography
//
Expand Down
2 changes: 1 addition & 1 deletion core/scss/utility/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
color: inherit;
transition: color .2s, left .3s;
left: -2px;
margin-left: 10px;
margin-left: 2px;
}

// Deprecated 0.16.0
Expand Down
Binary file modified designs/TDS.sketch
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"bugs": {
"url": "https://github.com/telusdigital/tds/issues"
},
"homepage": "http://tds.telus.com",
"homepage": "https://github.com/telusdigital/tds#readme",
"devDependencies": {
"autoprefixer": "^6.3.3",
"babel-core": "^6.17.0",
Expand Down Expand Up @@ -69,4 +69,4 @@
"^.+\\.(css|less|scss|sass)$": "<rootDir>/__mocks__/styleMock.js"
}
}
}
}
Loading

0 comments on commit a47b337

Please sign in to comment.