From 975e5915e7a1e6e6b2ce7bd648011d2fd4df8e4a Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Mon, 13 May 2013 10:10:11 -0400 Subject: [PATCH] fixes to item layout on overview Former-commit-id: ca0af97bff8d16f66f4d35e49b901ad2cace6a9c Former-commit-id: 85af8ce098895bada7843b5e53e5c58d53a65192 --- node/src/documents/collection.html | 8 ++-- .../semantic/src/collections/grid.css | 3 ++ .../semantic/src/collections/items.css | 2 +- .../src/modules/behavior/animation.js | 4 +- node/src/files/javascript/library/easing.js | 44 +++++++++++++++++++ node/src/files/javascript/semantic.js | 11 +++++ node/src/layouts/default.html.eco | 5 ++- src/collections/grid.css | 3 ++ src/collections/items.css | 2 +- src/modules/behavior/animation.js | 4 +- 10 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 node/src/files/javascript/library/easing.js diff --git a/node/src/documents/collection.html b/node/src/documents/collection.html index c74752271..c5f599f60 100755 --- a/node/src/documents/collection.html +++ b/node/src/documents/collection.html @@ -37,10 +37,10 @@ type : 'Library'
-
-
One
-
Two
-
Three
+
+
Top
+
Middle
+
Bottom
diff --git a/node/src/files/components/semantic/src/collections/grid.css b/node/src/files/components/semantic/src/collections/grid.css index 9be7e4bb8..14872d59f 100644 --- a/node/src/files/components/semantic/src/collections/grid.css +++ b/node/src/files/components/semantic/src/collections/grid.css @@ -357,14 +357,17 @@ } .ui.top.aligned.grid .column, +.ui.grid .top.aligned.column, .ui.grid .top.aligned.row .column { vertical-align: top; } .ui.middle.aligned.grid .column, +.ui.grid .middle.aligned.column, .ui.grid .middle.aligned.row .column { vertical-align: middle; } .ui.bottom.aligned.grid .column, +.ui.grid .bottom.aligned.column, .ui.grid .bottom.aligned.row .column { vertical-align: bottom; } diff --git a/node/src/files/components/semantic/src/collections/items.css b/node/src/files/components/semantic/src/collections/items.css index 9ac50e5e4..a807e07a1 100644 --- a/node/src/files/components/semantic/src/collections/items.css +++ b/node/src/files/components/semantic/src/collections/items.css @@ -286,7 +286,7 @@ .ui.items > .item > .content > .name, .ui.items > .item > .content > .title { display: block; - margin-bottom: 1%; + margin-bottom: 0.3em; font-size: 1.25em; font-weight: bold; diff --git a/node/src/files/components/semantic/src/modules/behavior/animation.js b/node/src/files/components/semantic/src/modules/behavior/animation.js index db58fdf06..54c22e32f 100644 --- a/node/src/files/components/semantic/src/modules/behavior/animation.js +++ b/node/src/files/components/semantic/src/modules/behavior/animation.js @@ -122,7 +122,7 @@ $.fn.popIn.settings = { // legacy browser - isLegacyBrowser: ($.browser.msie && parseInt($.browser.version) <= 8), + isLegacyBrowser: false, // class given until animation ends className: { @@ -219,7 +219,7 @@ $.fn.kenBurns.settings = { // legacy browser - isLegacyBrowser : ($.browser.msie && parseInt($.browser.version, 10) <= 8), + isLegacyBrowser : false, // duration of animation duration : 10000, diff --git a/node/src/files/javascript/library/easing.js b/node/src/files/javascript/library/easing.js new file mode 100644 index 000000000..6cf5f20c4 --- /dev/null +++ b/node/src/files/javascript/library/easing.js @@ -0,0 +1,44 @@ +/* + * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/ + * + * Uses the built in easing capabilities added In jQuery 1.1 + * to offer multiple easing options + * + * TERMS OF USE - EASING EQUATIONS + * + * Open source under the BSD License. + * + * Copyright © 2001 Robert Penner + * All rights reserved. + * + * TERMS OF USE - jQuery Easing + * + * Open source under the BSD License. + * + * Copyright © 2008 George McGinley Smith + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * Neither the name of the author nor the names of contributors may be used to endorse + * or promote products derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * +*/ +jQuery.easing.jswing=jQuery.easing.swing;jQuery.extend(jQuery.easing,{def:"easeOutQuad",swing:function(e,f,a,h,g){return jQuery.easing[jQuery.easing.def](e,f,a,h,g)},easeInQuad:function(e,f,a,h,g){return h*(f/=g)*f+a},easeOutQuad:function(e,f,a,h,g){return -h*(f/=g)*(f-2)+a},easeInOutQuad:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f+a}return -h/2*((--f)*(f-2)-1)+a},easeInCubic:function(e,f,a,h,g){return h*(f/=g)*f*f+a},easeOutCubic:function(e,f,a,h,g){return h*((f=f/g-1)*f*f+1)+a},easeInOutCubic:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f+a}return h/2*((f-=2)*f*f+2)+a},easeInQuart:function(e,f,a,h,g){return h*(f/=g)*f*f*f+a},easeOutQuart:function(e,f,a,h,g){return -h*((f=f/g-1)*f*f*f-1)+a},easeInOutQuart:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f*f+a}return -h/2*((f-=2)*f*f*f-2)+a},easeInQuint:function(e,f,a,h,g){return h*(f/=g)*f*f*f*f+a},easeOutQuint:function(e,f,a,h,g){return h*((f=f/g-1)*f*f*f*f+1)+a},easeInOutQuint:function(e,f,a,h,g){if((f/=g/2)<1){return h/2*f*f*f*f*f+a}return h/2*((f-=2)*f*f*f*f+2)+a},easeInSine:function(e,f,a,h,g){return -h*Math.cos(f/g*(Math.PI/2))+h+a},easeOutSine:function(e,f,a,h,g){return h*Math.sin(f/g*(Math.PI/2))+a},easeInOutSine:function(e,f,a,h,g){return -h/2*(Math.cos(Math.PI*f/g)-1)+a},easeInExpo:function(e,f,a,h,g){return(f==0)?a:h*Math.pow(2,10*(f/g-1))+a},easeOutExpo:function(e,f,a,h,g){return(f==g)?a+h:h*(-Math.pow(2,-10*f/g)+1)+a},easeInOutExpo:function(e,f,a,h,g){if(f==0){return a}if(f==g){return a+h}if((f/=g/2)<1){return h/2*Math.pow(2,10*(f-1))+a}return h/2*(-Math.pow(2,-10*--f)+2)+a},easeInCirc:function(e,f,a,h,g){return -h*(Math.sqrt(1-(f/=g)*f)-1)+a},easeOutCirc:function(e,f,a,h,g){return h*Math.sqrt(1-(f=f/g-1)*f)+a},easeInOutCirc:function(e,f,a,h,g){if((f/=g/2)<1){return -h/2*(Math.sqrt(1-f*f)-1)+a}return h/2*(Math.sqrt(1-(f-=2)*f)+1)+a},easeInElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k)==1){return e+l}if(!j){j=k*0.3}if(g + @@ -46,6 +47,7 @@ <%- @getBlock('scripts').toHTML() %> + @@ -53,6 +55,7 @@ + @@ -118,7 +121,7 @@ <% end %>
- +