Skip to content

Commit

Permalink
Merge branch 'release/2.20.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
saschadube committed Apr 28, 2015
2 parents 8dbae3e + 2bfecea commit 7343bc7
Show file tree
Hide file tree
Showing 26 changed files with 176 additions and 112 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

### 2.20.1 (April 28, 2015)
- Added active state for table rows
- Added new hooks to table component
- Fixed panel title margin

### 2.20.0 (April 24, 2015)
- Added block component
- Added contrast component
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ The built version of UIkit will be put in the `/dist` subdirectory. Pass a theme
### Browsersync

```
gulp browsersync
gulp sync
```

After running `gulp browsersync` a new browser instance will open, pointing to the uikit folder - `http://localhost:3000/`. The browser window will reload anytime you modify a source file.
After running `gulp sync` a new browser instance will open, pointing to the uikit folder - `http://localhost:3000/`. The browser window will reload anytime you modify a source file.

### Custom prefix

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uikit",
"version": "2.20.0",
"version": "2.20.1",
"homepage": "http://getuikit.com",
"main": [
"./dist/**/*.*"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "uikit/uikit",
"type": "library",
"description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
"version": "2.20.0",
"version": "2.20.1",
"keywords": [],
"homepage": "http://getuikit.com/",
"authors": [],
Expand Down
2 changes: 1 addition & 1 deletion docs/css/uikit.docs.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/documentation_project-structure.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ <h2 id="tests"><a href="#tests" class="uk-link-reset">Tests</a></h2>
<p>UIkit provides test files for every component. Each of these pages contains test cases of its component and gives you an overview of all the possibilities that are supported out of the box.</p>


<p>UIkit uses <a href="http://www.browsersync.io/">BrowserSync</a> to accelerate your workflow. Run <code>gulp browsersync [-t themename]</code> and you will be able to see changes on-the-fly, not only in your browser but across multiple devices, when working on your own theme or modifying existing ones. You can switch between all components and themes within the tests and even switch to RTL mode.</p>
<p>UIkit uses <a href="http://www.browsersync.io/">BrowserSync</a> to accelerate your workflow. Run <code>gulp sync</code> and you will be able to see changes on-the-fly, not only in your browser but across multiple devices, when working on your own theme or modifying existing ones. You can switch between all components and themes within the tests and even switch to RTL mode.</p>

<p><a class="uk-button uk-button-large uk-button-primary" href="../tests/overview.html">Go to tests</a></p>

Expand Down
2 changes: 1 addition & 1 deletion docs/js/uikit.min.js

Large diffs are not rendered by default.

68 changes: 38 additions & 30 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ gulp.task('default', ['dist', 'build-docs', 'indexthemes'], function(done) {

gulp.task('dist', ['dist-themes-core'], function(done) {

runSequence('sass', 'dist-core-minify', 'dist-core-header', 'browser-reload', 'dist-bower-file', function(){
runSequence('sass', 'dist-core-minify', 'dist-core-header', 'dist-bower-file', function(){

if (gutil.env.m || gutil.env.min) {
gulp.src(['./dist/**/*.css', './dist/**/*.js', '!./dist/**/*.min.css', '!./dist/**/*.min.js'])
Expand All @@ -108,12 +108,30 @@ gulp.task('dist', ['dist-themes-core'], function(done) {
/*
* development related tasks
* ---------------------------------------------------------*/
gulp.task('browser-sync', function() {
browserSync({
gulp.task('sync', function() {

function buildTheme(theme) {

return new Promise(function(resolve){

var tmp = themes;

themes = getThemes(theme);

runSequence('dist-themes-core', function(){
themes = tmp;
resolve();
});
});
}

var currenttheme,
bs = browserSync({
server: {
baseDir: "./",
startPath: "/tests",
middleware: function (req, res, next) {

baseDir : "./",
startPath : "/tests",
middleware : function (req, res, next) {

var m, theme;

Expand All @@ -125,19 +143,11 @@ gulp.task('browser-sync', function() {

if (theme) {

if (!watchCache[theme]) {

watchCache[theme] = new Promise(function(resolve){

var tmp = themes;
currenttheme = theme;

themes = getThemes(theme);
if (!watchCache[theme]) {

runSequence('dist-themes-core', function(){
themes = tmp;
resolve();
});
});
watchCache[theme] = buildTheme(theme);
}

watchCache[theme].then(function(){
Expand All @@ -149,23 +159,21 @@ gulp.task('browser-sync', function() {
}

}
}
});
});

gulp.task('browser-reload', function (done) {
watchCache = {};
browserSync.reload();
done();
});
},

gulp.task('browsersync', ['browser-sync', 'indexthemes'], function(done) {
files: [{
match: watchfolders,
fn: function (event, file) {

watchfolders = ['src/**/*', 'themes/**/*.less', 'custom/**/*.less'];
if (currenttheme) {

gulp.watch(watchfolders, function(files) {
runSequence('browser-reload');
watchCache = {};
bs.reload();
}
}
}]
});

});

gulp.task('watch', ['dist-clean', 'indexthemes'], function(done) {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "uikit",
"title": "UIkit",
"description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
"version": "2.20.0",
"version": "2.20.1",
"homepage": "http://www.getuikit.com",
"author": {
"name": "UIkit",
Expand All @@ -23,7 +23,7 @@
"node-promise": "^0.5.10"
},
"devDependencies": {
"browser-sync": "^1.3.7",
"browser-sync": "^2.6.5",
"del": "^0.1.2",
"glob": "^4.0.5",
"gulp": "^3.8.8",
Expand Down
2 changes: 1 addition & 1 deletion src/js/core/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

var UI = {}, _UI = window.UIkit;

UI.version = '2.20.0';
UI.version = '2.20.1';

UI.noConflict = function() {
// resore UIkit version
Expand Down
16 changes: 8 additions & 8 deletions src/less/components/dotnav.less
Original file line number Diff line number Diff line change
Expand Up @@ -123,22 +123,22 @@
* 2. Remove default focus style
*/

.uk-dotnav > * > *:hover,
.uk-dotnav > * > *:focus { // 1
.uk-dotnav > * > :hover,
.uk-dotnav > * > :focus { // 1
background: @dotnav-hover-background;
/* 2 */
outline: none;
.hook-dotnav-item-hover;
}

/* OnClick */
.uk-dotnav > * > *:active {
.uk-dotnav > * > :active {
background: @dotnav-onclick-background;
.hook-dotnav-item-onclick;
}

/* Active */
.uk-dotnav > *.uk-active > * {
.uk-dotnav > .uk-active > * {
background: @dotnav-active-background;
.hook-dotnav-item-active;
}
Expand All @@ -157,20 +157,20 @@
* 1. Apply hover style also to focus state
*/

.uk-dotnav-contrast > * > *:hover,
.uk-dotnav-contrast > * > *:focus { // 1
.uk-dotnav-contrast > * > :hover,
.uk-dotnav-contrast > * > :focus { // 1
background: @dotnav-contrast-hover-background;
.hook-dotnav-contrast-item-hover;
}

/* OnClick */
.uk-dotnav-contrast > * > *:active {
.uk-dotnav-contrast > * > :active {
background: @dotnav-contrast-onclick-background;
.hook-dotnav-contrast-item-onclick;
}

/* Active */
.uk-dotnav-contrast > *.uk-active > * {
.uk-dotnav-contrast > .uk-active > * {
background: @dotnav-contrast-active-background;
.hook-dotnav-contrast-item-active;
}
Expand Down
2 changes: 1 addition & 1 deletion src/less/core/block.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


/* ========================================================================
Component: List
Component: Block
========================================================================== */

.uk-block {
Expand Down
Loading

0 comments on commit 7343bc7

Please sign in to comment.