Skip to content

Commit

Permalink
Bump version 0.9.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
doabit committed Dec 4, 2013
1 parent 72113c3 commit c537d2b
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 33 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.9.6.0

* Update Semantic UI to 0.9.6

## 0.9.5.0

* Update Semantic UI to 0.9.5
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## Installation and Usage

```ruby
gem 'semantic-ui-sass', '~> 0.9.5.0'
gem 'semantic-ui-sass', '~> 0.9.6.0'
```
or

Expand Down
11 changes: 6 additions & 5 deletions app/assets/javascripts/semantic-ui/rating.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ $.fn.rating = function(parameters) {
.on('click' + eventNamespace, module.event.click)
;
$module
.addClass(className.active)
.removeClass(className.disabled)
;
},

Expand All @@ -162,7 +162,7 @@ $.fn.rating = function(parameters) {
.off(eventNamespace)
;
$module
.removeClass(className.active)
.addClass(className.disabled)
;
},

Expand Down Expand Up @@ -392,9 +392,10 @@ $.fn.rating.settings = {
},

className : {
active : 'active',
hover : 'hover',
loading : 'loading'
active : 'active',
disabled : 'disabled',
hover : 'hover',
loading : 'loading'
},

selector : {
Expand Down
44 changes: 28 additions & 16 deletions app/assets/stylesheets/semantic-ui/collections/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,82 +139,82 @@ body > .ui.grid {

.ui.grid > .row > .one.wide.column,
.ui.grid > .one.wide.column {
width: 6.25%;
width: 6.25% !important;
}

.ui.grid > .row > .two.wide.column,
.ui.grid > .two.wide.column {
width: 12.5%;
width: 12.5% !important;
}

.ui.grid > .row > .three.wide.column,
.ui.grid > .three.wide.column {
width: 18.75%;
width: 18.75% !important;
}

.ui.grid > .row > .four.wide.column,
.ui.grid > .four.wide.column {
width: 25%;
width: 25% !important;
}

.ui.grid > .row > .five.wide.column,
.ui.grid > .five.wide.column {
width: 31.25%;
width: 31.25% !important;
}

.ui.grid > .row > .six.wide.column,
.ui.grid > .six.wide.column {
width: 37.5%;
width: 37.5% !important;
}

.ui.grid > .row > .seven.wide.column,
.ui.grid > .seven.wide.column {
width: 43.75%;
width: 43.75% !important;
}

.ui.grid > .row > .eight.wide.column,
.ui.grid > .eight.wide.column {
width: 50%;
width: 50% !important;
}

.ui.grid > .row > .nine.wide.column,
.ui.grid > .nine.wide.column {
width: 56.25%;
width: 56.25% !important;
}

.ui.grid > .row > .ten.wide.column,
.ui.grid > .ten.wide.column {
width: 62.5%;
width: 62.5% !important;
}

.ui.grid > .row > .eleven.wide.column,
.ui.grid > .eleven.wide.column {
width: 68.75%;
width: 68.75% !important;
}

.ui.grid > .row > .twelve.wide.column,
.ui.grid > .twelve.wide.column {
width: 75%;
width: 75% !important;
}

.ui.grid > .row > .thirteen.wide.column,
.ui.grid > .thirteen.wide.column {
width: 81.25%;
width: 81.25% !important;
}

.ui.grid > .row > .fourteen.wide.column,
.ui.grid > .fourteen.wide.column {
width: 87.5%;
width: 87.5% !important;
}

.ui.grid > .row > .fifteen.wide.column,
.ui.grid > .fifteen.wide.column {
width: 93.75%;
width: 93.75% !important;
}

.ui.grid > .row > .sixteen.wide.column,
.ui.grid > .sixteen.wide.column {
width: 100%;
width: 100% !important;
}

/*-------------------
Expand Down Expand Up @@ -479,6 +479,18 @@ body > .ui.grid {
text-align: right;
}

.ui.justified.grid,
.ui.justified.grid > .row > .column,
.ui.justified.grid > .column,
.ui.grid .justified.column,
.ui.grid > .justified.row > .column {
text-align: justify;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}

/*----------------------
Vertically Centered
-----------------------*/
Expand Down
5 changes: 5 additions & 0 deletions app/assets/stylesheets/semantic-ui/collections/_message.scss
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@
border-radius: 0em 0em 0.325em 0.325em;
}

.ui.attached.icon.message {
display: block;
width: auto;
}

/*--------------
Icon
---------------*/
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/semantic-ui/elements/_basic.icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
font-family: 'Basic Icons';
src: font-url("semantic-ui/basic.icons.eot");
src: font-url("semantic-ui/basic.icons.eot?#iefix") format('embedded-opentype'),
font-url("semantic-ui/basic.icons.svg#basic.icons") format('svg'),
font-url("semantic-ui/basic.icons.woff") format('woff'),
font-url("semantic-ui/basic.icons.ttf") format('truetype'),
font-url("semantic-ui/basic.icons.svg#basic.icons") format('svg');
font-url("semantic-ui/basic.icons.ttf") format('truetype');
font-style: normal;
font-weight: normal;
font-variant: normal;
Expand Down
10 changes: 10 additions & 0 deletions app/assets/stylesheets/semantic-ui/elements/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,16 @@ h5.ui.header {
text-align: center;
}

.ui.justified.header {
text-align: justify;
}

.ui.justified.header:after {
display: inline-block;
content: '';
width: 100%;
}

/*-------------------
Floated
--------------------*/
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/semantic-ui/elements/_icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
font-family: 'Icons';
src: font-url("semantic-ui/icons.eot");
src: font-url("semantic-ui/icons.eot?#iefix") format('embedded-opentype'),
font-url("semantic-ui/icons.svg#icons") format('svg'),
font-url("semantic-ui/icons.woff") format('woff'),
font-url("semantic-ui/icons.ttf") format('truetype'),
font-url("semantic-ui/icons.svg#icons") format('svg');
font-url("semantic-ui/icons.ttf") format('truetype');
font-style: normal;
font-weight: normal;
font-variant: normal;
Expand Down
8 changes: 8 additions & 0 deletions app/assets/stylesheets/semantic-ui/elements/_segment.scss
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,14 @@
text-align: center;
}

