Browse Source

Merge branch 'next' into fa5-report

pull/6226/head
Jack Lukic 7 years ago
committed by GitHub
parent
commit
c1a450dad3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 50 additions and 46 deletions
  1. 11
      .github/ISSUE_TEMPLATE.md
  2. 8
      RELEASE-NOTES.md
  3. 2
      package.json
  4. 2
      src/definitions/behaviors/api.js
  5. 2
      src/definitions/behaviors/form.js
  6. 4
      src/definitions/behaviors/visibility.js
  7. 2
      src/definitions/modules/accordion.js
  8. 2
      src/definitions/modules/checkbox.js
  9. 2
      src/definitions/modules/dimmer.js
  10. 16
      src/definitions/modules/dropdown.js
  11. 2
      src/definitions/modules/embed.js
  12. 2
      src/definitions/modules/modal.js
  13. 2
      src/definitions/modules/nag.js
  14. 2
      src/definitions/modules/popup.js
  15. 2
      src/definitions/modules/progress.js
  16. 2
      src/definitions/modules/rating.js
  17. 7
      src/definitions/modules/search.js
  18. 2
      src/definitions/modules/shape.js
  19. 2
      src/definitions/modules/sidebar.js
  20. 2
      src/definitions/modules/sticky.js
  21. 2
      src/definitions/modules/tab.js
  22. 2
      src/definitions/modules/transition.js
  23. 2
      src/themes/basic/elements/button.variables
  24. 4
      src/themes/basic/modules/progress.variables
  25. 4
      src/themes/bookish/elements/header.variables
  26. 4
      src/themes/bootstrap3/elements/button.variables
  27. 2
      src/themes/chubby/elements/button.variables

11
.github/ISSUE_TEMPLATE.md

@ -3,23 +3,12 @@
Chat - https://gitter.im/Semantic-Org/Semantic-UI
SO - https://stackoverflow.com/questions/tagged/semantic-ui?sort=votes
<<<<<<< HEAD
✔ Enhancements → Be specific. Assume backwards compatibility is a necessity. Suggest implementation when possible.
✔ BUGS → ❤❤❤. Keep in mind some bugs may not be immediately fixable due to backwards compatibility or CSS limitations.
### Title (Put in field above)
Use the format: [Component] Component Should Do X
i.e. [Checkbox] onChange Should Fire When Update Triggered via DOM
=======
✔ BUGS → This form is required:
✔ Enhancements → Only specific enhancements with detailed descriptions.
### Issue Titles
Use the format: [Component] Component Should Do X
For example: [Checkbox] onChange Should Fire when update triggered via DOM
>>>>>>> 9ef4388bd090874d3ecac4a1a5c5af181531ff90
### Steps

8
RELEASE-NOTES.md

