forked from jlong/sass-bootstrap-defunct
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge changes made in Geoloqi-Website
- Loading branch information
1 parent
9d37f5a
commit 4275705
Showing
13 changed files
with
2,527 additions
and
729 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,36 @@ | ||
| //Polyfill Placeholders in Non-Supported Browsers | ||
| /* | ||
| Modernizr.load({ | ||
| test: Modernizr.input.placeholder, | ||
| nope: 'polyfill/jquery.placeholder.min.js', | ||
| complete : function () { | ||
| $('input[placeholder], textarea[placeholder]').placeholder(); | ||
| } | ||
| }); | ||
|
|
||
| */ | ||
| //Close Function for Alert Messages | ||
| $('.alert-message .close').live("click",function(){ | ||
| $(this).parent().slideUp("fast", function(){ $(this).remove() }); | ||
| return false; | ||
| }); | ||
|
|
||
| //Setup Tooltips | ||
| /* | ||
| $("a[rel='twipsy']").twipsy({ | ||
| live: true, | ||
| animate:true, | ||
| offset: 3 | ||
| }); | ||
| */ | ||
|
|
||
| //Setup Popover | ||
| /* | ||
| $("a[rel='popup']").popover({ | ||
| live: true, | ||
| html: true, | ||
| offset: 3, | ||
| delayOut: 500, | ||
| animate:true, | ||
| placement: "above" | ||
| }); | ||
| }); | ||
| */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,54 @@ | ||
| (function( $ ){ | ||
|
|
||
| var defaults = { | ||
| width: '100%', | ||
| offBottom: 0, | ||
| offWidth: 0 | ||
| } | ||
| (function ($) { | ||
|
|
||
| var settings = {} | ||
|
|
||
| var methods = { | ||
| init: function(options){ | ||
| settings = $.extend({}, defaults, options); | ||
| var defaults = { | ||
| width: '100%', | ||
| offBottom: 0, | ||
| offWidth: 0, | ||
| callback: null | ||
| }; | ||
|
|
||
| var $this = $(this), | ||
| self = $this; | ||
| var settings = {}; | ||
|
|
||
| var methods = { | ||
| init: function(options) { | ||
| settings = $.extend({}, defaults, options); | ||
|
|
||
| $(window).bind('resize.mapSizer', function(){ | ||
| self.mapSizer("resize"); | ||
| }); | ||
|
|
||
| $this.mapSizer('resize'); | ||
| }, | ||
|
|
||
| resize: function() { | ||
| return $(this).each(function(){ | ||
| $(this).height(function(){ | ||
| return ($('html').height() - settings.offBottom); | ||
| }).width(function(){ | ||
| return (settings.width - settings.offWidth) | ||
| }); | ||
| var $this = $(this), | ||
| self = $this; | ||
|
|
||
| $(window).bind('resize scroll', function() { | ||
| self.mapSizer("resize"); | ||
| }); | ||
|
|
||
| $this.mapSizer('resize'); | ||
| }, | ||
|
|
||
| resize: function(options) { | ||
| options = (typeof options == "undefined") ? {} : options; | ||
| settings = $.extend({}, settings, options); | ||
| return $(this).each(function() { | ||
| $(this).height(function() { | ||
| return ($(window).height() - $(this).offset().top - settings.offBottom); | ||
| }).width(function(){ | ||
| return (settings.width - settings.offWidth); | ||
| }).each(function(){ | ||
| if(settings.callback){ | ||
| settings.callback.apply(this); | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| $.fn.mapSizer = function( method ) { | ||
| // Method calling logic | ||
| if ( methods[method] ) { | ||
| return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 )); | ||
| } else if ( typeof method === 'object' || ! method ) { | ||
| return methods.init.apply( this, arguments ); | ||
| } else { | ||
| $.error( 'Method ' + method + ' does not exist on jQuery.tooltip' ); | ||
| } | ||
| $.fn.mapSizer = function( method ) { | ||
| if (methods[method]) { | ||
| return methods[method].apply( this, Array.prototype.slice.call( arguments, 1 )); | ||
| } else if (typeof method === 'object' || ! method) { | ||
| return methods.init.apply(this, arguments); | ||
| } else { | ||
| $.error( 'Method ' + method + ' does not exist on jQuery.tooltip' ); | ||
| } | ||
|
|
||
| }; | ||
| }; | ||
|
|
||
| })( jQuery ); | ||
| })(jQuery); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.