Skip to content

Commit

Permalink
Merge pull request #9 from viljamis/feature/v0.2.3
Browse files Browse the repository at this point in the history
Feature/v0.2.3
  • Loading branch information
arielsalminen authored Nov 3, 2017
2 parents 38db693 + 394f398 commit de1680a
Show file tree
Hide file tree
Showing 21 changed files with 246 additions and 227 deletions.
14 changes: 2 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -512,13 +512,8 @@ Vue Design System is not a front-end component library and never will be. Instea

## Roadmap

- [ ] Implement a top level utility nav and structure for prototyping.
- [ ] Make it possible to build as static HTML files to use with S3/GitHub hosting (use f.ex. [https://nuxtjs.org](https://nuxtjs.org)).
- [ ] Create a tutorial on why and what you can/should do with the tool.
- [ ] Implement some of the known best practices.
- [ ] Create better custom templates for styleguide.
- [ ] Better error handling and console logging.
- [ ] Cleanup NPM dependencies.
- [ ] Remove Vue components from `/tokens/` and make styleguide specific.
- [ ] Separate documentation from the readme on GitHub and split onto multiple pages.
- [ ] Add a few more default elements (like button f.ex.) with sensible default `props` for type, style, etc. for prototyping.
Expand All @@ -528,6 +523,7 @@ Vue Design System is not a front-end component library and never will be. Instea

## Changelog

* `0.2.3` (2017-11-03) - Better examples, error handling, and console logging.
* `0.2.2` (2017-11-02) - Fixes the serving of SVG icons to living documentation.
* `0.2.1` (2017-10-31) - Cleans up SCSS styles and adds examples for each token category.
* `0.2.0` (2017-10-30) - Adds YAML Design Token that are auto converted to JSON and SCSS.
Expand All @@ -542,10 +538,4 @@ Vue Design System is not a front-end component library and never will be. Instea

[Viljami Salminen](https://viljamis.com), [Artem Sapegin](http://sapegin.me), [Rafael Escala](https://github.com/rafaesc), [react-styleguidist contributors](https://github.com/styleguidist/react-styleguidist/graphs/contributors), [vue-styleguidist contributors](https://github.com/vue-styleguidist/vue-styleguidist/graphs/contributors), [Vue.js contributors](https://github.com/vuejs/vue/graphs/contributors), [vue-webpack-boilerplate contributors](https://github.com/vuejs-templates/webpack/graphs/contributors) and & [Theo contributors](https://github.com/salesforce-ux/theo/graphs/contributors).

Licensed under the MIT license.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Licensed under the [MIT license](https://github.com/viljamis/vue-design-system/blob/master/LICENSE).
97 changes: 96 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-design-system",
"version": "0.2.2",
"version": "0.2.3",
"description": "Vue Design System is an open-source tool for prototyping UI design systems.",
"author": "viljamis <[email protected]>",
"private": false,
Expand All @@ -17,14 +17,15 @@
"license": "MIT",
"scripts": {
"dev": "node build/dev-server.js",
"start": "npm run styleguide | onchange 'src/tokens/*.yml' -- theo src/tokens/tokens.yml --transform web --format map.scss,scss,json --dest src/tokens/compiled | theo src/tokens/tokens.yml --transform web --format map.scss,scss,json --dest src/tokens/compiled | npm run dev",
"start": "concurrently \"npm run styleguide\" \"onchange 'src/tokens/*.yml' -- theo src/tokens/tokens.yml --transform web --format map.scss,scss,json --dest src/tokens/compiled\" \"theo src/tokens/tokens.yml --transform web --format map.scss,scss,json --dest src/tokens/compiled\" \"npm run dev\"",
"build": "node build/build.js",
"styleguide": "vue-styleguidist server",
"styleguide:build": "vue-styleguidist build",
"theo": "theo src/tokens/tokens.yml --transform web --format map.scss,scss,json --dest src/tokens/compiled"
},
"dependencies": {
"assemble": "^0.3.83",
"concurrently": "^3.5.0",
"grunt": "^0.4.5",
"lodash": "^4.17.4",
"magic-string": "^0.22.4",
Expand Down
2 changes: 2 additions & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
// defined in them to keep things as modular as possible.
#app {
font: normal normal 100%/normal "Comic Sans MS", "Comic Sans", cursive;
height: 100%;
color: red;
}
* {
border-color: red;
}
body,html {
height: 100%;
margin: 0;
padding: 0;
}
Expand Down
5 changes: 4 additions & 1 deletion src/elements/Heading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,13 @@
font-family: $font-family-heading;
line-height: $line-height-heading;
color: $color-primary-rich-black;
margin-bottom: $space-small;
margin-bottom: $space-base;
@media #{$media-query-large} {
// This is how you’d use design tokens with media queries
}
&:last-child {
margin-bottom: 0;
}
}
h1 {
letter-spacing: $letter-spacing-tiny;
Expand Down
2 changes: 1 addition & 1 deletion src/elements/SvgIcon.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<component :is="type" :aria-label="ariaLabel" class="icon">
<component :is="type" :aria-label="ariaLabel" class="svg-icon">
</component>
</template>

Expand Down
4 changes: 2 additions & 2 deletions src/elements/TextLink.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<a :href="href" :target="target">
<a :href="href" :target="target" class="text-link">
<slot/>
</a>
</template>
Expand Down Expand Up @@ -28,7 +28,7 @@
</script>

<style lang="scss" scoped>
a {
.text-link {
@include reset;
font-family: $font-family-text;
color: $color-primary-vermilion;
Expand Down
4 changes: 2 additions & 2 deletions src/elements/TextStyle.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<component :is="type" :class="['text ', variation]">
<component :is="type" :class="['text-style ', variation]">
<slot/>
</component>
</template>
Expand Down Expand Up @@ -28,7 +28,7 @@
</script>

<style lang="scss" scoped>
.text {
.text-style {
@include reset;
color: $color-primary-rich-black;
font-family: $font-family-text;
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Wrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
padding: $space-large;
width: 100%;
@media #{$media-query-large} {
padding: $space-x-large;
padding: $space-large;
}
}
</style>
Expand Down
14 changes: 11 additions & 3 deletions src/patterns/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
</script>

<style lang="scss" scoped>
// Local component variables
$color-nav-link: $color-primary-bleu-de-france;
$color-nav-link-active: $color-primary-bleu-de-france;
.nav {
font-family: $font-family-text;
font-size: $font-size-small;
Expand All @@ -59,14 +63,18 @@
// This is how you’d use design tokens with media queries
}
a {
color: $color-primary-oxford-blue;
color: $color-nav-link;
padding: $space-tiny 0;
margin: 0 $space-tiny;
text-decoration: none;
display: inline-block;
&:hover {
color: $color-nav-link-active;
}
&.active {
border-bottom: 2px solid $color-primary-vermilion;
color: $color-primary-vermilion;
border-bottom: 2px solid $color-nav-link;
font-weight: $font-weight-bold;
color: $color-nav-link;
}
}
}
Expand Down
17 changes: 3 additions & 14 deletions src/router/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Vue from 'vue'
import Router from 'vue-router'
import Dashboard from '@/templates/Dashboard'
import Posts from '@/templates/Posts'
import Settings from '@/templates/Settings'
import Index from '@/templates/Index'
import NotFound from '@/templates/NotFound'

Vue.use(Router)
Expand All @@ -11,17 +9,8 @@ export default new Router({
routes: [
{
path: '/',
name: 'Dashboard',
component: Dashboard
},
{
path: '/posts/',
name: 'Posts',
component: Posts
},
{ path: '/settings/',
name: 'Settings',
component: Settings
name: 'Index',
component: Index,
},
{
path: '*',
Expand Down
52 changes: 0 additions & 52 deletions src/templates/Dashboard.vue

This file was deleted.

Loading

0 comments on commit de1680a

Please sign in to comment.