@ -2,10 +2,18 @@
### Version 2.3.1 - Feb 23, 2018
**Critical Bugs**
- **Dropdown** - Fixed issue in `2.3.0` that could cause multiselect dropdowns initialized by converting `<select>` to not add initial selected options. #6123
**Bugs**
- **Dropdown** - Fixed `onChange` missing `text` from callback when dropdown is set to `action: 'select'` #4183 #4510
- **Search** - Fixes using category search with `fullTextSearch: 'exact'` returning duplicate results #6223 #6221 @Thanks @prudho
- **Icons** - Reported FontAwesome 5 with a much higher accuracy which fixes all reported issues **Thanks hammy2899** [#6181](https://github.com/Semantic-Org/Semantic-UI/pull/6181) [#6180](https://github.com/Semantic-Org/Semantic-UI/pull/6180) [#6176](https://github.com/Semantic-Org/Semantic-UI/pull/6176) [#6175](https://github.com/Semantic-Org/Semantic-UI/pull/6175)
- **Icons** - Added ability to choose whether solid, outline and brand icons should be included in your theme via the `@importSolidIcons`, `importRegularIcons` and `@importBrandIcons` variables **Thanks hammy2899**
- **Icons** - Fixes some icons that were incorrectly named. **Thanks hammy2899** [#6181](https://github.com/Semantic-Org/Semantic-UI/pull/6181) [#6180](https://github.com/Semantic-Org/Semantic-UI/pull/6180) [#6176](https://github.com/Semantic-Org/Semantic-UI/pull/6176) [#6175](https://github.com/Semantic-Org/Semantic-UI/pull/6175)
- **Icons** - Increased specifity on `fitted icon` to fix compatibility with other components [#6125](https://github.com/Semantic-Org/Semantic-UI/issues/6125)
- **Visibility** - Fixed bug that could cause `onScreen` to not work properly for elements that are longer than screen.
- **CSS Variables** - Added use of `@normal` for normal font weight for all non-default themes included in repo. #6227
**Docs**
- Fixes CDN links in docs **Thanks @KSH-code**

2
package.json

@ -1,6 +1,6 @@
{
"name": "semantic-ui",
"version": "2.3.0",
"version": "2.3.1",
"title": "Semantic UI",
"description": "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
"homepage": "http://www.semantic-ui.com",

2
src/definitions/behaviors/api.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
var
window = (typeof window != 'undefined' && window.Math == Math)

2
src/definitions/behaviors/form.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

4
src/definitions/behaviors/visibility.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window
@ -933,7 +933,7 @@ $.fn.visibility = function(parameters) {
element.percentagePassed = 0;
// meta calculations
element.onScreen = (element.topVisible && !element.bottomPassed);
element.onScreen = ((element.topVisible || element.passing) && !element.bottomPassed);
element.passing = (element.topPassed && !element.bottomPassed);
element.offScreen = (!element.onScreen);

2
src/definitions/modules/accordion.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/checkbox.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/dimmer.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

16
src/definitions/modules/dropdown.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window
@ -1617,7 +1617,7 @@ $.fn.dropdown = function(parameters) {
: text
;
if( module.can.activate( $(element) ) ) {
module.set.value(value, $(element));
module.set.value(value, text, $(element));
if(module.is.multiple() && !module.is.allFiltered()) {
return;
}
@ -2283,7 +2283,7 @@ $.fn.dropdown = function(parameters) {
var
length = module.get.query().length
;
$search.val( text.substr(0 , length));
$search.val( text.substr(0, length));
},
scrollPosition: function($item, forceScroll) {
var
@ -2579,6 +2579,9 @@ $.fn.dropdown = function(parameters) {
escapedValue = module.escape.value(value),
$label
;
if(settings.ignoreCase) {
escapedValue = escapedValue.toLowerCase();
}
$label = $('<a />')
.addClass(className.label)
.attr('data-' + metadata.value, escapedValue)
@ -2586,7 +2589,7 @@ $.fn.dropdown = function(parameters) {
;
$label = settings.onLabelCreate.call($label, escapedValue, text);
if(module.has.value(value)) {
if(module.has.label(value)) {
module.debug('User selection already exists, skipping', escapedValue);
return;
}
@ -3043,6 +3046,9 @@ $.fn.dropdown = function(parameters) {
escapedValue = module.escape.value(value),
$labels = $module.find(selector.label)
;
if(settings.ignoreCase) {
escapedValue = escapedValue.toLowerCase();
}
return ($labels.filter('[data-' + metadata.value + '="' + module.escape.string(escapedValue) +'"]').length > 0);
},
maxSelections: function() {
@ -3889,7 +3895,7 @@ $.fn.dropdown.settings.templates = {
? 'disabled '
: ''
;
html += '<div class="'+ maybeDisabled +'item" data-value="' + option[fields.value] + '"' + maybeText + '>'
html += '<div class="'+ maybeDisabled +'item" data-value="' + option[fields.value] + '"' + maybeText + '>';
html += option[fields.name];
html += '</div>';
});

2
src/definitions/modules/embed.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/modal.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/nag.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/popup.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/progress.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/rating.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

7
src/definitions/modules/search.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window
@ -596,9 +596,10 @@ $.fn.search = function(parameters) {
addResult = function(array, result) {
var
notResult = ($.inArray(result, results) == -1),
notFuzzyResult = ($.inArray(result, fuzzyResults) == -1)
notFuzzyResult = ($.inArray(result, fuzzyResults) == -1),
notExactResults = ($.inArray(result, exactResults) == -1)
;
if(notResult && notFuzzyResult) {
if(notResult && notFuzzyResult && notExactResults) {
array.push(result);
}
}

2
src/definitions/modules/shape.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/sidebar.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/sticky.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/tab.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/definitions/modules/transition.js

@ -10,7 +10,7 @@
;(function ($, window, document, undefined) {
"use strict";
'use strict';
window = (typeof window != 'undefined' && window.Math == Math)
? window

2
src/themes/basic/elements/button.variables

@ -4,7 +4,7 @@
/* Button Variables */
@textTransform: none;
@fontWeight: normal;
@fontWeight: @normal;
@textColor: #333333;
@primaryColor: #333333;

4
src/themes/basic/modules/progress.variables

@ -10,6 +10,6 @@
@progressWidth: 100%;
@progressTextAlign: center;
@labelFontWeight: normal;
@labelFontWeight: @normal;
@labelTextAlign: left;
@labelHeight: 1.5em;
@labelHeight: 1.5em;

4
src/themes/bookish/elements/header.variables

@ -3,7 +3,7 @@
--------------------*/
@headerFont : 'Karma', 'Times New Roman', serif;
@fontWeight: normal;
@fontWeight: @normal;
@iconSize: 1.5em;
@iconOffset: 0.2em;
@ -34,4 +34,4 @@
@largeFontSize: 1.33em;
@mediumFontSize: 1.33em;
@smallFontSize: 1em;
@tinyFontSize: 0.9em;
@tinyFontSize: 0.9em;

4
src/themes/bootstrap3/elements/button.variables

@ -5,7 +5,7 @@
/* Button Variables */
@pageFont: Helvetica Neue, Helvetica, Arial, sans-serif;
@textTransform: none;
@fontWeight: normal;
@fontWeight: @normal;
@textColor: rgba(51, 51, 51, 1);
@borderRadius: @4px;
@ -60,4 +60,4 @@
@activeBackgroundColor: #E6E6E6;
@disabledOpacity: 0.65;
@disabledOpacity: 0.65;

2
src/themes/chubby/elements/button.variables

@ -6,7 +6,7 @@
@pageFont: 'Source Sans Pro', Arial, sans-serif;
@textTransform: none;
@fontWeight: normal;
@fontWeight: @normal;
@textColor: #333333;
@verticalPadding: 1.1em;

Loading…
Cancel
Save