Changeset 2002299
- Timestamp:
- 12/27/2018 01:20:12 PM (7 years ago)
- Location:
- rays-grid/trunk/assets/public
- Files:
-
- 13 added
- 2 edited
-
css/style.css (modified) (3 diffs)
-
css/vendor (added)
-
css/vendor/font.awesome.css (added)
-
css/vendor/icomoon.css (added)
-
css/vendor/linea-icons.css (added)
-
css/vendor/magnific-popup.css (added)
-
css/vendor/slick.slider.css (added)
-
js/script.js (modified) (4 diffs)
-
js/vendor (added)
-
js/vendor/colorbox.js (added)
-
js/vendor/hoverdir.js (added)
-
js/vendor/isotope.js (added)
-
js/vendor/magnific.popup.js (added)
-
js/vendor/modernizr.js (added)
-
js/vendor/slick.slider.js (added)
Legend:
- Unmodified
- Added
- Removed
-
rays-grid/trunk/assets/public/css/style.css
r1786219 r2002299 1263 1263 text-align: center; 1264 1264 top: 50%; 1265 transform: translateY(-50%); 1266 -webkit-transform: translateY(-50%); 1265 1267 } 1266 1268 .raysgrid.rolly .port-captions h4{ … … 1799 1801 margin: 0; 1800 1802 padding: 0; 1801 bottom: -30px;1802 1803 left: 50%; 1804 width: auto; 1803 1805 transform: translateX(-50%); 1804 slate(-50%,-50%); 1806 transform: translateX(-50%); 1807 -webkit-transform: translateX(-50%); 1805 1808 } 1806 1809 .raysgrid.slick-slider .slick-dots li{ … … 1835 1838 transform: translateY(-50%); 1836 1839 background-color: #fff; 1840 color: #333; 1837 1841 z-index: 99; 1838 1842 cursor: pointer; -
rays-grid/trunk/assets/public/js/script.js
r2000454 r2002299 160 160 161 161 var pos = $(this).scrollTop(), 162 bot = $('.rsgd_load_more_scrl').position().top-25;162 bot = th.position().top; 163 163 164 164 if ( pos >= bot ) { … … 205 205 206 206 $('.raysgrid').each(function () { 207 var tot = 0, 208 tim = 0, 209 that = $(this), 210 thID = that.attr('id'), 207 var that = $(this), 211 208 itm = that.find('.portfolio-item'), 212 209 cols = that.attr('data-cols'), 213 210 slds = that.attr('data-slidesnum'), 214 num = itm.length,215 211 sp = that.attr('data-spacing'), 216 spC = that.attr('data-margins'),217 212 lay = that.attr('data-layout'), 218 im = '', 219 tw = ''; 220 221 itm.css('padding',sp+'px'); 222 that.css('margin',-sp+'px'); 223 224 var mr = sp*2, 225 w = parseInt(that.outerWidth(),10); 213 w = parseInt( that.outerWidth() , 10 ), 214 mr = sp * 2, 215 tw = ''; 216 217 that.css( 'margin' , -sp + 'px' ); 218 itm.css( 'padding' , sp + 'px' ); 226 219 227 220 if ( lay == 'grid' ){ 228 tw = (w/cols) - mr;221 tw = w / cols + 10; 229 222 } else if ( lay == 'slider' ) { 230 tw = ( w/slds) - mr;223 tw = ( w / slds ) - mr; 231 224 } 232 225 233 itm.css( 'width', tw+'px');234 235 itm.each( function(){226 itm.css( 'width' , tw + 'px' ); 227 228 itm.each( function(){ 236 229 237 var th = $(this), 238 ww = th.width(), 239 hh = th.height(), 240 imP = th.find('.port-img'), 241 mmP = th.find('.media-cont'), 242 im = imP.find('img').attr('src'), 243 rX = th.attr('data-ratio-x'), 244 rY = th.attr('data-ratio-y'), 245 nH = ww*rY/rX; 230 var th = $( this ), 231 imP = th.find( '.port-img' ), 232 mmP = th.find( '.media-cont' ), 233 im = imP.find( 'img' ).attr( 'src' ), 234 rX = th.attr( 'data-ratio-x' ), 235 rY = th.attr( 'data-ratio-y' ), 236 nH = tw * ( rY / rX ); 246 237 247 238 if( lay == 'grid' || lay == 'slider' ){ … … 252 243 253 244 if( that.hasClass('paleo') || that.hasClass('sublime') || that.hasClass('resort') || that.hasClass('gemini') || that.hasClass('solo') || that.hasClass('focus') || that.hasClass('zilla') ){ 254 var ht = parseInt(imP.parent().find('.port-captions').outerHeight(),10) ;255 imP.css('height',nH+'px');256 var pd = parseInt(th.css('padding-top'),10);257 var pdb = parseInt(th.css('padding-bottom'),10);258 var tot = ht + nH + pd + pdb;245 var ht = parseInt(imP.parent().find('.port-captions').outerHeight(),10) + parseInt(imP.parent().find('.port-captions').css('padding-top'),10) + parseInt(imP.parent().find('.port-captions').css('padding-bottom'),10); 246 var pd = parseInt(th.css('padding-top'),10) *2; 247 248 imP.css('height', nH - pd+'px'); 249 var tot = ht + nH; 259 250 imP.parent().parent().css('height',tot+'px'); 260 th.find('.icon-links').appendTo( imP);251 th.find('.icon-links').appendTo( imP ); 261 252 } else { 262 imP.parent().parent().css('height',nH+'px'); 263 if( !$('body').hasClass('admin-bar') ){ 264 imP.parent().parent().css('width',ww-4.25+'px'); 265 } 253 th.css( 'height' , nH + 'px' ); 266 254 } 267 255 268 256 } else if ( mmP.length ) { 269 257 270 mmP.find('iframe,video,.wp-video').css('height', ww).css('width',ww);258 mmP.find('iframe,video,.wp-video').css('height',tw).css('width',tw); 271 259 mmP.css('height',nH+'px'); 272 260 … … 392 380 var that = $(this), 393 381 sp = that.attr('data-spacing'), 394 spC = that.attr('data-margins'),395 382 itm = that.find('.portfolio-item'); 396 383
Note: See TracChangeset
for help on using the changeset viewer.