Skip to content

Commit

Permalink
Merge branch 'release/v3.0.0-rc.18'
Browse files Browse the repository at this point in the history
  • Loading branch information
janschoenherr committed Oct 11, 2018
2 parents 3bc3737 + 8374834 commit d04d2a7
Show file tree
Hide file tree
Showing 48 changed files with 1,494 additions and 2,771 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -15,7 +15,7 @@ Also try to search for your issue. It may have already been answered or even fix
<!-- BUG REPORT TEMPLATE -->
### UIkit version
<!-- Check if the issue is reproducible with the latest stable version. -->
3.0.0-rc.17
3.0.0-rc.18

### Browser

Expand Down
28 changes: 25 additions & 3 deletions CHANGELOG.md
@@ -1,5 +1,26 @@
# Changelog

## 3.0.0 rc 18 (October 11, 2018)

### Added

- Add divider vertical modifier to Divider component

### Fixed

- Fix preserve color not working if class is set on svg element in Icon component
- Fix inverse hover color for accordion title
- Fix close color being overwritten from toolbar in Lightbox component
- Fix Modal not hiding upon being destroyed
- Fix using node as offset in position mixin
- Fix using Height Match component on elements with different offsetParents
- Fix rounding error in Height Match component
- Fix `scope` command for already scoped css, comments are removed from generated css files
- Fix Sticky placeholder height on resize
- Fix starting/stopping of autoplay in Lightbox
- Fix initially wrong position of background image in Parallax component
- Fix calling `isActive` on `undefined` in Navbar component

## 3.0.0 rc 17 (September 27, 2018)

### Added
Expand All @@ -8,8 +29,8 @@

### Changed

- Viewport Height component no longer sets a `height` except for IE
- Viewport Height component no longer forces `box-sizing: border-box`
- Viewport Height component no longer sets a `height` except for IE
- Viewport Height component no longer forces `box-sizing: border-box`
- Improve Tooltip performance
- Improve Parallax performance
- Improve Sticky performance
Expand All @@ -22,12 +43,13 @@

### Fixed

- Fix `UIkit.mixin()`
- Fix `UIkit.mixin()`
- Fix issue with list bullet in combination with multi column layouts
- Allow for special characters in URI hash in Scroll Component
- Height Match also sets a `height` in IE
- Slideshow sets `min-height` instead of `height`


## 3.0.0 rc 16 (September 12, 2018)

### Fixed
Expand Down
19 changes: 9 additions & 10 deletions build/publishDev.js
@@ -1,26 +1,25 @@

/* eslint-env node */
const path = require('path');
const {execSync} = require('child_process');
const jsonData = require('../package.json');

//default exec options
// default exec options
const execOpts = {cwd: path.resolve(__dirname + '/..'), encoding: 'utf8'};

//get clean version string
// get clean version string
let [, version] = /(\d+\.\d+\.\d+)/.exec(jsonData.version);

//if this is a regular version, e.g. no 'beta', 'alpha' or 'rc', do increment the version by 1
// if this is a regular version, e.g. no 'beta', 'alpha' or 'rc', do increment the version by 1
if (!['-alpha', '-beta', '-rc'].some(qualifier => jsonData.version.includes(qualifier))) {
const versionSplit = version.split('.');
const patch = parseInt(versionSplit.pop());
version = [...versionSplit, patch + 1].join('.');
}

//get current git hash
// get current git hash
const hash = execSync('git rev-parse --short HEAD', execOpts).trim();

//check for changes to publish
// check for changes to publish
const changes = execSync('git log -1 --pretty=%B', execOpts);

