Skip to content

Commit

Permalink
Rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlukic
jlukic committed Apr 20, 2015
1 parent fbf0f3a commit 046612e
Show file tree
Hide file tree
Showing 19 changed files with 121 additions and 91 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.md
View file
Expand Up @@ -114,6 +114,7 @@
- **Reveal** - Removed `masked` reveal, all reveals are masked by default
- **Search** - Search will no longer incorrectly produce an error when API settings are passed through metadata
- **Sidebar** - Top/Bottom sidebar will now show scroll bars correctly when taller than 100% page height
- **Sidebar** - Fixed bug where having a `style[title]` in page causing page not to be pushed correctly
- **Sidebar** - Last menu item now has a border when sidebar and menu are used together
- **Search** - Fixed `onSelect` not returning the correct value when using `type: category`
- **Search** - Fixed `onSelect` returning the first term that matches the beginining of the selected value not the exact value.
Expand Down
4 changes: 2 additions & 2 deletions dist/components/button.css
View file
Expand Up @@ -71,10 +71,10 @@
---------------*/

.ui.button:focus {
background-color: '';
background-color: #cacaca;
color: rgba(0, 0, 0, 0.8);
background-image: '' !important;
box-shadow: 0px 0px 0px 1px transparent inset, 0px 1px 2px rgba(0, 0, 0, 0.075) inset, 0px 0px 5px rgba(81, 167, 232, 0.5) !important;
box-shadow: '' !important;
}
.ui.button:focus .icon {
opacity: 0.85;
Expand Down
2 changes: 1 addition & 1 deletion dist/components/button.min.css
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/components/dropdown.css
View file
Expand Up @@ -105,6 +105,7 @@
display: block;
border: none;
height: auto;
text-align: left;
border-top: none;
line-height: 1em;
color: rgba(0, 0, 0, 0.8);
Expand Down
2 changes: 1 addition & 1 deletion dist/components/dropdown.js
View file
Expand Up @@ -1427,7 +1427,7 @@ $.fn.dropdown = function(parameters) {
placeholderText: function(text) {
module.debug('Restoring placeholder text');
text = text || $module.data(metadata.placeholderText);
module.set.text(placeholderText);
module.set.text(text);
$text.addClass(className.placeholder);
},
tabbable: function() {
Expand Down
2 changes: 1 addition & 1 deletion dist/components/dropdown.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/components/dropdown.min.js
View file

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions dist/components/shape.css
View file
Expand Up @@ -19,6 +19,8 @@
display: inline-block;
-webkit-perspective: 2000px;
perspective: 2000px;
-webkit-transition: -webkit-transform 0.6s ease-in-out, left 0.6s ease-in-out, width 0.6s ease-in-out, height 0.6s ease-in-out;
transition: transform 0.6s ease-in-out, left 0.6s ease-in-out, width 0.6s ease-in-out, height 0.6s ease-in-out;
}
.ui.shape .sides {
-webkit-transform-style: preserve-3d;
Expand Down Expand Up @@ -117,16 +119,12 @@
CSS
---------------*/

.ui.shape.animating {
-webkit-transition: all 0.6s ease-in-out;
transition: all 0.6s ease-in-out;
}
.ui.shape.animating .sides {
position: absolute;
}
.ui.shape.animating .sides {
-webkit-transition: all 0.6s ease-in-out;
transition: all 0.6s ease-in-out;
-webkit-transition: -webkit-transform 0.6s ease-in-out, left 0.6s ease-in-out, width 0.6s ease-in-out, height 0.6s ease-in-out;
transition: transform 0.6s ease-in-out, left 0.6s ease-in-out, width 0.6s ease-in-out, height 0.6s ease-in-out;
}
.ui.shape.animating .side {
-webkit-transition: opacity 0.6s ease-in-out;
Expand Down
69 changes: 42 additions & 27 deletions dist/components/shape.js
View file
Expand Up @@ -216,6 +216,20 @@ $.fn.shape = function(parameters) {
;
},

currentStageSize: function() {
var
$activeSide = $module.find('.' + settings.className.active),
width = $activeSide.outerWidth(true),
height = $activeSide.outerHeight(true)
;
$module
.css({
width: width,
height: height
})
;
},

stageSize: function() {
var
$clone = $module.clone().addClass(className.loading),
Expand All @@ -227,12 +241,13 @@ $.fn.shape = function(parameters) {
: $clone.find(selector.side).first(),
newSize = {}
;
module.set.currentStageSize();
$activeSide.removeClass(className.active);
$nextSide.addClass(className.active);
$clone.insertAfter($module);
newSize = {
width : $nextSide.outerWidth(),
height : $nextSide.outerHeight()
width : $nextSide.outerWidth(true),
height : $nextSide.outerHeight(true)
};
$clone.remove();
$module
Expand Down Expand Up @@ -371,8 +386,8 @@ $.fn.shape = function(parameters) {
up: function() {
var
translate = {
y: -(($activeSide.outerHeight() - $nextSide.outerHeight()) / 2),
z: -($activeSide.outerHeight() / 2)
y: -(($activeSide.outerHeight(true) - $nextSide.outerHeight(true)) / 2),
z: -($activeSide.outerHeight(true) / 2)
}
;
return {
Expand All @@ -383,8 +398,8 @@ $.fn.shape = function(parameters) {
down: function() {
var
translate = {
y: -(($activeSide.outerHeight() - $nextSide.outerHeight()) / 2),
z: -($activeSide.outerHeight() / 2)
y: -(($activeSide.outerHeight(true) - $nextSide.outerHeight(true)) / 2),
z: -($activeSide.outerHeight(true) / 2)
}
;
return {
Expand All @@ -395,8 +410,8 @@ $.fn.shape = function(parameters) {
left: function() {
var
translate = {
x : -(($activeSide.outerWidth() - $nextSide.outerWidth()) / 2),
z : -($activeSide.outerWidth() / 2)
x : -(($activeSide.outerWidth(true) - $nextSide.outerWidth(true)) / 2),
z : -($activeSide.outerWidth(true) / 2)
}
;
return {
Expand All @@ -407,8 +422,8 @@ $.fn.shape = function(parameters) {
right: function() {
var
translate = {
x : -(($activeSide.outerWidth() - $nextSide.outerWidth()) / 2),
z : -($activeSide.outerWidth() / 2)
x : -(($activeSide.outerWidth(true) - $nextSide.outerWidth(true)) / 2),
z : -($activeSide.outerWidth(true) / 2)
}
;
return {
Expand All @@ -419,7 +434,7 @@ $.fn.shape = function(parameters) {
over: function() {
var
translate = {
x : -(($activeSide.outerWidth() - $nextSide.outerWidth()) / 2)
x : -(($activeSide.outerWidth(true) - $nextSide.outerWidth(true)) / 2)
}
;
return {
Expand All @@ -430,7 +445,7 @@ $.fn.shape = function(parameters) {
back: function() {
var
translate = {
x : -(($activeSide.outerWidth() - $nextSide.outerWidth()) / 2)
x : -(($activeSide.outerWidth(true) - $nextSide.outerWidth(true)) / 2)
}
;
return {
Expand Down Expand Up @@ -471,10 +486,10 @@ $.fn.shape = function(parameters) {
above: function() {
var
box = {
origin : (($activeSide.outerHeight() - $nextSide.outerHeight()) / 2),
origin : (($activeSide.outerHeight(true) - $nextSide.outerHeight(true)) / 2),
depth : {
active : ($nextSide.outerHeight() / 2),
next : ($activeSide.outerHeight() / 2)
active : ($nextSide.outerHeight(true) / 2),
next : ($activeSide.outerHeight(true) / 2)
}
}
;
Expand All @@ -497,10 +512,10 @@ $.fn.shape = function(parameters) {
below: function() {
var
box = {
origin : (($activeSide.outerHeight() - $nextSide.outerHeight()) / 2),
origin : (($activeSide.outerHeight(true) - $nextSide.outerHeight(true)) / 2),
depth : {
active : ($nextSide.outerHeight() / 2),
next : ($activeSide.outerHeight() / 2)
active : ($nextSide.outerHeight(true) / 2),
next : ($activeSide.outerHeight(true) / 2)
}
}
;
Expand All @@ -523,10 +538,10 @@ $.fn.shape = function(parameters) {
left: function() {
var
box = {
origin : ( ( $activeSide.outerWidth() - $nextSide.outerWidth() ) / 2),
origin : ( ( $activeSide.outerWidth(true) - $nextSide.outerWidth(true) ) / 2),
depth : {
active : ($nextSide.outerWidth() / 2),
next : ($activeSide.outerWidth() / 2)
active : ($nextSide.outerWidth(true) / 2),
next : ($activeSide.outerWidth(true) / 2)
}
}
;
Expand All @@ -549,10 +564,10 @@ $.fn.shape = function(parameters) {
right: function() {
var
box = {
origin : ( ( $activeSide.outerWidth() - $nextSide.outerWidth() ) / 2),
origin : ( ( $activeSide.outerWidth(true) - $nextSide.outerWidth(true) ) / 2),
depth : {
active : ($nextSide.outerWidth() / 2),
next : ($activeSide.outerWidth() / 2)
active : ($nextSide.outerWidth(true) / 2),
next : ($activeSide.outerWidth(true) / 2)
}
}
;
Expand All @@ -575,10 +590,10 @@ $.fn.shape = function(parameters) {
behind: function() {
var
box = {
origin : ( ( $activeSide.outerWidth() - $nextSide.outerWidth() ) / 2),
origin : ( ( $activeSide.outerWidth(true) - $nextSide.outerWidth(true) ) / 2),
depth : {
active : ($nextSide.outerWidth() / 2),
next : ($activeSide.outerWidth() / 2)
active : ($nextSide.outerWidth(true) / 2),
next : ($activeSide.outerWidth(true) / 2)
}
}
;
Expand Down
2 changes: 1 addition & 1 deletion dist/components/shape.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 046612e

Please sign in to comment.