richard
/
SemanSemantic-UItic-UI
mirror of https://github.com/Semantic-Org/Semantic-UI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:Semantic-Org/Semantic-UI into next

pull/2300/head
jlukic 9 years ago
parent
2ea04a3272 8d9f4e6841
commit
9d6d5978d9
6 changed files with 61 additions and 7 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      README.md
  2. 17
      RELEASE-NOTES.md
  3. 38
      package.json
  4. 2
      src/definitions/elements/input.less
  5. 1
      src/definitions/modules/popup.less
  6. 6
      src/definitions/modules/progress.js

4
README.md
View File

@ -32,7 +32,7 @@ CSS Only | `npm install semantic-ui-css` | [CSS Repo](https://github.com/Semanti
[LESS](https://github.com/less/less.js/) Only | `npm install semantic-ui-less` | [LESS Repo](https://github.com/Semantic-Org/Semantic-UI-LESS)
[LESS](https://github.com/less/less.js/) plugin | `npm install less-plugin-semantic-ui` | [LESS Plugin Repo](https://github.com/bassjobsen/less-plugin-semantic-ui/)
[EmberJS](http://emberjs.com/) | `ember install:addon semantic-ui-ember` | [Ember Repo](https://github.com/Semantic-Org/Semantic-UI-Ember)
|[Meteor](https://www.meteor.com/) - [LESS](https://github.com/less/less.js/) | `meteor add semantic:ui` | [LESS Repo](https://github.com/Semantic-Org/Semantic-UI-LESS) |
|[Meteor](https://www.meteor.com/) - [LESS](https://github.com/less/less.js/) | `meteor add semantic:ui` | [Meteor Repo](https://github.com/Semantic-Org/Semantic-UI-Meteor) |
|[Meteor](https://www.meteor.com/) - CSS | `meteor add semantic:ui-css` | [CSS Repo](https://github.com/Semantic-Org/Semantic-UI-CSS) |
[Bower](http://bower.io/) | `bower install semantic-ui` |
@ -63,7 +63,7 @@ Resource | Description
Bugs & Feature Requests | All bug submission **require** a link to a test case, and a set of steps to reproduce the issue. You can make a test case by forking this [jsfiddle](http://jsfiddle.net/efp8z6Ln/), then submit your [bug report on GitHub Issues](https://github.com/Semantic-Org/Semantic-UI/issues)
Live Chat | Join our [Gitter.im Room](https://gitter.im/Semantic-Org/Semantic-UI)
Newsletter Updates | Sign up for updates at [semantic-ui.com](http://www.semantic-ui.com)
Additional Resources | Submit a question on [StackOverflow](http://www.stackoverflow.com) or ask our [Google Group](https://groups.google.com/forum/#!forum/semantic-ui)
Additional Resources | Submit a question on [StackOverflow](http://stackoverflow.com/questions/tagged/semantic-ui) or ask our [Google Group](https://groups.google.com/forum/#!forum/semantic-ui)
#### Places to Help

17
RELEASE-NOTES.md
View File

@ -1,5 +1,6 @@
## RELEASE NOTES
<<<<<<< HEAD
### Version 2.0.0 - March xx, 2015
-**Migration Guide**
@ -222,6 +223,22 @@
- **Table** - Horizontal cell padding has been slightly reduced, and cell borders are slightly lighter.
- **Transition - Transition no longer checks for vendor prefixed `animation-name` css property. This was introduced in jQuery `1.8`
- **Visibility** - In returned `calculations` object, `visible` and `hidden` are renamed to `onScreen` and `offScreen`, since this describes more accurately what the value represents.
=======
### Version 1.12.2 - May 4, 2015
**Bugs**
- **Dropdown** - Fixed `left` and `right` arrow does not move input cursor with `visible selection dropdown`. Event accidentally prevented by `sub menu` shortcut keys.
### Version 1.12.1 - April 26, 2015
**Bugs**
- **Dropdown** - Fixes issue with chained dropdown methods used on a `<select>` not applying to the generated `ui dropdown` **Backport from 2.0**
- **Input** - Fixes labeled inputs not adjusting correctly with flex. **Backported from 2.0**
- **Input** - Fixes placeholder text color prefixes for `webkit` **Backport from 2.0**
- **Progress* - Fixes rounding error in precision settings *Thanks @aaroncox*
- **Popup** - Removes `min-width: moz-max-content` from popups, which may cause display differences between chrome and FF
>>>>>>> 8d9f4e684156e4f62f5ff8c2a2e65cb657d7949e
### Version 1.12.0 - April 13, 2015

38
package.json
View File

@ -1,6 +1,10 @@
{
"name" : "semantic-ui",
<<<<<<< HEAD
"version" : "2.0.0",
=======
"version" : "1.12.2",
>>>>>>> 8d9f4e684156e4f62f5ff8c2a2e65cb657d7949e
"title" : "Semantic UI",
"description" : "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
"homepage" : "http://www.semantic-ui.com",
@ -45,6 +49,7 @@
"require-dot-file": "*"
},
"dependencies": {
<<<<<<< HEAD
"better-console": "*",
"del": "^1.1.1",
"extend": "^2.0.0",
@ -78,6 +83,39 @@
"map-stream": "^0.1.0",
"yamljs": "^0.2.1",
"wrench": "git://github.com/derekslife/wrench-js.git#156eaceed68ed31ffe2a3ecfbcb2be6ed1417fb2"
=======
"better-console" : "0.*",
"del" : "1.*",
"extend" : "2.*",
"gulp" : "3.*",
"gulp-autoprefixer" : "2.*",
"gulp-chmod" : "1.*",
"gulp-clone" : "1.*",
"gulp-concat" : "2.*",
"gulp-concat-css" : "2.*",
"gulp-copy" : "0.*",
"gulp-flatten" : "0.*",
"gulp-header" : "1.*",
"gulp-help" : "1.*",
"gulp-if" : "1.*",
"gulp-json-editor" : "2.*",
"gulp-less" : "3.*",
"gulp-minify-css" : "0.*",
"gulp-notify" : "2.*",
"gulp-plumber" : "0.*",
"gulp-print" : "1.*",
"gulp-prompt" : "0.*",
"gulp-rename" : "1.*",
"gulp-replace" : "0.*",
"gulp-rtlcss" : "0.*",
"gulp-uglify" : "1.*",
"gulp-util" : "3.*",
"gulp-watch" : "4.*",
"jquery" : "x.*",
"mkdirp" : "0.*",
"require-dot-file" : "0.*",
"wrench" : "https://github.com/derekslife/wrench-js/tarball/156eaceed68ed31ffe2a3ecfbcb2be6ed1417fb2"
>>>>>>> 8d9f4e684156e4f62f5ff8c2a2e65cb657d7949e
},
"devDependencies": {
"github": "^0.2.3",

2
src/definitions/elements/input.less
View File

@ -449,4 +449,4 @@
font-size: @relativeMassive;
}
.loadUIOverrides();
.loadUIOverrides();

1
src/definitions/modules/popup.less
View File

@ -32,7 +32,6 @@
/* Fixes content being squished when inline (moz only) */
min-width: min-content;
z-index: @zIndex;
border: @border;

6
src/definitions/modules/progress.js
View File

@ -236,7 +236,7 @@ $.fn.progress = function(parameters) {
if(settings.precision === 0) {
return Math.round(displayPercent);
}
return Math.round(displayPercent * (10 * settings.precision) / (10 * settings.precision) );
return Math.round(displayPercent * (10 * settings.precision)) / (10 * settings.precision);
},
percent: function() {
@ -361,11 +361,11 @@ $.fn.progress = function(parameters) {
percent = Math.round(percent);
}
else {
percent = Math.round(percent * (10 * settings.precision) / (10 * settings.precision) );
percent = Math.round(percent * (10 * settings.precision)) / (10 * settings.precision);
}
module.percent = percent;
if(module.total) {
module.value = Math.round( (percent / 100) * module.total);
module.value = Math.round( (percent / 100) * module.total * (10 * settings.precision)) / (10 * settings.precision);
}
else if(settings.limitValues) {
module.value = (module.value > 100)

Write Preview
Loading…
Cancel
Save