Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Semantic-Org/Semantic-UI
Browse files Browse the repository at this point in the history
…into Semantic-Org-master

* 'master' of https://github.com/Semantic-Org/Semantic-UI: (316 commits)
  Semantic-Org#4181 fix issue with jQ 3.0 width calculations causing shape to break
  Fix Semantic-Org#4181
  Semantic-Org#4192
  Build 2.2.1
  Fix selection issue with <select> and userAdditions
  Rlsnotes
  Build 2.2 for release
  Build 2.2 for release
  Build final dist
  Rlsnotes Semantic-Org#4144
  Rlsnotes noodling
  Semantic-Org#4167 - Tabular menu now has correct bottom margin in all cases
  Fix
  Fix rlsnotes
  Fix issue with hideAdditions where enter key would not select value when typing rapidly
  Update rlsnotes
  More accurate arrow positioning in tooltips
  Remove duplicate height definition
  Reset some styles in tooltip
  Fix issue where selection was borked for search inside menu
  ...
  • Loading branch information
ali1k committed Jul 1, 2016
2 parents dbc3690 + 2b955e0 commit e801199
Show file tree
Hide file tree
Showing 256 changed files with 11,731 additions and 4,483 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ When submiting a bug report, include a set of steps to reproduce the issue and a

If your bug uses a third party framework like Ember, Meteor, or Angular. Be sure to submit the issue to their respective issues boards. If you are confident the bug is part of the 'vanilla' SUI release, keep in mind not all maintainers are familiar with all framework and a simple test case is greatly appreciated.

If your bug is reproduced by a maintainer it will be asssigned the [`confirmed bug`](https://github.com/Semantic-Org/Semantic-UI/issues?q=is%3Aopen+is%3Aissue+label%3A%22Confirmed+Bug%22) tag. Browsing this tag is a good way to keep track of known issues with SUI.
If your bug is reproduced by a maintainer it will be assigned the [`confirmed bug`](https://github.com/Semantic-Org/Semantic-UI/issues?q=is%3Aopen+is%3Aissue+label%3A%22Confirmed+Bug%22) tag. Browsing this tag is a good way to keep track of known issues with SUI.

#### Naming Issues

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Key Features

Semantic allows developers to build beautiful websites fast, with **concise HTML**, **intuitive javascript**, and **simplified debugging**, helping make front-end development a delightful experience. Semantic is responsively designed allowing your website to scale on multiple devices. Semantic is production ready and partnered with frameworks such as **React**, **Angular**, **Meteor**, and **Ember**, which means you can integrate it with any of these frameworks to organize your UI layer alongside your application logic.

## 2.1 Release
## 2.2 Release

Semantic UI `2.1` is now available. Read up on [what's new](http://www.semantic-ui.com/introduction/new.html) in the docs.
Semantic UI `2.2` is now available (June 2016). Read up on [what's new](http://www.semantic-ui.com/introduction/new.html) in the docs.

Migration info from `1.x` can be found in the [2.0 release notes](https://github.com/Semantic-Org/Semantic-UI/blob/master/RELEASE-NOTES.md#version-200---march-xx-2015)

Expand Down
194 changes: 170 additions & 24 deletions RELEASE-NOTES.md

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions dist/components/accordion.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*!
* # Semantic UI 2.1.8 - Accordion
* # Semantic UI 2.2.1 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
* Copyright 2015 Contributors
* Released under the MIT license
* http://opensource.org/licenses/MIT
*
Expand Down
28 changes: 21 additions & 7 deletions dist/components/accordion.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*!
* # Semantic UI 2.1.8 - Accordion
* # Semantic UI 2.2.1 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
* Copyright 2015 Contributors
* Released under the MIT license
* http://opensource.org/licenses/MIT
*
Expand All @@ -13,6 +12,13 @@

"use strict";

window = (typeof window != 'undefined' && window.Math == Math)
? window
: (typeof self != 'undefined' && self.Math == Math)
? self
: Function('return this')()
;

$.fn.accordion = function(parameters) {
var
$allModules = $(this),
Expand Down Expand Up @@ -367,7 +373,12 @@ $.fn.accordion = function(parameters) {
$.extend(true, settings, name);
}
else if(value !== undefined) {
settings[name] = value;
if($.isPlainObject(settings[name])) {
$.extend(true, settings[name], value);
}
else {
settings[name] = value;
}
}
else {
return settings[name];
Expand All @@ -388,7 +399,7 @@ $.fn.accordion = function(parameters) {
}
},
debug: function() {
if(settings.debug) {
if(!settings.silent && settings.debug) {
if(settings.performance) {
module.performance.log(arguments);
}
Expand All @@ -399,7 +410,7 @@ $.fn.accordion = function(parameters) {
}
},
verbose: function() {
if(settings.verbose && settings.debug) {
if(!settings.silent && settings.verbose && settings.debug) {
if(settings.performance) {
module.performance.log(arguments);
}
Expand All @@ -410,8 +421,10 @@ $.fn.accordion = function(parameters) {
}
},
error: function() {
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
module.error.apply(console, arguments);
if(!settings.silent) {
module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
module.error.apply(console, arguments);
}
},
performance: {
log: function(message) {
Expand Down Expand Up @@ -544,6 +557,7 @@ $.fn.accordion.settings = {
name : 'Accordion',
namespace : 'accordion',

silent : false,
debug : false,
verbose : false,
performance : true,
Expand Down
3 changes: 1 addition & 2 deletions dist/components/accordion.min.css

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

5 changes: 2 additions & 3 deletions dist/components/accordion.min.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/components/ad.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.1.8 - Ad
* # Semantic UI 2.2.1 - Ad
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/ad.min.css

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

Loading

0 comments on commit e801199

Please sign in to comment.