const autoPublish = ['feat', 'fix', 'refactor', 'perf'];
Expand All @@ -31,7 +30,7 @@ const commitRegex = /^(revert: )?(feat|fix|polish|docs|style|refactor|perf|test|
let change = commitRegex.exec(changes);
if (change) {

//find specific changes to publish
// find specific changes to publish
while (change) {
if (autoPublish.includes(change[2])) {
publish = true;
Expand All @@ -44,12 +43,12 @@ if (change) {

if (publish) {

//set version of package.json
// set version of package.json
execSync(`npm version ${version}-dev.${hash} --git-tag-version false`, execOpts);

//create dist files
// create dist files
execSync('npm run compile && npm run compile-rtl && npm run build-scss', execOpts);

//publish to dev tag
// publish to dev tag
execSync('npm publish --tag dev', execOpts);
}
18 changes: 11 additions & 7 deletions build/scope.js
Expand Up @@ -24,12 +24,16 @@ if (argv.h || argv.help) {
scope.js // will scope with uk-scope
scope.js -s "my-scope" // will replace any existing scope with my-scope
scope.js cleanup // will remove current scope
`);
} else {
readAllFiles().then(startProcess);
}

function stripComments(input) {
return input.replace(/\/\*(.|\n)*?\*\//gm, '').split('\n').filter(line => line.trim().substr(0, 2) !== '//').join('\n');
}

function startProcess() {

const currentScope = getCurrentScope();
Expand Down Expand Up @@ -75,12 +79,12 @@ function doScope(scopeFromInput) {
const scopes = [];
allFiles.forEach(store => {

scopes.push(util.renderLess(`.${scopeFromInput} {\n${store.data}\n}`)
.then(output =>
store.data = `/* scoped: ${scopeFromInput} */` +
output.replace(new RegExp(`.${scopeFromInput} ${/{(.|[\r\n])*?}/.source}`), '')
.replace(new RegExp(`.${scopeFromInput} ${/\s((\.(uk-(drag|modal-page|offcanvas-page|offcanvas-flip)))|html)/.source}`, 'g'), '$1')
)
scopes.push(util.renderLess(`.${scopeFromInput} {\n${stripComments(store.data)}\n}`)
.then(output => {
store.data = `/* scoped: ${scopeFromInput} */\n` +
output.replace(new RegExp(`.${scopeFromInput} ${/{(.|[\r\n])*?}/.source}`), '')
.replace(new RegExp(`.${scopeFromInput}${/\s((\.(uk-(drag|modal-page|offcanvas-page|offcanvas-flip)))|html)/.source}`, 'g'), '$1')
})
);
});

Expand Down
32 changes: 27 additions & 5 deletions dist/css/uikit-rtl.css
@@ -1,4 +1,4 @@
/*! UIkit 3.0.0-rc.17 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
/*! UIkit 3.0.0-rc.18 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
/* ========================================================================
Component: Base
========================================================================== */
Expand Down Expand Up @@ -675,6 +675,15 @@ a.uk-link-reset:hover,
border-top: 1px solid #e5e5e5;
vertical-align: top;
}
/* Vertical
========================================================================== */
.uk-divider-vertical {
width: 1px;
height: 100px;
margin-right: auto;
margin-left: auto;
border-right: 1px solid #e5e5e5;
}
/* ========================================================================
Component: List
========================================================================== */
Expand Down Expand Up @@ -1051,10 +1060,10 @@ button.uk-icon:not(:disabled) {
/*
* Set the fill and stroke color of all SVG elements to the current text color
*/
.uk-icon [fill*='#']:not(.uk-preserve) {
.uk-icon:not(.uk-preserve) [fill*='#']:not(.uk-preserve) {
fill: currentcolor;
}
.uk-icon [stroke*='#']:not(.uk-preserve) {
.uk-icon:not(.uk-preserve) [stroke*='#']:not(.uk-preserve) {
stroke: currentcolor;
}
/*
Expand Down Expand Up @@ -5173,7 +5182,7 @@ ul.uk-nav-sub {
background: rgba(0, 0, 0, 0.3);
color: rgba(255, 255, 255, 0.7);
}
.uk-lightbox-toolbar * {
.uk-lightbox-toolbar > * {
color: rgba(255, 255, 255, 0.7);
}
/* Toolbar Icon (Close)
Expand Down Expand Up @@ -9397,6 +9406,19 @@ iframe.uk-cover {
.uk-offcanvas-bar .uk-divider-small::after {
border-top-color: rgba(255, 255, 255, 0.2);
}
.uk-light .uk-divider-vertical::after,
.uk-section-primary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-section-secondary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-tile-primary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-tile-secondary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-card-primary.uk-card-body .uk-divider-vertical::after,
.uk-card-primary > :not([class*='uk-card-media']) .uk-divider-vertical::after,
.uk-card-secondary.uk-card-body .uk-divider-vertical::after,
.uk-card-secondary > :not([class*='uk-card-media']) .uk-divider-vertical::after,
.uk-overlay-primary .uk-divider-vertical::after,
.uk-offcanvas-bar .uk-divider-vertical::after {
border-right-color: rgba(255, 255, 255, 0.2);
}
.uk-light .uk-list-divider > li:nth-child(n+2),
.uk-section-primary:not(.uk-preserve-color) .uk-list-divider > li:nth-child(n+2),
.uk-section-secondary:not(.uk-preserve-color) .uk-list-divider > li:nth-child(n+2),
Expand Down Expand Up @@ -11588,7 +11610,7 @@ iframe.uk-cover {
.uk-overlay-primary .uk-accordion-title:focus,
.uk-offcanvas-bar .uk-accordion-title:hover,
.uk-offcanvas-bar .uk-accordion-title:focus {
color: #666;
color: rgba(255, 255, 255, 0.7);
}
.uk-light .uk-iconnav > * > a,
.uk-section-primary:not(.uk-preserve-color) .uk-iconnav > * > a,
Expand Down
2 changes: 1 addition & 1 deletion dist/css/uikit-rtl.min.css

Large diffs are not rendered by default.

32 changes: 27 additions & 5 deletions dist/css/uikit.css
@@ -1,4 +1,4 @@
/*! UIkit 3.0.0-rc.17 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
/*! UIkit 3.0.0-rc.18 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
/* ========================================================================
Component: Base
========================================================================== */
Expand Down Expand Up @@ -675,6 +675,15 @@ a.uk-link-reset:hover,
border-top: 1px solid #e5e5e5;
vertical-align: top;
}
/* Vertical
========================================================================== */
.uk-divider-vertical {
width: 1px;
height: 100px;
margin-left: auto;
margin-right: auto;
border-left: 1px solid #e5e5e5;
}
/* ========================================================================
Component: List
========================================================================== */
Expand Down Expand Up @@ -1051,10 +1060,10 @@ button.uk-icon:not(:disabled) {
/*
* Set the fill and stroke color of all SVG elements to the current text color
*/
.uk-icon [fill*='#']:not(.uk-preserve) {
.uk-icon:not(.uk-preserve) [fill*='#']:not(.uk-preserve) {
fill: currentcolor;
}
.uk-icon [stroke*='#']:not(.uk-preserve) {
.uk-icon:not(.uk-preserve) [stroke*='#']:not(.uk-preserve) {
stroke: currentcolor;
}
/*
Expand Down Expand Up @@ -5173,7 +5182,7 @@ ul.uk-nav-sub {
background: rgba(0, 0, 0, 0.3);
color: rgba(255, 255, 255, 0.7);
}
.uk-lightbox-toolbar * {
.uk-lightbox-toolbar > * {
color: rgba(255, 255, 255, 0.7);
}
/* Toolbar Icon (Close)
Expand Down Expand Up @@ -9397,6 +9406,19 @@ iframe.uk-cover {
.uk-offcanvas-bar .uk-divider-small::after {
border-top-color: rgba(255, 255, 255, 0.2);
}
.uk-light .uk-divider-vertical::after,
.uk-section-primary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-section-secondary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-tile-primary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-tile-secondary:not(.uk-preserve-color) .uk-divider-vertical::after,
.uk-card-primary.uk-card-body .uk-divider-vertical::after,
.uk-card-primary > :not([class*='uk-card-media']) .uk-divider-vertical::after,
.uk-card-secondary.uk-card-body .uk-divider-vertical::after,
.uk-card-secondary > :not([class*='uk-card-media']) .uk-divider-vertical::after,
.uk-overlay-primary .uk-divider-vertical::after,
.uk-offcanvas-bar .uk-divider-vertical::after {
border-left-color: rgba(255, 255, 255, 0.2);
}
.uk-light .uk-list-divider > li:nth-child(n+2),
.uk-section-primary:not(.uk-preserve-color) .uk-list-divider > li:nth-child(n+2),
.uk-section-secondary:not(.uk-preserve-color) .uk-list-divider > li:nth-child(n+2),
Expand Down Expand Up @@ -11588,7 +11610,7 @@ iframe.uk-cover {
.uk-overlay-primary .uk-accordion-title:focus,
.uk-offcanvas-bar .uk-accordion-title:hover,
.uk-offcanvas-bar .uk-accordion-title:focus {
color: #666;
color: rgba(255, 255, 255, 0.7);
}
.uk-light .uk-iconnav > * > a,
.uk-section-primary:not(.uk-preserve-color) .uk-iconnav > * > a,
Expand Down
2 changes: 1 addition & 1 deletion dist/css/uikit.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/uikit-icons.js

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

2 changes: 1 addition & 1 deletion dist/js/uikit-icons.min.js

Large diffs are not rendered by default.

0 comments on commit d04d2a7

Please sign in to comment.