Skip to content

Commit

Permalink
Updated distribution to version 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Semantic-Pusher-Robot committed Jun 26, 2016
1 parent e761c14 commit 17cfd05
Show file tree
Hide file tree
Showing 145 changed files with 10,065 additions and 5,074 deletions.
13 changes: 7 additions & 6 deletions components/accordion.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*!
* # Semantic UI 2.1.7 - Accordion
* # Semantic UI 2.2.0 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
* Copyright 2015 Contributors
* Released under the MIT license
* http://opensource.org/licenses/MIT
*
Expand Down Expand Up @@ -64,8 +63,10 @@
margin: 0em 0.25rem 0em 0rem;
padding: 0em;
font-size: 1em;
-webkit-transition: -webkit-transform 0.1s ease, opacity 0.1s ease;
transition: transform 0.1s ease, opacity 0.1s ease;
-webkit-transition: opacity 0.1s ease, -webkit-transform 0.1s ease;
transition: opacity 0.1s ease, -webkit-transform 0.1s ease;
transition: transform 0.1s ease, opacity 0.1s ease;
transition: transform 0.1s ease, opacity 0.1s ease, -webkit-transform 0.1s ease;
vertical-align: baseline;
-webkit-transform: none;
-ms-transform: none;
Expand Down Expand Up @@ -129,7 +130,7 @@
.ui.styled.accordion,
.ui.styled.accordion .accordion {
border-radius: 0.28571429rem;
background: #ffffff;
background: #FFFFFF;
box-shadow: 0px 1px 2px 0 rgba(34, 36, 38, 0.15), 0px 0px 0px 1px rgba(34, 36, 38, 0.15);
}
.ui.styled.accordion .title,
Expand All @@ -140,7 +141,7 @@
font-weight: bold;
border-top: 1px solid rgba(34, 36, 38, 0.15);
-webkit-transition: background 0.1s ease, color 0.1s ease;
transition: background 0.1s ease, color 0.1s ease;
transition: background 0.1s ease, color 0.1s ease;
}
.ui.styled.accordion > .title:first-child,
.ui.styled.accordion .accordion .title:first-child {
Expand Down
28 changes: 21 additions & 7 deletions components/accordion.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*!
* # Semantic UI 2.1.7 - Accordion
* # Semantic UI 2.2.0 - 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
5 changes: 2 additions & 3 deletions components/accordion.min.css

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

Loading

0 comments on commit 17cfd05

Please sign in to comment.