diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 6a2bbeca09..9833ea579e 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ # These are supported funding model platforms -github: [y0hami, lubber-de] +github: [lubber-de] diff --git a/README.md b/README.md index 0c2ef3937f..e81b9118e8 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,8 @@ Fomantic includes an interactive installer to help setup your project. | Environment | Install Command | Repository | Third-Party | |-------------|---------------------------------------|------------------------------------------------------------------|-------------| -| CSS Only | `npm install fomantic-ui-css` | [Fomantic-UI-CSS](https://github.com/fomantic/Fomantic-UI-CSS) | | -| LESS | `npm install fomantic-ui-less` | [Fomantic-UI-LESS](https://github.com/fomantic/Fomantic-UI-LESS) | | +| CSS Only | `npm install fomantic-ui-css` | [Fomantic-UI-CSS](https://github.com/fomantic/Fomantic-UI-CSS) | | +| LESS | `npm install fomantic-ui-less` | [Fomantic-UI-LESS](https://github.com/fomantic/Fomantic-UI-LESS) | | | SASS | `gem 'fomantic-ui-sass'` | [Fomantic-UI-SASS](https://github.com/fomantic/Fomantic-UI-SASS) | ✅ | --- @@ -94,20 +94,10 @@ Before creating a pull request be sure to read the [Contributing Guide](CONTRIBU ## Sponsors -### Infrastructure hosted and powered by [DigitalOcean](https://www.digitalocean.com/?utm_medium=opensource&utm_source=fomantic) -[![DigitalOcean](https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PNG/DO_Logo_Horizontal_Blue.png)](https://www.digitalocean.com/?utm_medium=opensource&utm_source=fomantic) - -Sign up now and get $100 in credit for 60 days! [Sign up here!](https://m.do.co/c/bece3e1afb7f) - - ### Cross-browser testing provided by [BrowserStack](https://www.browserstack.com) [![BrowserStack](https://cdn.rawgit.com/fomantic/Fomantic-UI-Docs/35180e95/server/raw/images/browserstack.png)](https://www.browserstack.com) - ### IDE's provided by [JetBrains](https://www.jetbrains.com?from=Fomantic-UI) [![JetBrains](https://fomantic-ui.com/images/jetbrains.svg)](https://www.jetbrains.com?from=Fomantic-UI) --- - -#### Credit -Semantic-UI was beautifully crafted by [@jlukic](https://github.com/jlukic) diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 8a3e3323a3..e193e76515 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -3468,7 +3468,12 @@ return $selectedMenu.hasClass(className.leftward); }, clearable: function () { - return $module.hasClass(className.clearable) || settings.clearable; + var hasClearableClass = $module.hasClass(className.clearable); + if (!hasClearableClass && settings.clearable) { + $module.addClass(className.clearable); + } + + return hasClearableClass || settings.clearable; }, disabled: function () { return $module.hasClass(className.disabled); diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index 6cd1ddea8a..37169e54b4 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -811,14 +811,14 @@ select.ui.dropdown { } } - .ui.clearable.dropdown .text, - .ui.clearable.dropdown a:last-of-type { + .ui.clearable.dropdown .text:not(.default), + .ui.clearable.dropdown:not(.search) > .ui.label:last-of-type { margin-right: @clearableTextMargin; } .ui.dropdown select.noselection ~ .remove.icon, .ui.dropdown input[value=""] ~ .remove.icon, - .ui.dropdown input:not([value]) ~ .remove.icon, + .ui.dropdown input:not([value]):not(.search) ~ .remove.icon, .ui.dropdown.loading > .remove.icon { display: none; } diff --git a/src/definitions/modules/embed.js b/src/definitions/modules/embed.js index 046ee88f4d..152828140f 100644 --- a/src/definitions/modules/embed.js +++ b/src/definitions/modules/embed.js @@ -119,11 +119,12 @@ createPlaceholder: function (placeholder) { var - icon = module.get.icon() + icon = module.get.icon(), + alt = module.get.alt() ; placeholder = placeholder || module.get.placeholder(); - $module.html(templates.placeholder(placeholder, icon)); - module.debug('Creating placeholder for embed', placeholder, icon); + $module.html(templates.placeholder(placeholder, icon, alt)); + module.debug('Creating placeholder for embed', placeholder, icon, alt); }, createEmbed: function (url) { @@ -203,6 +204,9 @@ placeholder: function () { return settings.placeholder || $module.data(metadata.placeholder); }, + alt: function () { + return settings.alt || $module.data(metadata.alt); + }, icon: function () { return settings.icon || ($module.data(metadata.icon) !== undefined ? $module.data(metadata.icon) @@ -288,6 +292,7 @@ .removeData(metadata.id) .removeData(metadata.icon) .removeData(metadata.placeholder) + .removeData(metadata.alt) .removeData(metadata.source) .removeData(metadata.url) ; @@ -557,6 +562,8 @@ source: false, url: false, id: false, + placeholder: false, + alt: false, // standard video settings autoplay: 'auto', @@ -579,6 +586,7 @@ id: 'id', icon: 'icon', placeholder: 'placeholder', + alt: 'alt', source: 'source', url: 'url', }, @@ -654,7 +662,7 @@ + ' width="100%" height="100%"' + ' msallowFullScreen allowFullScreen>'; }, - placeholder: function (image, icon) { + placeholder: function (image, icon, alt) { var html = '', deQuote = $.fn.embed.settings.templates.deQuote @@ -663,7 +671,7 @@ html += ''; } if (image) { - html += ''; + html += '' + deQuote(alt) : '') + ''; } return html;