Skip to content

Commit

Permalink
updated version and dists
Browse files Browse the repository at this point in the history
  • Loading branch information
saschadube committed Jul 31, 2013
1 parent a8bfcb4 commit cd95990
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 108 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

### 1.0.2 (July 31, 2013)

- Removed auto dropdown flip if navbar is flipped
- Removed Navbar.js
- Added boundary option for dropdowns
- Removed Navbar.js
- Removed auto dropdown flip if navbar is flipped

**Documentation and repository**
**Documentation and repository**

- Updated dropdown and navbar documentation
- Updated dropdown and navbar documentation


### 1.0.1 (July 26, 2013)
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uikit",
"version": "1.0.1",
"version": "1.0.2",
"main": ["dist/uikit.min.js","dist/uikit.min.css"],

"dependencies": {
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": "1.0.1",
"version": "1.0.2",
"keywords": [],
"homepage": "http://getuikit.com/",
"authors": [],
Expand Down
14 changes: 1 addition & 13 deletions dist/css/uikit.almost-flat.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! UIkit 1.0.1 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */
/*! UIkit 1.0.2 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */

/* Default
========================================================================== */
Expand Down Expand Up @@ -5545,8 +5545,6 @@ input.uk-search-field {
* Panel: `uk-panel`
* Navbar: `uk-navbar-flip`
*
* Used by: Navbar
*
========================================================================== */
/* Component
========================================================================== */
Expand Down Expand Up @@ -5620,16 +5618,6 @@ input.uk-search-field {
margin-top: auto;
margin-bottom: 5px;
}
/* Dependency `uk-navbar-flip`
========================================================================== */
.uk-navbar-flip .uk-dropdown {
left: auto;
right: 0;
}
.uk-navbar-flip .uk-dropdown-flip {
left: 0;
right: auto;
}
/* Nav in dropdown
========================================================================== */
.uk-dropdown .uk-nav {
Expand Down
4 changes: 2 additions & 2 deletions dist/css/uikit.almost-flat.min.css

Large diffs are not rendered by default.

14 changes: 1 addition & 13 deletions dist/css/uikit.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! UIkit 1.0.1 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */
/*! UIkit 1.0.2 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */

/* LESS related */
/*
Expand Down Expand Up @@ -5436,8 +5436,6 @@ input.uk-search-field {
* Panel: `uk-panel`
* Navbar: `uk-navbar-flip`
*
* Used by: Navbar
*
========================================================================== */
/* Component
========================================================================== */
Expand Down Expand Up @@ -5509,16 +5507,6 @@ input.uk-search-field {
margin-top: auto;
margin-bottom: 5px;
}
/* Dependency `uk-navbar-flip`
========================================================================== */
.uk-navbar-flip .uk-dropdown {
left: auto;
right: 0;
}
.uk-navbar-flip .uk-dropdown-flip {
left: 0;
right: auto;
}
/* Nav in dropdown
========================================================================== */
.uk-dropdown .uk-nav {
Expand Down
14 changes: 1 addition & 13 deletions dist/css/uikit.gradient.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! UIkit 1.0.1 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */
/*! UIkit 1.0.2 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */

/* Default
========================================================================== */
Expand Down Expand Up @@ -5645,8 +5645,6 @@ input.uk-search-field {
* Panel: `uk-panel`
* Navbar: `uk-navbar-flip`
*
* Used by: Navbar
*
========================================================================== */
/* Component
========================================================================== */
Expand Down Expand Up @@ -5721,16 +5719,6 @@ input.uk-search-field {
margin-top: auto;
margin-bottom: 5px;
}
/* Dependency `uk-navbar-flip`
========================================================================== */
.uk-navbar-flip .uk-dropdown {
left: auto;
right: 0;
}
.uk-navbar-flip .uk-dropdown-flip {
left: 0;
right: auto;
}
/* Nav in dropdown
========================================================================== */
.uk-dropdown .uk-nav {
Expand Down
4 changes: 2 additions & 2 deletions dist/css/uikit.gradient.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/uikit.min.css

Large diffs are not rendered by default.

68 changes: 18 additions & 50 deletions dist/js/uikit.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! UIkit 1.0.1 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */
/*! UIkit 1.0.2 | http://www.getuikit.com | (c) 2013 YOOtheme | MIT License */

(function($, doc) {

Expand Down Expand Up @@ -389,6 +389,12 @@
this.centered = this.dropdown.hasClass("uk-dropdown-center");
this.justified = this.options.justify ? $(this.options.justify) : false;

this.boundary = $(this.options.boundary);

if(!this.boundary.length) {
this.boundary = $(window);
}

if (this.options.mode == "click") {

this.element.on("click", function(e) {
Expand Down Expand Up @@ -470,22 +476,25 @@
options: {
"mode": "hover",
"remaintime": 800,
"justify": false
"justify": false,
"boundary": $(window)
},

checkDimensions: function() {

var dropdown = this.dropdown.css("margin-" + $.UIkit.langdirection, "").css("min-width", ""),
offset = dropdown.show().offset(),
width = dropdown.outerWidth();
var dropdown = this.dropdown.css("margin-" + $.UIkit.langdirection, "").css("min-width", ""),
offset = dropdown.show().offset(),
width = dropdown.outerWidth(),
boundarywidth = this.boundary.width(),
boundaryoffset = this.boundary.offset() ? this.boundary.offset().left:0;

// centered dropdown
if (this.centered) {
dropdown.css("margin-" + $.UIkit.langdirection, (parseFloat(width) / 2 - dropdown.parent().width() / 2) * -1);
offset = dropdown.offset();

// reset dropdown
if ((width + offset.left) > window.innerWidth || offset.left < 0) {
if ((width + offset.left) > boundarywidth || offset.left < 0) {
dropdown.css("margin-" + $.UIkit.langdirection, "");
offset = dropdown.offset();
}
Expand All @@ -500,9 +509,8 @@

if ($.UIkit.langdirection == 'right') {

var winwidth = $(window).width(),
right1 = winwidth - (this.justified.offset().left + jwidth),
right2 = winwidth - (dropdown.offset().left + dropdown.outerWidth());
var right1 = boundarywidth - (this.justified.offset().left + jwidth),
right2 = boundarywidth - (dropdown.offset().left + dropdown.outerWidth());

dropdown.css("margin-right", right1 - right2);

Expand All @@ -514,7 +522,7 @@

}

if ((width + offset.left) > window.innerWidth) {
if ((width + (offset.left-boundaryoffset)) > boundarywidth) {
dropdown.addClass("uk-dropdown-flip");
offset = dropdown.offset();
}
Expand Down Expand Up @@ -1067,46 +1075,6 @@

})(jQuery, jQuery.UIkit);

(function($, UI) {

"use strict";

var Navbar = function(element, options) {

var $this = this;

this.element = $(element);
this.options = $.extend({}, this.options, options);

this.element.on("mouseenter", this.options.toggler, function(e) {
$this.element.find($this.options.toggler).not(this).removeClass("uk-open");
});
};

$.extend(Navbar.prototype, {

options: {
"toggler": ".uk-navbar-nav > li",
"remaintime": 800
}

});

UI["navbar"] = Navbar;

// init code
$(function() {
$("[data-uk-navbar]").each(function() {
var navbar = $(this);

if (!navbar.data("navbar")) {
navbar.data("navbar", new Navbar(navbar, UI.Utils.options(navbar.data("uk-navbar"))));
}
});
});

})(jQuery, jQuery.UIkit);

(function($, UI) {

"use strict";
Expand Down
4 changes: 2 additions & 2 deletions dist/js/uikit.min.js

Large diffs are not rendered by default.

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_get-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h1>Get started</h1>

<p>First of all you need to download UIkit. You can find the whole project and all source files on <a href="https://github.com/uikit/uikit">GitHub</a>.</p>

<p><a class="uk-button uk-button-large uk-button-primary" href="https://github.com/uikit/uikit/releases/download/v1.0.1/uikit-1.0.1.zip">Download UIkit</a></p>
<p><a class="uk-button uk-button-large uk-button-primary" href="https://github.com/uikit/uikit/releases/download/v1.0.2/uikit-1.0.2.zip">Download UIkit</a></p>

<hr class="uk-article-divider">

Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@

<p class="uk-text-large">A lightweight and modular front-end framework<br class="uk-hidden-small"> for developing fast and powerful web interfaces.</p>

<a class="uk-button tm-button-download" href="https://github.com/uikit/uikit/releases/download/v1.0.1/uikit-1.0.1.zip">Download UIkit</a>
<a class="uk-button tm-button-download" href="https://github.com/uikit/uikit/releases/download/v1.0.2/uikit-1.0.2.zip">Download UIkit</a>

<ul class="tm-subnav uk-subnav">
<li><a href="https://github.com/uikit/uikit">GitHub</a></li>
<li><a href="docs/documentation_get-started.html">Get Started</a></li>
<li>Version 1.0.1</li>
<li>Version 1.0.2</li>
</ul>

</div>
Expand Down
2 changes: 1 addition & 1 deletion 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": "1.0.1",
"version": "1.0.2",
"homepage": "http://www.getuikit.com",
"author": {
"name": "UIkit Team",
Expand Down

0 comments on commit cd95990

Please sign in to comment.