Skip to content
This repository has been archived by the owner on Apr 9, 2019. It is now read-only.

Commit

Permalink
update semantic
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles Ahmadzadeh committed Jan 31, 2017
1 parent f04e0d7 commit a618031
Show file tree
Hide file tree
Showing 34 changed files with 125 additions and 241 deletions.
2 changes: 1 addition & 1 deletion semantic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
},
"permission": false,
"rtl": false,
"version": "2.2.6"
"version": "2.2.2"
}
10 changes: 2 additions & 8 deletions semantic/src/definitions/behaviors/form.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,10 @@ $.fn.form = function(parameters) {

get: {
ancillaryValue: function(rule) {
if(!rule.type || (!rule.value && !module.is.bracketedRule(rule))) {
if(!rule.type || !module.is.bracketedRule(rule)) {
return false;
}
return (rule.value !== undefined)
? rule.value
: rule.type.match(settings.regExp.bracket)[1] + ''
;
return rule.type.match(settings.regExp.bracket)[1] + '';
},
ruleName: function(rule) {
if( module.is.bracketedRule(rule) ) {
Expand Down Expand Up @@ -1210,9 +1207,6 @@ $.fn.form.settings = {

// matches specified regExp
regExp: function(value, regExp) {
if(regExp instanceof RegExp) {
return value.match(regExp);
}
var
regExpParts = regExp.match($.fn.form.settings.regExp.flags),
flags
Expand Down
12 changes: 2 additions & 10 deletions semantic/src/definitions/collections/form.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
.ui.form input[type="tel"],
.ui.form input[type="time"],
.ui.form input[type="text"],
.ui.form input[type="file"],
.ui.form input[type="url"] {
width: @inputWidth;
vertical-align: top;
Expand All @@ -109,7 +108,6 @@
.ui.form input[type="tel"],
.ui.form input[type="time"],
.ui.form input[type="text"],
.ui.form input[type="file"],
.ui.form input[type="url"] {
font-family: @inputFont;
margin: 0em;
Expand Down Expand Up @@ -375,7 +373,6 @@
.ui.form input[type="tel"]:focus,
.ui.form input[type="time"]:focus,
.ui.form input[type="text"]:focus,
.ui.form input[type="file"]:focus,
.ui.form input[type="url"]:focus {
color: @inputFocusColor;
border-color: @inputFocusBorderColor;
Expand Down Expand Up @@ -464,7 +461,6 @@
.ui.form .fields.error .field input[type="tel"],
.ui.form .fields.error .field input[type="time"],
.ui.form .fields.error .field input[type="text"],
.ui.form .fields.error .field input[type="file"],
.ui.form .fields.error .field input[type="url"],
.ui.form .field.error textarea,
.ui.form .field.error select,
Expand All @@ -478,7 +474,6 @@
.ui.form .field.error input[type="tel"],
.ui.form .field.error input[type="time"],
.ui.form .field.error input[type="text"],
.ui.form .field.error input[type="file"],
.ui.form .field.error input[type="url"] {
background: @formErrorBackground;
border-color: @formErrorBorder;
Expand All @@ -498,7 +493,6 @@
.ui.form .field.error input[type="tel"]:focus,
.ui.form .field.error input[type="time"]:focus,
.ui.form .field.error input[type="text"]:focus,
.ui.form .field.error input[type="file"]:focus,
.ui.form .field.error input[type="url"]:focus {
background: @inputErrorFocusBackground;
border-color: @inputErrorFocusBorder;
Expand Down Expand Up @@ -596,8 +590,7 @@
pointer-events: none;
opacity: @disabledOpacity;
}
.ui.form .field.disabled > label,
.ui.form .fields.disabled > label {
.ui.form .field.disabled label {
opacity: @disabledLabelOpacity;
}
.ui.form .field.disabled :disabled {
Expand All @@ -612,7 +605,7 @@
.ui.loading.form {
position: relative;
cursor: default;
pointer-events: none;
point-events: none;
}
.ui.loading.form:before {
position: absolute;
Expand Down Expand Up @@ -725,7 +718,6 @@
.ui.inverted.form input[type="tel"],
.ui.inverted.form input[type="time"],
.ui.inverted.form input[type="text"],
.ui.inverted.form input[type="file"],
.ui.inverted.form input[type="url"] {
background: @invertedInputBackground;
border-color: @invertedInputBorderColor;
Expand Down
14 changes: 7 additions & 7 deletions semantic/src/definitions/collections/grid.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,9 +951,9 @@
text-align: center;
justify-content: center;
}
.ui.centered.grid > .column:not(.aligned):not(.justified):not(.row),
.ui.centered.grid > .row > .column:not(.aligned):not(.justified),
.ui.grid .centered.row > .column:not(.aligned):not(.justified) {
.ui.centered.grid > .column:not(.aligned):not(:justified):not(.row),
.ui.centered.grid > .row > .column:not(.aligned):not(:justified),
.ui.grid .centered.row > .column:not(.aligned):not(:justified) {
text-align: left;
}

Expand Down Expand Up @@ -1236,7 +1236,7 @@
.ui[class*="left aligned"].grid > .row > .column,
.ui.grid > [class*="left aligned"].row > .column,
.ui.grid > [class*="left aligned"].column.column,
.ui.grid > .row > [class*="left aligned"].column.column {
.ui.grid > .row > [class*="left aligned"].column {
text-align: left;
align-self: inherit;
}
Expand All @@ -1246,7 +1246,7 @@
.ui[class*="center aligned"].grid > .row > .column,
.ui.grid > [class*="center aligned"].row > .column,
.ui.grid > [class*="center aligned"].column.column,
.ui.grid > .row > [class*="center aligned"].column.column {
.ui.grid > .row > [class*="center aligned"].column {
text-align: center;
align-self: inherit;
}
Expand All @@ -1259,7 +1259,7 @@
.ui[class*="right aligned"].grid > .row > .column,
.ui.grid > [class*="right aligned"].row > .column,
.ui.grid > [class*="right aligned"].column.column,
.ui.grid > .row > [class*="right aligned"].column.column {
.ui.grid > .row > [class*="right aligned"].column {
text-align: right;
align-self: inherit;
}
Expand All @@ -1269,7 +1269,7 @@
.ui.justified.grid > .row > .column,
.ui.grid > .justified.row > .column,
.ui.grid > .justified.column.column,
.ui.grid > .row > .justified.column.column {
.ui.grid > .row > .justified.column {
text-align: justify;
hyphens: auto;
}
Expand Down
19 changes: 13 additions & 6 deletions semantic/src/definitions/collections/menu.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,18 @@
font-weight: @verticalHeaderFontWeight;
}

/*--------------
Popup
---------------*/

.ui.menu .ui.popup {
display: none;
}
.ui.menu .ui.visible.popup {
display: block;
}


/*--------------
Dropdowns
---------------*/
Expand Down Expand Up @@ -284,18 +296,13 @@
margin-left: 1em;
}
.ui.vertical.menu .dropdown.item .menu {
top: 0% !important;
left: 100%;
min-width: 0;
margin: 0em 0em 0em @dropdownMenuDistance;
box-shadow: @dropdownVerticalMenuBoxShadow;
border-radius: 0em @dropdownMenuBorderRadius @dropdownMenuBorderRadius @dropdownMenuBorderRadius;
}
.ui.vertical.menu .dropdown.item.upward .menu {
bottom: 0;
}
.ui.vertical.menu .dropdown.item:not(.upward) .menu {
top: 0;
}
.ui.vertical.menu .active.dropdown.item {
border-top-right-radius: 0em;
border-bottom-right-radius: 0em;
Expand Down
2 changes: 1 addition & 1 deletion semantic/src/definitions/collections/message.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
min-height: 1em;
margin: @verticalMargin 0em;
background: @background;
padding: @padding;
padding: @verticalPadding @horizontalPadding;
line-height: @lineHeight;
color: @textColor;
transition: @transition;
Expand Down
31 changes: 18 additions & 13 deletions semantic/src/definitions/elements/button.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,10 +591,10 @@
color: @iconColor;
}

.ui.button:not(.icon) > .icon:not(.button):not(.dropdown) {
.ui.button:not(.icon) > .icon:not(.button) {
margin: @iconMargin;
}
.ui.button:not(.icon) > .right.icon:not(.button):not(.dropdown) {
.ui.button:not(.icon) > .right.icon:not(.button) {
margin: @rightIconMargin;
}

Expand Down Expand Up @@ -3408,19 +3408,24 @@
width: 100%;
margin: @verticalGroupOffset;
box-shadow: @verticalBoxShadow;
border-radius: 0em;
}
.ui.vertical.buttons .button:first-child {
border-top-left-radius: @borderRadius;
border-top-right-radius: @borderRadius;
}
.ui.vertical.buttons .button:last-child {
.ui.vertical.buttons .button:first-child,
.ui.vertical.buttons .mini.button:first-child,
.ui.vertical.buttons .tiny.button:first-child,
.ui.vertical.buttons .small.button:first-child,
.ui.vertical.buttons .massive.button:first-child,
.ui.vertical.buttons .huge.button:first-child {
border-radius: @borderRadius @borderRadius 0px 0px;
}
.ui.vertical.buttons .button:last-child,
.ui.vertical.buttons .mini.button:last-child,
.ui.vertical.buttons .tiny.button:last-child,
.ui.vertical.buttons .small.button:last-child,
.ui.vertical.buttons .massive.button:last-child,
.ui.vertical.buttons .huge.button:last-child,
.ui.vertical.buttons .gigantic.button:last-child {
margin-bottom: 0px;
border-bottom-left-radius: @borderRadius;
border-bottom-right-radius: @borderRadius;
}
.ui.vertical.buttons .button:only-child {
border-radius: @borderRadius;
border-radius: 0px 0px @borderRadius @borderRadius;
}

.loadUIOverrides();
Expand Down
4 changes: 2 additions & 2 deletions semantic/src/definitions/elements/icon.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ i.fitted.icon {
Link
--------------------*/

i.link.icon, i.link.icons {
i.link.icon {
cursor: pointer;
opacity: @linkOpacity;
transition: opacity @defaultDuration @defaultEasing;
}
i.link.icon:hover, i.link.icons:hover {
i.link.icon:hover {
opacity: 1 !important;
}

Expand Down
2 changes: 1 addition & 1 deletion semantic/src/definitions/elements/label.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ a.ui.active.label:ActiveHover:before {
--------------------*/

.ui.labels.visible .label,
.ui.label.visible:not(.dropdown) {
.ui.label.visible {
display: inline-block !important;
}

Expand Down
2 changes: 1 addition & 1 deletion semantic/src/definitions/elements/segment.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
.ui.loading.segment {
position: relative;
cursor: default;
pointer-events: none;
point-events: none;
text-shadow: none !important;
color: transparent !important;
transition: all 0s linear;
Expand Down
3 changes: 0 additions & 3 deletions semantic/src/definitions/modules/checkbox.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,6 @@
top: @toggleLaneVerticalOffset;

background: @toggleLaneBackground;
box-shadow: @toggleLaneBoxShadow;
width: @toggleLaneWidth;
height: @toggleLaneHeight;
border-radius: @toggleHandleRadius;
Expand Down Expand Up @@ -529,7 +528,6 @@
.ui.toggle.checkbox input ~ .box:after,
.ui.toggle.checkbox input ~ label:after {
left: @toggleOffOffset;
box-shadow: @toggleOffHandleBoxShadow;
}

/* Focus */
Expand Down Expand Up @@ -558,7 +556,6 @@
.ui.toggle.checkbox input:checked ~ .box:after,
.ui.toggle.checkbox input:checked ~ label:after {
left: @toggleOnOffset;
box-shadow: @toggleOnHandleBoxShadow;
}


Expand Down
Loading

0 comments on commit a618031

Please sign in to comment.