Browse Source

fixes to item layout on overview

Former-commit-id: ca0af97bff
Former-commit-id: 85af8ce098
pull/258/head
Jack Lukic 12 years ago
parent
commit
975e5915e7
10 changed files with 75 additions and 11 deletions
  1. 8
      node/src/documents/collection.html
  2. 3
      node/src/files/components/semantic/src/collections/grid.css
  3. 2
      node/src/files/components/semantic/src/collections/items.css
  4. 4
      node/src/files/components/semantic/src/modules/behavior/animation.js
  5. 44
      node/src/files/javascript/library/easing.js
  6. 11
      node/src/files/javascript/semantic.js
  7. 5
      node/src/layouts/default.html.eco
  8. 3
      src/collections/grid.css
  9. 2
      src/collections/items.css
  10. 4
      src/modules/behavior/animation.js

8
node/src/documents/collection.html

@ -37,10 +37,10 @@ type : 'Library'
</div>
<div class="item">
<div class="image">
<div class="ui three column grid">
<div class="column">One</div>
<div class="column">Two</div>
<div class="column">Three</div>
<div class="ui three column aligned grid">
<div class="top aligned column">Top</div>
<div class="middle aligned column">Middle</div>
<div class="bottom aligned column">Bottom</div>
</div>
</div>
<div class="content">

3
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;
}

2
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;

4
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,

44
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<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}return -(g*Math.pow(2,10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j))+e},easeOutElastic: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<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}return g*Math.pow(2,-10*h)*Math.sin((h*k-i)*(2*Math.PI)/j)+l+e},easeInOutElastic:function(f,h,e,l,k){var i=1.70158;var j=0;var g=l;if(h==0){return e}if((h/=k/2)==2){return e+l}if(!j){j=k*(0.3*1.5)}if(g<Math.abs(l)){g=l;var i=j/4}else{var i=j/(2*Math.PI)*Math.asin(l/g)}if(h<1){return -0.5*(g*Math.pow(2,10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j))+e}return g*Math.pow(2,-10*(h-=1))*Math.sin((h*k-i)*(2*Math.PI)/j)*0.5+l+e},easeInBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}return i*(f/=h)*f*((g+1)*f-g)+a},easeOutBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}return i*((f=f/h-1)*f*((g+1)*f+g)+1)+a},easeInOutBack:function(e,f,a,i,h,g){if(g==undefined){g=1.70158}if((f/=h/2)<1){return i/2*(f*f*(((g*=(1.525))+1)*f-g))+a}return i/2*((f-=2)*f*(((g*=(1.525))+1)*f+g)+2)+a},easeInBounce:function(e,f,a,h,g){return h-jQuery.easing.easeOutBounce(e,g-f,0,h,g)+a},easeOutBounce:function(e,f,a,h,g){if((f/=g)<(1/2.75)){return h*(7.5625*f*f)+a}else{if(f<(2/2.75)){return h*(7.5625*(f-=(1.5/2.75))*f+0.75)+a}else{if(f<(2.5/2.75)){return h*(7.5625*(f-=(2.25/2.75))*f+0.9375)+a}else{return h*(7.5625*(f-=(2.625/2.75))*f+0.984375)+a}}}},easeInOutBounce:function(e,f,a,h,g){if(f<g/2){return jQuery.easing.easeInBounce(e,f*2,0,h,g)*0.5+a}return jQuery.easing.easeOutBounce(e,f*2-g,0,h,g)*0.5+h*0.5+a}});

11
node/src/files/javascript/semantic.js

@ -16,6 +16,8 @@ semantic.ready = function() {
$demo = $('.demo'),
$waypoints = $('h2'),
$menuPopup = $('.ui.main.menu .popup.item'),
$example = $('.example'),
$peek = $('.peek'),
@ -307,6 +309,15 @@ semantic.ready = function() {
.on('click', handler.swapStyle)
;
$menuPopup
.popup({
position: 'bottom center',
className: {
popup: 'ui popup'
}
})
;
$menu
.on('mouseenter', handler.menu.mouseenter)
.on('mouseleave', handler.menu.mouseleave)

5
node/src/layouts/default.html.eco

@ -37,6 +37,7 @@
<link rel="stylesheet" type="text/css" class="ui" href="/components/semantic/src/collections/menu.css">
<link rel="stylesheet" type="text/css" class="ui" href="/components/semantic/src/modules/shape.css">
<link rel="stylesheet" type="text/css" class="ui" href="/components/semantic/src/modules/popup.css">
<link rel="stylesheet" type="text/css" class="ui" href="/components/semantic/src/modules/checkbox.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/library/sidr.css">
@ -46,6 +47,7 @@
<%- @getBlock('scripts').toHTML() %>
<script src="/javascript/library/jquery.js"></script>
<script src="/javascript/library/easing.js"></script>
<script src="/javascript/library/ace/ace.js"></script>
<script src="/javascript/library/sidr.js"></script>
<script src="/javascript/library/waypoints.js"></script>
@ -53,6 +55,7 @@
<script src="/components/semantic/src/modules/behavior/state.js"></script>
<script src="/components/semantic/src/modules/shape.js"></script>
<script src="/components/semantic/src/modules/checkbox.js"></script>
<script src="/components/semantic/src/modules/popup.js"></script>
<script src="/javascript/semantic.js"></script>
<script src="/javascript/shape.js"></script>
@ -118,7 +121,7 @@
<% end %>
</div>
<div class="right menu">
<a class="item" href="https://github.com/quirkyinc/semantic">
<a class="popup item" title="View project on Github" href="https://github.com/quirkyinc/semantic">
<i class="icon github"></i>
</a>
<!--

3
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;
}

2
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;

4
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,

Loading…
Cancel
Save