Skip to content

Commit acfcafa

Browse files
committed
Merge branch 'master' of github.com:jlukic/Semantic-UI
Former-commit-id: 6100f06 Former-commit-id: 2b65affc4023c4bdad3ae28f1f4483c81ba84120
2 parents 6fbf1ed + 0cd0b67 commit acfcafa

File tree

86 files changed

+1612
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1612
-229
lines changed

RELEASE NOTES.md

+24-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,32 @@
11
## RELEASE NOTES
22

3-
### Version 0.3.3- Oct 2, 2013
3+
### Version 0.3.5 - Oct 2, 2013
4+
5+
**Fixes**
6+
- Fixes radio checkboxes (again)
7+
- Fixes header content display in icon headers
8+
9+
### Version 0.3.4 - Oct 2, 2013
10+
11+
**Fixes**
12+
- Transitions now work in Safari versions that do not support animation-direction
13+
- Fixes accordion in safari styles getting stuck
14+
- Centering of content in icon header
15+
16+
### Version 0.3.3 - Oct 2, 2013
17+
18+
**Fixes**
19+
- Fixes modal not working due to destroy teardown in dimmer Issue #153
20+
- Fixes selector for checkbox to fix radio boxes Issue #154
21+
- Fixes issue with popup display in some edge cases Issue #128
422

523
**Updates**
624
- Headers and lists with icons now do not break with multiline content
725
- Examples resize with browser width
826
- Updates ACE editor library
927
- Code samples now do not change after interacting with examples
1028

11-
### Version 0.3.2- Oct 2, 2013
29+
### Version 0.3.2 - Oct 2, 2013
1230

1331
**Updates**
1432
- Dropdown now formats top and right arrow icons automatically with icon coupling with sub menus
@@ -29,25 +47,25 @@
2947
- Lists items now auto clear floats
3048
- Fixes icon input inside a menu placement issues
3149

32-
### Version 0.3.1- Sep 30, 2013
50+
### Version 0.3.1 - Sep 30, 2013
3351

3452
**Fixes**
3553
- Fixes Page Grid still receiving negative margin
3654

37-
### Version 0.3.0- Sep 30, 2013
55+
### Version 0.3.0 - Sep 30, 2013
3856

3957
**Fixes**
4058
- Responsive Grid is now called "Page Grid". Responsive grids are now deprecated. This reduces confusion.
4159
- Negative margins are now automatically removed from grids that are descendents of body tag.
4260

43-
### Version 0.2.5- Sep 28, 2013
61+
### Version 0.2.5 - Sep 28, 2013
4462

4563
**Fixes**
4664
- Fixes checkbox selector issue with multiple inputs inside a checkbox
4765
- Modal no longer uses inline css to center when in fixed position mode
4866
- Fixes dropdown to now set active item to whatever hidden input field is when using action updateForm
4967

50-
### Version 0.2.4- Sep 28, 2013
68+
### Version 0.2.4 - Sep 28, 2013
5169

5270
**Updates**
5371

build/less/collections/grid.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
body > .ui.grid {
3131
margin-left: 0%;
32-
margin-right: 0%:;
32+
margin-right: 0%;
3333
}
3434

3535
.ui.grid:after,
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ae5be9219aa61370d76209f2c0efe1730f7a4f8a
1+
938a77368926e4c24478b94333049fc8a2662ad5

build/less/elements/header.less

+5-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
.ui.header .icon {
3838
display: table-cell;
3939
vertical-align: middle;
40-
padding-right: 1rem;
40+
padding-right: 0.5em;
4141
}
4242
.ui.header .icon:only-child {
4343
display: inline-block;
@@ -48,6 +48,7 @@
4848
vertical-align: top;
4949
}
5050
.ui.header .icon + .content {
51+
padding-left: 0.5em;
5152
display: table-cell;
5253
}
5354

@@ -131,6 +132,9 @@ h5.ui.header {
131132
margin: 0em auto 0.2em;
132133
padding: 0em;
133134
}
135+
.ui.icon.header .content {
136+
display: block;
137+
}
134138
.ui.icon.header .circular.icon,
135139
.ui.icon.header .square.icon {
136140
font-size: 2em;

build/less/elements/icon.less

-3
Original file line numberDiff line numberDiff line change
@@ -756,16 +756,13 @@ i.icon {
756756
}
757757
i.large.icon {
758758
font-size: 2em;
759-
margin-right: 0.5em;
760759
vertical-align: middle;
761760
}
762761
i.huge.icon {
763762
font-size: 4em;
764-
margin-right: 0.75em;
765763
vertical-align: middle;
766764
}
767765
i.massive.icon {
768766
font-size: 8em;
769-
margin-right: 1em;
770767
vertical-align: middle;
771768
}

build/less/modules/accordion.js

+7
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ $.fn.accordion = function(parameters) {
8787
resetStyle: function() {
8888
module.verbose('Resetting styles on element', this);
8989
$(this)
90+
.attr('style', '')
9091
.removeAttr('style')
9192
.children()
93+
.attr('style', '')
9294
.removeAttr('style')
9395
;
9496
}
@@ -138,8 +140,10 @@ $.fn.accordion = function(parameters) {
138140
.slideUp(settings.duration , settings.easing, function() {
139141
$previousContent
140142
.removeClass(className.active)
143+
.attr('style', '')
141144
.removeAttr('style')
142145
.children()
146+
.attr('style', '')
143147
.removeAttr('style')
144148
;
145149
})
@@ -151,11 +155,13 @@ $.fn.accordion = function(parameters) {
151155
$activeContent
152156
.stop()
153157
.children()
158+
.attr('style', '')
154159
.removeAttr('style')
155160
.end()
156161
.slideDown(settings.duration, settings.easing, function() {
157162
$activeContent
158163
.addClass(className.active)
164+
.attr('style', '')
159165
.removeAttr('style')
160166
;
161167
$.proxy(settings.onOpen, $activeContent)();
@@ -185,6 +191,7 @@ $.fn.accordion = function(parameters) {
185191
.end()
186192
.slideUp(settings.duration, settings.easing, function(){
187193
$activeContent
194+
.attr('style', '')
188195
.removeAttr('style')
189196
;
190197
$.proxy(settings.onClose, $activeContent)();

build/less/modules/checkbox.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ $.fn.checkbox.settings = {
334334
},
335335

336336
selector : {
337-
input : 'input[type=checkbox]',
337+
input : 'input[type=checkbox], input[type=radio]',
338338
label : 'label'
339339
},
340340

build/less/modules/modal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ $.fn.modal = function(parameters) {
292292
module.debug('Setting dimmer settings', settings.closable);
293293
$context
294294
.dimmer('setting', 'closable', settings.closable)
295-
.dimmer('setting', 'duration', settings.duration)
295+
.dimmer('setting', 'duration', settings.duration * 0.75)
296296
.dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
297297
.dimmer('setting', 'onHide', function() {
298298
module.hide();
@@ -526,7 +526,7 @@ $.fn.modal.settings = {
526526

527527
closable : true,
528528
context : 'body',
529-
duration : 500,
529+
duration : 600,
530530
easing : 'easeOutExpo',
531531
offset : 0,
532532
transition : 'scale',

build/less/modules/popup.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,9 @@ $.fn.popup = function(parameters) {
253253
// refresh state of module
254254
module.refresh();
255255
if( !$module.hasClass(className.visible) ) {
256-
module.hideAll();
256+
if(settings.on == 'click') {
257+
module.hideAll();
258+
}
257259
module.show();
258260
}
259261
else {

0 commit comments

Comments
 (0)