.ui.justified.segment {
text-align: justify;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}

/*-------------------
Floated
--------------------*/
Expand Down
8 changes: 4 additions & 4 deletions app/assets/stylesheets/semantic-ui/modules/_rating.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/* Icon */

.ui.rating .icon {
cursor: default;
cursor: pointer;
margin: 0em;
width: 1em;
height: auto;
Expand Down Expand Up @@ -118,10 +118,10 @@
Active
--------------------*/

/* active rating */
/* disabled rating */

.ui.active.rating .icon {
cursor: pointer;
.ui.disabled.rating .icon {
cursor: default;
}

/* active icons */
Expand Down
4 changes: 2 additions & 2 deletions lib/semantic/ui/sass/version.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module Semantic
module Ui
module Sass
VERSION = "0.9.5.0"
SEMANTIC_UI_SHA = '9c8e0ae4e7928a8454d506bbb703d74fa58dfae8'
VERSION = "0.9.6.0"
SEMANTIC_UI_SHA = '7fc7e122174a5f341ec59b1f6988fb39ab9136f0'
end
end
end
2 changes: 1 addition & 1 deletion tasks/converter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Converter
BROWSERS = ['last 2 version', '> 1%', 'opera 12.1', 'safari 6', 'ie 9', 'bb 10', 'android 4']

def initialize(branch)
@repo = 'jlukic/Semantic-UI'
@repo = 'Semantic-Org/Semantic-UI'
@repo_url = "https://github.com/#@repo"
@branch = branch || 'master'
@git_data_trees = "#{GIT_DATA}/#{@repo}/git/trees"
Expand Down

0 comments on commit c537d2b

Please sign in to comment.