Skip to content

Commit

Permalink
Merge pull request #131 from viljamis/release/3.5.6
Browse files Browse the repository at this point in the history
Release/3.5.6
  • Loading branch information
arielsalminen committed Oct 25, 2018
2 parents 56ae824 + f3f5308 commit 1988c09
Show file tree
Hide file tree
Showing 27 changed files with 1,413 additions and 1,457 deletions.
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"printWidth": 120,
"printWidth": 100,
"singleQuote": false,
"trailingComma": "es5",
"bracketSpacing": true,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The tool is built on top of [Vue.js](https://vuejs.org), [Vue Styleguidist](http

## Changelog

- `3.5.5` is the latest release.
- `3.5.6` is the latest release.
- See [Releases page](https://github.com/viljamis/vue-design-system/releases) for the full changelog.

## Need more help?
Expand Down
6 changes: 5 additions & 1 deletion build/check-versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ module.exports = function() {
const mod = versionRequirements[i]
if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
warnings.push(
mod.name + ": " + chalk.red(mod.currentVersion) + " should be " + chalk.green(mod.versionRequirement)
mod.name +
": " +
chalk.red(mod.currentVersion) +
" should be " +
chalk.green(mod.versionRequirement)
)
}
}
Expand Down
8 changes: 6 additions & 2 deletions build/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ const packageConfig = require("../package.json")

exports.assetsPath = function(_path) {
const assetsSubDirectory =
process.env.NODE_ENV === "production" ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory
process.env.NODE_ENV === "production"
? config.build.assetsSubDirectory
: config.dev.assetsSubDirectory
return path.posix.join(assetsSubDirectory, _path)
}

Expand Down Expand Up @@ -80,7 +82,9 @@ exports.cssLoaders = function(options) {
return {
css: generateLoaders(),
postcss: generateLoaders(),
sass: generateLoaders("sass", Object.assign({ indentedSyntax: true }, sassOptions)).concat(sassResourcesConfig),
sass: generateLoaders("sass", Object.assign({ indentedSyntax: true }, sassOptions)).concat(
sassResourcesConfig
),
scss: generateLoaders("sass", sassOptions).concat(sassResourcesConfig),
}
}
Expand Down
12 changes: 10 additions & 2 deletions build/webpack.base.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ module.exports = {
output: {
path: config.build.assetsRoot,
filename: "[name].js",
publicPath: process.env.NODE_ENV === "production" ? config.build.assetsPublicPath : config.dev.assetsPublicPath,
publicPath:
process.env.NODE_ENV === "production"
? config.build.assetsPublicPath
: config.dev.assetsPublicPath,
},
resolve: {
extensions: [".js", ".vue", ".json"],
Expand All @@ -45,7 +48,12 @@ module.exports = {
{
test: /\.js$/,
loader: "babel-loader",
include: [resolve("docs"), resolve("src"), resolve("test"), resolve("node_modules/webpack-dev-server/client")],
include: [
resolve("docs"),
resolve("src"),
resolve("test"),
resolve("node_modules/webpack-dev-server/client"),
],
},
{
test: /\.(png|jpe?g|gif)(\?.*)?$/,
Expand Down
5 changes: 4 additions & 1 deletion config/docs.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ module.exports = {
/**
* We’re defining below JS and SCSS requires for the documentation.
*/
require: [path.join(__dirname, "../docs/docs.helper.js"), path.join(__dirname, "../docs/docs.styles.scss")],
require: [
path.join(__dirname, "../docs/docs.helper.js"),
path.join(__dirname, "../docs/docs.styles.scss"),
],
/**
* Enabling the following option splits sections into separate views.
*/
Expand Down
25 changes: 8 additions & 17 deletions docs/components/status/Components.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<div class="component-status">
<ul class="status-list">
<li>
<Icon name="ready" fill="#7cb518" size="small" />
<Icon name="ready" fill="#7cb518" size="small"/>
<p>Ready</p>
</li>
<li>
<Icon name="review" :fill="tokens.color_ucla_gold.value" size="small" />
<Icon name="review" :fill="tokens.color_ucla_gold.value" size="small"/>
<p>Under review</p>
</li>
<li>
<Icon name="deprecated" :fill="tokens.color_vermilion.value" size="small" />
<p>Deprecated</p>
<Icon name="deprecated" :fill="tokens.color_vermilion.value" size="small"/>
<p>Deprecated</p>
</li>
<li>
<Icon name="prototype" :fill="tokens.color_bleu_de_france.value" size="small" />
<Icon name="prototype" :fill="tokens.color_bleu_de_france.value" size="small"/>
<p>Prototype</p>
</li>
<li>
Expand All @@ -36,22 +36,13 @@
<tbody>
<tr v-for="(component, index) in components" :key="index" class="component">
<td v-if="component.name">
<code class="name">
{{component.name}}
</code>
<code class="name">{{component.name}}</code>
</td>
<td v-else>N/A</td>
<td v-if="component.release">
{{component.release}}
</td>
<td v-if="component.release">{{component.release}}</td>
<td v-else>N/A</td>
<td v-if="component.status">
<Icon
v-if="component.status === 'ready'"
name="ready"
fill="#7cb518"
size="small"
/>
<Icon v-if="component.status === 'ready'" name="ready" fill="#7cb518" size="small"/>
<Icon
v-if="component.status === 'under-review' || component.status === 'review'"
name="review"
Expand Down
22 changes: 16 additions & 6 deletions docs/components/tokens/All.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,22 @@
</td>
<td v-else>N/A</td>
<td v-if="token.value">
<div v-if="token.type === 'color'" class="example color" :style="{ backgroundColor: token.value }" />
<div v-if="token.category === 'border-radius'" class="example border-radius" :style="{ borderRadius: token.value }" />
<div v-if="token.category === 'box-shadow'" class="example box-shadow" :style="{ boxShadow: token.value }" />
<code class="type">
{{token.value}}
</code>
<div
v-if="token.type === 'color'"
class="example color"
:style="{ backgroundColor: token.value }"
/>
<div
v-if="token.category === 'border-radius'"
class="example border-radius"
:style="{ borderRadius: token.value }"
/>
<div
v-if="token.category === 'box-shadow'"
class="example box-shadow"
:style="{ boxShadow: token.value }"
/>
<code class="type">{{token.value}}</code>
</td>
<td v-else>N/A</td>
<td v-if="token.category">{{token.category}}</td>
Expand Down
39 changes: 28 additions & 11 deletions docs/components/tokens/Color.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@
:key="index"
class="color"
:class="prop.category"
v-if="prop.type === 'color'">
<div class="swatch" :style="{ backgroundColor: prop.value }" />
<h3>{{prop.name.replace(/_/g, " ").replace(/color/g, "")}}</h3>
<span><em>RGB: </em>{{prop.value}}</span>
<span><em>SCSS: </em>${{prop.name.replace(/_/g, "-")}}</span>
v-if="prop.type === 'color'"
>
<div class="swatch" :style="{ backgroundColor: prop.value }"/>
<h3>{{prop.name.replace(/_/g, " ").replace(/color/g, "")}}</h3>
<span>
<em>RGB:</em>
{{prop.value}}
</span>
<span>
<em>SCSS:</em>
${{prop.name.replace(/_/g, "-")}}
</span>
</div>
</div>
</template>
Expand Down Expand Up @@ -59,19 +66,29 @@ export default {
align-content: stretch;
justify-content: left;
grid-template-columns:
calc(20% - #{$space-m}) calc(20% - #{$space-m}) calc(20% - #{$space-m}) calc(20% - #{$space-m})
calc(20% - #{$space-m})
calc(20% - #{$space-m})
calc(20% - #{$space-m})
calc(20% - #{$space-m})
calc(20% - #{$space-m});
grid-column-gap: $space-m;
@media (max-width: 1300px) {
grid-template-columns: calc(25% - #{$space-m}) calc(25% - #{$space-m}) calc(25% - #{$space-m}) calc(
25% - #{$space-m}
);
grid-template-columns:
calc(25% - #{$space-m})
calc(25% - #{$space-m})
calc(25% - #{$space-m})
calc(25% - #{$space-m});
}
@media (max-width: 1100px) {
grid-template-columns: calc(33.333% - #{$space-m}) calc(33.333% - #{$space-m}) calc(33.333% - #{$space-m});
grid-template-columns:
calc(33.333% - #{$space-m})
calc(33.333% - #{$space-m})
calc(33.333% - #{$space-m});
}
@media (max-width: 900px) {
grid-template-columns: calc(50% - #{$space-m}) calc(50% - #{$space-m});
grid-template-columns:
calc(50% - #{$space-m})
calc(50% - #{$space-m});
}
@media (max-width: 400px) {
grid-template-columns: 100%;
Expand Down
6 changes: 4 additions & 2 deletions docs/components/tokens/FontSize.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
:key="index"
class="font"
v-if="prop.category === 'font-size'"
:style="{ fontSize: prop.value }">
${{prop.name.replace(/_/g, "-")}}<span> ({{prop.value}})</span>
:style="{ fontSize: prop.value }"
>
${{prop.name.replace(/_/g, "-")}}
<span>({{prop.value}})</span>
</div>
</div>
</template>
Expand Down
6 changes: 4 additions & 2 deletions docs/components/tokens/Spacing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
:key="index"
class="space"
v-if="prop.category === 'space'"
:style="{ lineHeight: prop.value, height: prop.value }">
${{prop.name.replace(/_/g, "-")}}<span> ({{prop.value}})</span>
:style="{ lineHeight: prop.value, height: prop.value }"
>
${{prop.name.replace(/_/g, "-")}}
<span>({{prop.value}})</span>
</div>
</div>
</template>
Expand Down
5 changes: 1 addition & 4 deletions docs/docs.styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ div[class^="rsg--root"] a[class^="rsg--link"] {
div[class^="rsg--wrapper"] > h1[class^="rsg--heading"],
div[class^="rsg--wrapper"] > h2[class^="rsg--heading"] {
display: block;
width: 100%;
border: 0;
line-height: $line-height-s;
padding: $space-xl $space-xl;
Expand Down Expand Up @@ -211,7 +210,6 @@ div[class^="rsg--logo"] {
@include inset-space($space-m);
border-bottom: 1px solid rgba($color-white, 0.1);
h1 {
color: $color-white;
color: tint($color-bleu-de-france, 90%);
font-weight: $weight-normal;
}
Expand Down Expand Up @@ -605,10 +603,9 @@ table[class^="rsg--table"] {
th {
padding: $space-s $space-l $space-s $space-s;
font-size: $size-s;
font-weight: $weight-bold;
font-weight: $weight-semi-bold;
text-transform: uppercase;
letter-spacing: 1px;
font-weight: $weight-semi-bold;
border-radius: 0;
background: $color-cloud;
color: tint($color-oxford-blue, 10%);
Expand Down
4 changes: 2 additions & 2 deletions docs/downloads.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ You’re looking at Vue Design System’s demo downloads section. Everything you

## Vue Design System (zip)

* [Download latest version](https://github.com/viljamis/vue-design-system/archive/master.zip)
* [All versions](https://github.com/viljamis/vue-design-system/releases)
- [Download latest version](https://github.com/viljamis/vue-design-system/archive/master.zip)
- [All versions](https://github.com/viljamis/vue-design-system/releases)
3 changes: 2 additions & 1 deletion docs/utils/activeNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ export default {
if (process && process.env && process.env.NODE_ENV === "test") {
currentURL = "/example/"
} else {
currentURL = window.location.pathname + window.location.hash.split("?")[0].replace(/%20/g, " ")
currentURL =
window.location.pathname + window.location.hash.split("?")[0].replace(/%20/g, " ")
}

if (sidebar) {
Expand Down
4 changes: 3 additions & 1 deletion docs/utils/filterSearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
export default {
methods: {
showLinks() {
const links = document.querySelectorAll("div[class^='rsg--sidebar'] ul ul[class^='rsg--list']")
const links = document.querySelectorAll(
"div[class^='rsg--sidebar'] ul ul[class^='rsg--list']"
)
if (links) {
;[].forEach.call(links, function(element) {
element.classList.add("vueds-visible")
Expand Down
Loading

0 comments on commit 1988c09

Please sign in to comment.