Skip to content

Commit

Permalink
fix(repo rename updates): to keep the old repo instead of using the n…
Browse files Browse the repository at this point in the history
…ewly created so we don't loose
  • Loading branch information
lzcabrera committed Jun 19, 2017
1 parent e9cc6a8 commit 4792505
Show file tree
Hide file tree
Showing 22 changed files with 222 additions and 188 deletions.
232 changes: 121 additions & 111 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Install [commitizen](https://github.com/commitizen/cz-cli) globally to be prompt

Clone this repository

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

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

Expand All @@ -46,7 +46,7 @@ Ready to commit changes? Validate your code by running the linters & tests:
npm run lint
npm test

Or even better, setup a [pre-commit git hook](https://github.com/telusdigital/telus-thorium-core/wiki/pre-commit-hook-for-linting).
Or even better, setup a [pre-commit git hook](https://github.com/telusdigital/tds/wiki/pre-commit-hook-for-linting).

To commit your changes use the command

Expand Down
12 changes: 4 additions & 8 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,16 @@

### NEW CDN files
* New CSS CDN file path is
* 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)
* 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)
* New JS file path on CDN with Global Component
* https://cdn.telus.digital/thorium/enriched/v0.16.0/tds-enriched.min.js
* https://cdn.telus.digital/thorium/enriched/v0.16.1/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
20 changes: 10 additions & 10 deletions ci.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ createJenkinsJob(
scm {
git {
remote {
github('telusdigital/telus-thorium-core', 'ssh')
github('telusdigital/tds', 'ssh')
credentials('jenkins')
branch 'qatesting'
}
Expand Down Expand Up @@ -84,7 +84,7 @@ createJenkinsJob(
}

createJenkinsJob(
'telus-thorium--build',
'telus-TDS--build',
'Pull latest code from Github then install dependencies, lint, unit test, and build artifacts'
) {
wrappers {
Expand All @@ -98,7 +98,7 @@ createJenkinsJob(
scm {
git {
remote {
github('telusdigital/telus-thorium-core', 'ssh')
github('telusdigital/tds', 'ssh')
credentials('jenkins')
branch 'master'
}
Expand All @@ -124,7 +124,7 @@ createJenkinsJob(
onlyIfSuccessful()
}

downstream 'telus-thorium--deploy-stage'
downstream 'telus-TDS--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-thorium--deploy-stage copies the static site contents to the Staging
* telus-TDS--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-thorium--deploy-stage', 's3://cdn.telus-thorium-doc-staging/', 'telus-thorium--build')
createJenkinsDeployJob('telus-TDS--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-thorium--deploy-stage')
createJenkinsDeployJob('telus-thorium--deploy-prod', 's3://cdn.telus-thorium-doc-production/', 'telus-TDS--deploy-stage')

createJenkinsJob(
'telus-thorium--release',
Expand All @@ -171,7 +171,7 @@ createJenkinsJob(
scm {
git {
remote {
github('telusdigital/telus-thorium-core', 'ssh')
github('telusdigital/tds', 'ssh')
credentials('tds-deploy')
branch 'master'
}
Expand Down Expand Up @@ -224,7 +224,7 @@ createJenkinsJob('telus-thorium--redeploy-cdn', 'Deploy an existing, tagged rele
scm {
git {
remote {
github('telusdigital/telus-thorium-core', 'ssh')
github('telusdigital/tds', 'ssh')
credentials('jenkins')
branch 'refs/tags/\$THORIUM_RELEASE_VERSION'
}
Expand Down Expand Up @@ -260,7 +260,7 @@ createJenkinsJob('telus-thorium--redeploy-npm', 'Deploy an existing, tagged rele
scm {
git {
remote {
github('telusdigital/telus-thorium-core', 'ssh')
github('telusdigital/tds', 'ssh')
credentials('jenkins')
branch 'refs/tags/\$THORIUM_RELEASE_VERSION'
}
Expand Down
8 changes: 4 additions & 4 deletions core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "telus-thorium-core",
"version": "0.16.0",
"version": "0.16.1",
"description": "TELUS Design System core styles",
"eyeglass": "eyeglass-exports.js",
"keywords": [
Expand All @@ -16,14 +16,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/telusdigital/telus-thorium-core.git"
"url": "git+https://github.com/telusdigital/tds.git"
},
"author": "TELUS Digital",
"license": "UNLICENSED",
"bugs": {
"url": "https://github.com/telusdigital/telus-thorium-core/issues"
"url": "https://github.com/telusdigital/tds/issues"
},
"homepage": "https://github.com/telusdigital/telus-thorium-core#readme",
"homepage": "http://tds.telus.com",
"devDependencies": {
"autoprefixer": "^6.3.3",
"clean-css": "^3.4.10",
Expand Down
Binary file modified designs/TDS.sketch
Binary file not shown.
14 changes: 7 additions & 7 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "telus-thorium-docs",
"version": "0.16.0",
"version": "0.16.1",
"description": "TELUS Design System documentation website",
"main": "index.js",
"scripts": {
Expand All @@ -15,14 +15,14 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/telusdigital/telus-thorium-core.git"
"url": "git+https://github.com/telusdigital/tds.git"
},
"author": "TELUS Digital",
"license": "UNLICENSED",
"bugs": {
"url": "https://github.com/telusdigital/telus-thorium-core/issues"
"url": "https://github.com/telusdigital/tds/issues"
},
"homepage": "https://github.com/telusdigital/telus-thorium-core#readme",
"homepage": "http://tds.telus.com",
"devDependencies": {
"autoprefixer": "^6.3.3",
"babel-core": "^6.17.0",
Expand Down Expand Up @@ -50,8 +50,8 @@
"style-loader": "^0.13.1",
"stylelint": "^7.9.0",
"stylelint-config-standard": "^16.0.0",
"telus-thorium-core": "^0.16.0",
"telus-thorium-enriched": "^0.16.0",
"telus-thorium-core": "^0.16.1",
"telus-thorium-enriched": "^0.16.1",
"url-loader": "^0.5.8",
"webpack": "^1.13.2",
"webpack-dev-server": "^1.16.2",
Expand All @@ -69,4 +69,4 @@
"^.+\\.(css|less|scss|sass)$": "<rootDir>/__mocks__/styleMock.js"
}
}
}
}
17 changes: 16 additions & 1 deletion docs/src/html/1-About/4-changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,24 @@ template: changelog.jade
---



## v0.16.1


https://github.com/telusdigital/tds/releases/tag/v0.16.1

- docs(changelog): usual manual update
- docs(package.json): remove cp command for font-for-sketch
- refactor(github repo): update github repo to telusdigital/tds
- test(test): test
- build(groovy): update stage build



## v0.16.0


https://github.com/telusdigital/telus-thorium-core/releases/tag/v0.16.0
https://github.com/telusdigital/tds/releases/tag/v0.16.0

- docs(changelog): update
- Update README.md
Expand All @@ -16,6 +30,7 @@ https://github.com/telusdigital/telus-thorium-core/releases/tag/v0.16.0
- Beta Release (#369)
- docs(typography example): fix typo on list class
- docs(links): update code to match example
- Changelog and version bump for v0.16.0



Expand Down
2 changes: 1 addition & 1 deletion docs/src/html/2-Use-TDS/1-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ It does a great job handling React, ES6, styles, and more.

Internally, Enriched Components will `require()` their scss when `process.env.BROWSER` is `true`.

See the [Webpack file of this documentation site](https://github.com/telusdigital/telus-thorium-core/blob/master/docs/webpack.config.js) for an example configuration.
See the [Webpack file of this documentation site](https://github.com/telusdigital/tds/blob/master/docs/webpack.config.js) for an example configuration.

## Versioning

Expand Down
4 changes: 2 additions & 2 deletions docs/src/html/2-Use-TDS/2-setting-up-projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ Don't worry about tagging your commits, changing version numbers, or creating re
### Clone the TDS repo

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

Symlink the core & enriched modules so changes are immediately picked up by your local documentation site instance.
Expand Down
20 changes: 10 additions & 10 deletions docs/src/html/2-Use-TDS/3-receiving-updates.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ template: doc.jade

### CDN users

The CDN-hosted TDS has its complete version number in the path. For example, version 0.9.5 can be found at:
The CDN-hosted TDS has its complete version number in the path. For example, version !!TDS_VERSION!! can be found at:

<p style="text-align: center;">
`https://cdn.telus.digital/thorium/core/v0.9.5/tds.min.css`
`https://cdn.telus.digital/thorium/core/!!TDS_VERSION!!/tds.min.css`
</p>

To upgrade, change this URL in your project's `<link>` tag.
Expand All @@ -32,14 +32,14 @@ If you want to use our latest and greatest release you can include the following
`https://cdn.telus.digital/thorium/core/v0-latest/tds.min.css`
</p>

However, if you are already in production and don't want our releases to break your site, we recommend you use a fixed version until you have time to accommodate the tweaks needed to consume the latest version as per our [Upgrading Guide](https://github.com/telusdigital/telus-thorium-core/blob/master/UPGRADING.md).
However, if you are already in production and don't want our releases to break your site, we recommend you use a fixed version until you have time to accommodate the tweaks needed to consume the latest version as per our [Upgrading Guide](https://github.com/telusdigital/tds/blob/master/UPGRADING.md).

### NPM module users

Run NPM's update command to get the latest published version. The NPM tool will choose a version number compatible with the [constraint](#versioning) in your package.json file.

```bash
npm update telus-thorium-core
npm update tds
```

See the [npm-update documentation on npmjs.com](https://docs.npmjs.com/cli/update) for an in-depth guide to using this command.
Expand All @@ -57,9 +57,9 @@ See the [npm-update documentation on npmjs.com](https://docs.npmjs.com/cli/updat

We use a few different files to document the TDS repository and its changes. All teams should examine these documents before applying updates.

* [README](https://github.com/telusdigital/telus-thorium-core/blob/master/README.md) file contains the most basic information a developer needs to get up and running. For further instructions, see the “Getting Started” section of the documentation site.
* [CHANGELOG](https://github.com/telusdigital/telus-thorium-core/blob/master/CHANGELOG.md) file describes what was added/updated/fixed in each version, with a new entry for every release
* [UPGRADING](https://github.com/telusdigital/telus-thorium-core/blob/master/UPGRADING.md) file has instructions for any code changes a user has to make when upgrading to a major new version
* [README](https://github.com/telusdigital/tds/blob/master/README.md) file contains the most basic information a developer needs to get up and running. For further instructions, see the “Getting Started” section of the documentation site.
* [CHANGELOG](https://github.com/telusdigital/tds/blob/master/CHANGELOG.md) file describes what was added/updated/fixed in each version, with a new entry for every release
* [UPGRADING](https://github.com/telusdigital/tds/blob/master/UPGRADING.md) file has instructions for any code changes a user has to make when upgrading to a major new version
* Breaking changes must be documented here in detail

Users should actively bump the version in a non-production environment, and ensure that this is fully smoke tested before being deployed.
Expand All @@ -81,15 +81,15 @@ Users should actively bump the version in a non-production environment, and ensu
* The outcome squads’ local QA should execute testing. Defects should be logged in local project boards, and be reviewed by Product manager.
* Project Sponsors may need to be made aware of the changes and accept that visual changes will be happening, depending on business requirements
* For any issues that must be addressed immediately (and not in the next TDS), code overrides can be written locally by developers and logged as a comment on the local defect ticket.
* Breaking defects should immediately be filed with TDS [via an issue in Git](https://github.com/telusdigital/telus-thorium-core/issues).
* Breaking defects should immediately be filed with TDS [via an issue in Git](https://github.com/telusdigital/tds/issues).

## Getting Design Updates

---

Designers should [download the latest Master sketch file](/2-Use-TDS/5-downloads.html) and use TDS elements to create their page layouts.

In addition to the downloads page, the Sketch file is also found in the ["designs" folder of the Git repo](https://github.com/telusdigital/telus-thorium-core/tree/master/designs).
In addition to the downloads page, the Sketch file is also found in the ["designs" folder of the Git repo](https://github.com/telusdigital/tds/tree/master/designs).

## How to handle defects

Expand Down Expand Up @@ -122,7 +122,7 @@ If an issue exists, Users must do one of the following NPM/CDN procedures:

### File an issue

Open a [Github issue](https://github.com/telusdigital/telus-thorium-core/issues) describing the defect.
Open a [Github issue](https://github.com/telusdigital/tds/issues) describing the defect.

* If the issue is small and could likely be patched, contact the TDS team, so they can quickly patch and broadcast.
* If the issue is large/cannot a fix cannot be released quickly, the TDS team will broadcast that there has been a significant issue -- and that all teams should downgrade their version numbers, so their project will avoid the defective release
Expand Down
14 changes: 7 additions & 7 deletions docs/src/html/2-Use-TDS/4-contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ If you have any questions [shoot us an email](mailto:alexandra.fedyk@telus.com).

### Report Bugs

If you find a bug please [create an issue through GitHub](https://github.com/telusdigital/telus-thorium-core/issues). Please include:
If you find a bug please [create an issue through GitHub](https://github.com/telusdigital/tds/issues). Please include:

* Your operating system name and version.
* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.

For more details on how to file Github issues, refer to the repo's [wiki](https://github.com/telusdigital/telus-thorium-core/wiki/Tasks,-Defects-and-User-Story-Examples).
For more details on how to file Github issues, refer to the repo's [wiki](https://github.com/telusdigital/tds/wiki/Tasks,-Defects-and-User-Story-Examples).

### Author documentation

The TELUS Design System could always use better documentation, whether as part of the official documentation site, in comments, or even on the web as blog posts or articles.

The current documentation lives in the [docs directory](https://github.com/telusdigital/telus-thorium-core/tree/master/docs) and follows just a few simple rules:
The current documentation lives in the [docs directory](https://github.com/telusdigital/tds/tree/master/docs) and follows just a few simple rules:

* Each category of documentation is a folder named like *1-Introduction* where "Introduction" is the name of the category, and 1 is its position in the navigation menu.
* Within each category folder are markdown files documenting TDS.
Expand All @@ -46,19 +46,19 @@ The current documentation lives in the [docs directory](https://github.com/telus

---

The best way to send feedback is to [file an issue on GitHub](https://github.com/telusdigital/telus-thorium-core/issues).
The best way to send feedback is to [file an issue on GitHub](https://github.com/telusdigital/tds/issues).

If you're proposing a feature:

* Explain in detail how it would work.
* Keep the scope as narrow as possible, to make it easier to implement.
* Remember that this is a volunteer-driven project, and that contributions are welcome.

For more details on how to file Github issues, refer to the repo's [wiki](https://github.com/telusdigital/telus-thorium-core/wiki/Tasks,-Defects-and-User-Story-Examples).
For more details on how to file Github issues, refer to the repo's [wiki](https://github.com/telusdigital/tds/wiki/Tasks,-Defects-and-User-Story-Examples).

### Contribute code

Fix [bugs](https://github.com/telusdigital/telus-thorium-core/issues?q=is%3Aopen+is%3Aissue+label%3A%22%5BType%5D+Bug%22) and/or implement [features](https://github.com/telusdigital/telus-thorium-core/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22) by choosing an open task from the [Github issues list](https://github.com/telusdigital/telus-thorium-core/issues).
Fix [bugs](https://github.com/telusdigital/tds/issues?q=is%3Aopen+is%3Aissue+label%3A%22%5BType%5D+Bug%22) and/or implement [features](https://github.com/telusdigital/tds/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+Request%22) by choosing an open task from the [Github issues list](https://github.com/telusdigital/tds/issues).


## Start contributing
Expand All @@ -71,7 +71,7 @@ At its core, contributing with Git involves:
2. Creating a working branch, from master, in which to make changes.
3. Opening a pull request from your branch to master.

For more details on how to contribute code, refer to the repo's [wiki](https://github.com/telusdigital/telus-thorium-core/wiki/Contributing-Code)
For more details on how to contribute code, refer to the repo's [wiki](https://github.com/telusdigital/tds/wiki/Contributing-Code)


## Components and Blocks Contribution criteria
Expand Down
2 changes: 1 addition & 1 deletion docs/src/html/3-Foundational-Elements/9-design-tokens.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Design tokens are the visual design atoms of the design system — specifically,
they are named entities that store visual design attributes.


Checkout the latest [variables.scss](https://github.com/telusdigital/telus-thorium-core/blob/master/core/scss/settings/_variables.scss)
Checkout the latest [variables.scss](https://github.com/telusdigital/tds/blob/master/core/scss/settings/_variables.scss)
4 changes: 2 additions & 2 deletions docs/src/html/4-Global Components/20-ExpandCollapse.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ const AccordionExpandCollapseEx = () => {
return (
<ExpandCollapse.Group accordion>
<ExpandCollapse.Panel header="Panel #1">
Panel #1 Body
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris lacinia fermentum nisl, id lobortis nunc porta sed. Vestibulum quis tortor non nisl vulputate varius. Vivamus euismod congue mi, quis ultricies dolor viverra at.</p>
</ExpandCollapse.Panel>
<ExpandCollapse.Panel header="Panel #2">
Panel #2 Body
<p>Ut fermentum, turpis vel tincidunt volutpat, diam est vehicula leo, sed convallis dolor ante aliquet nisi. Nunc nisi erat, pulvinar quis lectus eget, tristique suscipit lectus. Maecenas non erat semper, tristique odio euismod, pulvinar metus.</p>
</ExpandCollapse.Panel>
</ExpandCollapse.Group>
);
Expand Down
Loading

0 comments on commit 4792505

Please sign in to comment.