Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dependency] Add compatibility with Less 3.x #6447

Merged
merged 7 commits into from
Jun 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
## RELEASE NOTES

### Version 2.3.2 - June 17, 2018
### Version 2.3.2 - June 18, 2018

**Enhancements**
- **Modal** - Modal and Dimmer now prevent background page from scrolling on mobile or where touch events are present
- **Button** - Add `inverted` and `inverted basic` variations for `primary` and `secondary` buttons **Thanks @hammy2899** [#6242](https://github.com/Semantic-Org/Semantic-UI/pull/6424)
- **Button** - Add `inverted` and `inverted basic` variations for `primary` and `secondary` buttons **Thanks @hammy2899** [#6242](https://github.com/Semantic-Org/Semantic-UI/issues/6242)

**Theming**
- **Global** - Add `hover` `down` `active` and `focus` variables for `invertedPrimaryColor` and `invertedSecondaryColor`
- **Global** - Add `hover` `down` `active` and `focus` variables for `@invertedPrimaryColor` and `@invertedSecondaryColor`

**Bugs**
- **Dropdown** Fixed bug that could cause dropdown to recursively trigger network requests specifically when using `apiSettings` with a url that returns valid response but with no results when clicking directly on the `dropdown icon`. **Thanks @vpeti** [#5231 [#5809](https://github.com/Semantic-Org/Semantic-UI/pull/6424)
- **Dropdown** Fixed bug that could cause dropdown to recursively trigger network requests specifically when using `apiSettings` with a url that returns valid response but with no results when clicking directly on the `dropdown icon`. **Thanks @vpeti** [#5231](https://github.com/Semantic-Org/Semantic-UI/issues/5231) [#5809](https://github.com/Semantic-Org/Semantic-UI/issues/5809)
- **Statistics** - Fix issue where grouped statistics would have excess bottom margin if they are `:last-child`
- **Label** - Fix `basic label` does not use `@basicBackground` variables **Thanks @levithomson**
- **Modal** - Modal will not refocus a field if field is already focused **Thanks @nikolaybobrovskiy** [#6301](https://github.com/Semantic-Org/Semantic-UI/pull/6424)
- **Icon** - Fix `wechat icon` not displaying due to typo **Thanks @alex-karo** [#6429](https://github.com/Semantic-Org/Semantic-UI/pull/6424)
- **Modal** - Modal will not refocus a field if field is already focused **Thanks @nikolaybobrovskiy** [#6301](https://github.com/Semantic-Org/Semantic-UI/issues/6301)
- **Icon** - Fix `wechat icon` not displaying due to typo **Thanks @alex-karo** [#6429](https://github.com/Semantic-Org/Semantic-UI/issues/6429)

### Version 2.3.1 - Mar 18, 2018

Expand Down
16 changes: 9 additions & 7 deletions src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@
### Built-In Tools

From the Semantic directory you can setup gulp to build Semantic by running.

```bash
npm install
```

Semantic will automatically configure itself using a `post-install` script built into the package.

After set-up can use gulp to build your project's css:

```bash
/* Watch files */
# Watch files
gulp watch

/* Build all files */
# Build all files
gulp build
```

Expand All @@ -27,9 +29,8 @@ Visit the [Getting Started Guide](http://learnsemantic.com/guide/expert.html) fo
Each gulp task can be imported into your own Gulpfile using `require`

```javascript
var
watch = require('path/to/semantic/tasks/watch')
;
const watch = require('path/to/semantic/tasks/watch');

gulp.task('watch ui', 'Watch Semantic UI', watch));
```

Expand All @@ -40,12 +41,14 @@ gulp.task('watch ui', 'Watch Semantic UI', watch));
Before using source files you will need to create a `theme.config` by renaming `theme.config.example`, and a site folder by renaming `_site/` to `site/`

You can then import Semantic from your own LESS files:

```less
/* Import all components */
@import 'src/semantic';
```

To import individual components you will have to create a scope for each import using `& {}`

```less
/* Import a specific component */
& { @import 'src/definitions/elements/button'; }
Expand All @@ -61,7 +64,6 @@ filename | usage | Initial Name
**site/** | folder storing all your site's variables and css overrides for each UI component | _site/
**semantic.json** | stores folder paths for build tools and current installed version for updates. Only necessary when using build tools | semantic.json.example


### Workflow

You will only need to use Semantic's build tools while refining your UI. When designing pages, you can rely on the compiled css packages in `dist/`.
Expand Down Expand Up @@ -119,9 +121,9 @@ You may also specify your own custom LESS in `site/elements/button.overrides`. T
You can modify `theme.config` to use any prepackaged theme available in `src/themes/`.

For example you can modify `theme.config` to use a `github` button theme by changing

```less
@button: 'github';
```

View the [Customization Guide](http://learnsemantic.com/developing/customizing.html) to learn more

4 changes: 2 additions & 2 deletions src/theme.config.example
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@
Import Theme
*******************************/

@import "theme.less";
@import (multiple) "theme.less";

/* End Config */
/* End Config */
2 changes: 1 addition & 1 deletion src/theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
-------------------*/

.loadFonts() when (@importGoogleFonts) {
@import url('@{googleProtocol}fonts.googleapis.com/css?family=@{googleFontRequest}');
@import (css) url('@{googleProtocol}fonts.googleapis.com/css?family=@{googleFontRequest}');
}

/*------------------
Expand Down
2 changes: 1 addition & 1 deletion tasks/admin/components/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ module.exports = function(callback) {
pullOptions = { args: '-q', cwd: outputDirectory, quiet: true },
resetOptions = { args: '-q --hard', cwd: outputDirectory, quiet: true },

gitURL = 'https://github.com/' + release.org + '/' + repoName + '.git',
gitURL = 'git@github.com:' + release.org + '/' + repoName + '.git',
repoURL = 'https://github.com/' + release.org + '/' + repoName + '/',
localRepoSetup = fs.existsSync(path.join(outputDirectory, '.git'))
;
Expand Down
2 changes: 1 addition & 1 deletion tasks/admin/components/update.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ module.exports = function(callback) {
console.log('Sleeping for 1 second...');
// avoid rate throttling
global.clearTimeout(timer);
timer = global.setTimeout(stepRepo, 1000);
timer = global.setTimeout(stepRepo, 100);
}


Expand Down
2 changes: 1 addition & 1 deletion tasks/admin/distributions/update.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ module.exports = function(callback) {
console.log('Sleeping for 1 second...');
// avoid rate throttling
global.clearTimeout(timer);
timer = global.setTimeout(stepRepo, 500);
timer = global.setTimeout(stepRepo, 100);
}


Expand Down