Skip to content

Commit

Permalink
update Semantic UI CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
Wangaz committed Jan 4, 2016
1 parent 8ac52e8 commit 6d5be97
Show file tree
Hide file tree
Showing 138 changed files with 668 additions and 462 deletions.
10 changes: 6 additions & 4 deletions src/assets/semantic-ui/components/accordion.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.1.5 - Accordion
* # Semantic UI 2.1.7 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -64,8 +64,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 @@ -140,7 +142,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
2 changes: 1 addition & 1 deletion src/assets/semantic-ui/components/accordion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.1.5 - Accordion
* # Semantic UI 2.1.7 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
4 changes: 2 additions & 2 deletions src/assets/semantic-ui/components/accordion.min.css

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

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

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

40 changes: 23 additions & 17 deletions src/assets/semantic-ui/components/api.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.1.5 - API
* # Semantic UI 2.1.7 - API
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -213,12 +213,12 @@ $.api = $.fn.api = function(parameters) {

// replace variables
url = module.add.urlData( url );

// missing url parameters
if( !url && !module.is.mocked()) {
return;
}

requestSettings.url = settings.base + url;

// look for jQuery ajax parameters in settings
ajaxSettings = $.extend(true, {}, settings, {
Expand Down Expand Up @@ -280,7 +280,7 @@ $.api = $.fn.api = function(parameters) {
return $module.is('form') || $context.is('form');
},
mocked: function() {
return (settings.mockResponse || settings.mockResponseAsync);
return (settings.mockResponse || settings.mockResponseAsync || settings.response || settings.responseAsync);
},
input: function() {
return $module.is('input');
Expand Down Expand Up @@ -592,9 +592,11 @@ $.api = $.fn.api = function(parameters) {
mockedXHR: function () {
var
// xhr does not simulate these properties of xhr but must return them
textStatus = false,
status = false,
httpMessage = false,
textStatus = false,
status = false,
httpMessage = false,
responder = settings.mockResponse || settings.response,
asyncResponder = settings.mockResponseAsync || settings.responseAsync,
asyncCallback,
response,
mockedXHR
Expand All @@ -606,19 +608,19 @@ $.api = $.fn.api = function(parameters) {
.fail(module.event.xhr.fail)
;

if(settings.mockResponse) {
if( $.isFunction(settings.mockResponse) ) {
module.debug('Using mocked callback returning response', settings.mockResponse);
response = settings.mockResponse.call(context, settings);
if(responder) {
if( $.isFunction(responder) ) {
module.debug('Using specified synchronous callback', responder);
response = responder.call(context, requestSettings);
}
else {
module.debug('Using specified response', settings.mockResponse);
response = settings.mockResponse;
module.debug('Using settings specified response', responder);
response = responder;
}
// simulating response
mockedXHR.resolveWith(context, [ response, textStatus, { responseText: response }]);
}
else if( $.isFunction(settings.mockResponseAsync) ) {
else if( $.isFunction(asyncResponder) ) {
asyncCallback = function(response) {
module.debug('Async callback returned response', response);

Expand All @@ -629,8 +631,8 @@ $.api = $.fn.api = function(parameters) {
mockedXHR.rejectWith(context, [{ responseText: response }, status, httpMessage]);
}
};
module.debug('Using async mocked response', settings.mockResponseAsync);
settings.mockResponseAsync.call(context, settings, asyncCallback);
module.debug('Using specified async response callback', asyncResponder);
asyncResponder.call(context, requestSettings, asyncCallback);
}
return mockedXHR;
},
Expand Down Expand Up @@ -722,8 +724,8 @@ $.api = $.fn.api = function(parameters) {
module.error(error.noReturnedValue);
}
return (runSettings !== undefined)
? runSettings
: settings
? $.extend(true, {}, runSettings)
: $.extend(true, {}, settings)
;
},
urlEncodedValue: function(value) {
Expand Down Expand Up @@ -1066,6 +1068,10 @@ $.api.settings = {
mockResponse : false,
mockResponseAsync : false,

// aliases for mock
response : false,
responseAsync : false,

// callbacks before request
beforeSend : function(settings) { return settings; },
beforeXHR : function(xhr) {},
Expand Down
Loading

0 comments on commit 6d5be97

Please sign in to comment.