Skip to content

Commit

Permalink
'Merge branch 'master' of github.com:Semantic-Org/Semantic-UI into next
Browse files Browse the repository at this point in the history
  • Loading branch information
jlukic committed Jul 7, 2015
2 parents bbf3609 + 7bc3504 commit 9d5a31d
Show file tree
Hide file tree
Showing 138 changed files with 570 additions and 446 deletions.
3 changes: 1 addition & 2 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
- **Form** - `reset` will no longer clear values if no default value is found [#2504](https://github.com/Semantic-Org/Semantic-UI/issues/2504)

**Additional Bugs**
- **Build Tools** - Running npm
- **Dimmer** - Dimmer now removes variations like `blurring` and `inverted` when `destroy` is called.
- **Dropdown** - `restore defaults` in dropdown when used with multiple will now correctly clear other values selected that were not there on page load.
- **Dropdown** - Removes accidental console.log statement in dropdown
- **Dropdown** - Dropdown no longer closes after max selections reached and enter key used for selection.
- **Dropdown** - Dropdown will now show correctly when menu only includes a message with no other items
- **Menu** - Fixed `pointing menu` arrow color slightly off
- **Progress* - Progress included `debug: true` by default. This has been now correctly set to `false`
- **Progress** - Progress included `debug: true` by default. This has been now correctly set to `false`
- **Modal** - `scrolling modal` now correctly inherits rules so that it appears at top of screen on mobile
- **Menu** - Inverted menu no longer includes a 1px transparent border.
- **Menu** - Fixes `compact vertical menu` using `flex` style incorrectly
Expand Down
2 changes: 1 addition & 1 deletion dist/components/accordion.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - Accordion
* # Semantic UI 2.0.1 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/accordion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - Accordion
* # Semantic UI 2.0.1 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion dist/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 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.0.0 - Ad
* # Semantic UI 2.0.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.

2 changes: 1 addition & 1 deletion dist/components/api.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - API
* # Semantic UI 2.0.1 - API
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/api.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/breadcrumb.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - Breadcrumb
* # Semantic UI 2.0.1 - Breadcrumb
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/breadcrumb.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 dist/components/button.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - Button
* # Semantic UI 2.0.1 - Button
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion dist/components/button.min.css

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

8 changes: 7 additions & 1 deletion dist/components/card.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - Item
* # Semantic UI 2.0.1 - Item
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -437,6 +437,12 @@
Centered
--------------------*/

.ui.centered.cards {
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
.ui.centered.card {
margin-left: auto;
margin-right: auto;
Expand Down
4 changes: 2 additions & 2 deletions dist/components/card.min.css

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions dist/components/checkbox.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - Checkbox
* # Semantic UI 2.0.1 - Checkbox
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -191,13 +191,13 @@
Indeterminate
---------------*/

.ui.checkbox input:indeterminate ~ .box:before,
.ui.checkbox input:indeterminate ~ label:before {
.ui.checkbox input[type="checkbox"]:indeterminate ~ .box:before,
.ui.checkbox input[type="checkbox"]:indeterminate ~ label:before {
background: #ffffff;
border-color: rgba(34, 36, 38, 0.35);
}
.ui.checkbox input:indeterminate ~ .box:after,
.ui.checkbox input:indeterminate ~ label:after {
.ui.checkbox input[type="checkbox"]:indeterminate ~ .box:after,
.ui.checkbox input[type="checkbox"]:indeterminate ~ label:after {
opacity: 1;
color: rgba(0, 0, 0, 0.95);
}
Expand All @@ -206,10 +206,10 @@
Active Focus
---------------*/

.ui.checkbox input[type="radio"]:indeterminate:focus ~ .box:before,
.ui.checkbox input[type="radio"]:indeterminate:focus ~ label:before,
.ui.checkbox input[type="radio"]:checked:focus ~ .box:before,
.ui.checkbox input[type="radio"]:checked:focus ~ label:before {
.ui.checkbox input[type="checkbox"]:indeterminate:focus ~ .box:before,
.ui.checkbox input[type="checkbox"]:indeterminate:focus ~ label:before,
.ui.checkbox input[type="checkbox"]:checked:focus ~ .box:before,
.ui.checkbox input[type="checkbox"]:checked:focus ~ label:before {
background: #f9fafb;
border-color: rgba(34, 36, 38, 0.35);
}
Expand Down
65 changes: 37 additions & 28 deletions dist/components/checkbox.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.0.0 - Checkbox
* # Semantic UI 2.0.1 - Checkbox
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -271,6 +271,9 @@ $.fn.checkbox = function(parameters) {
;
return $('input[name="' + name + '"]').closest(selector.checkbox);
},
otherRadios: function() {
return module.get.radios().not($module);
},
name: function() {
return $input.attr('name');
}
Expand Down Expand Up @@ -314,25 +317,31 @@ $.fn.checkbox = function(parameters) {

set: {
checked: function() {
module.verbose('Setting class to checked');
$module
.removeClass(className.indeterminate)
.addClass(className.checked)
;
if( module.is.radio() ) {
module.uncheckOthers();
}
if(!module.is.indeterminate() && module.is.checked()) {
module.debug('Input is already checked');
module.debug('Input is already checked, skipping input property change');
return;
}
module.verbose('Setting state to checked', $input[0]);
if( module.is.radio() ) {
module.uncheckOthers();
}
$input
.prop('indeterminate', false)
.prop('checked', true)
;
$module
.removeClass(className.indeterminate)
.addClass(className.checked)
;
module.trigger.change();
},
unchecked: function() {
module.verbose('Removing checked class');
$module
.removeClass(className.indeterminate)
.removeClass(className.checked)
;
if(!module.is.indeterminate() && module.is.unchecked() ) {
module.debug('Input is already unchecked');
return;
Expand All @@ -342,63 +351,63 @@ $.fn.checkbox = function(parameters) {
.prop('indeterminate', false)
.prop('checked', false)
;
$module
.removeClass(className.indeterminate)
.removeClass(className.checked)
;
module.trigger.change();
},
indeterminate: function() {
module.verbose('Setting class to indeterminate');
$module
.addClass(className.indeterminate)
;
if( module.is.indeterminate() ) {
module.debug('Input is already indeterminate');
module.debug('Input is already indeterminate, skipping input property change');
return;
}
module.debug('Setting state to indeterminate');
$input
.prop('indeterminate', true)
;
$module
.addClass(className.indeterminate)
;
module.trigger.change();
},
determinate: function() {
module.verbose('Removing indeterminate class');
$module
.removeClass(className.indeterminate)
;
if( module.is.determinate() ) {
module.debug('Input is already determinate');
module.debug('Input is already determinate, skipping input property change');
return;
}
module.debug('Setting state to determinate');
$input
.prop('indeterminate', false)
;
$module
.removeClass(className.indeterminate)
;
},
disabled: function() {
module.verbose('Setting class to disabled');
$module
.addClass(className.disabled)
;
if( module.is.disabled() ) {
module.debug('Input is already disabled');
module.debug('Input is already disabled, skipping input property change');
return;
}
module.debug('Setting state to disabled');
$input
.prop('disabled', 'disabled')
;
$module
.addClass(className.disabled)
;
module.trigger.change();
},
enabled: function() {
module.verbose('Removing disabled class');
$module.removeClass(className.disabled);
if( module.is.enabled() ) {
module.debug('Input is already enabled');
module.debug('Input is already enabled, skipping input property change');
return;
}
module.debug('Setting state to enabled');
$input
.prop('disabled', false)
;
$module.removeClass(className.disabled);
module.trigger.change();
},
tabbable: function() {
Expand Down Expand Up @@ -459,7 +468,7 @@ $.fn.checkbox = function(parameters) {

uncheckOthers: function() {
var
$radios = module.get.radios()
$radios = module.get.otherRadios()
;
module.debug('Unchecking other radios', $radios);
$radios.removeClass(className.checked);
Expand Down
Loading

0 comments on commit 9d5a31d

Please sign in to comment.