contour 2.1.0.beta6 → 2.1.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc43e6005368e3e9bf7c9e98148094b72a08520
-  data.tar.gz: c23ec930dd32ebd47ac27f8bc4fa395f37bef959
+  metadata.gz: 38656f23a5add367725cd16557dfac565776b70d
+  data.tar.gz: af4d1a04682367410e38b9d2941c329da7b0da85
 SHA512:
-  metadata.gz: b4b8248a70fec90f0689329b695891cd86ac9e988344f29b000977d8b95e971919fc58e2a4fbc05e3d6e9041bb77e847bf14b0a26579daea102709be584ef1ee
-  data.tar.gz: 23e603595dbc00a0b58af4d501999e0b33688dd11df4e8470d0c71fd16707b12ea718f6180ac473e851503601cb900583fac43bb41e63fe9e6e27e6f2c396a6b
+  metadata.gz: 5644735f53d42380a52b415217c15f8b6deb5eab3c3a5295d3115a82ccfcdfbafc6178581b6bbb1e6f6d7bbaad78875857de2570578c246ad17a8d685a4c88b7
+  data.tar.gz: 25014a955a416d956d7f44f889ece0b8bb819c6086fabea555cb34df79ff01f0166c1f5636602016bfd569641a8dd9ce53261c7624ea58ed3240b577938ce45f

data/CHANGELOG.md

@@ -6,6 +6,7 @@
 - Added `btn-cancel` and `btn-cancel-inverse` to complement other BS3 button styles
 - Menu dropdowns can now have headers
   - `links: [ ..., { header: 'Dropdown header' }, ... ]`
+- Removed bootstrap-scroll-modal since it collided with BS3's implementation
 
 ## 2.0.0 (July 25, 2013)
 

data/app/assets/javascripts/contour.js

@@ -8,7 +8,6 @@
 //
 //= require bootstrap/v3.0.0-rc1/bootstrap
 //
-//= require twitter-bootstrap/bootstrap-scroll-modal
 //= require twitter-bootstrap/bootstrap
 //
 //= require external/highcharts-3.0.2.src.js

data/app/assets/stylesheets/bootstrap-overrides.css

@@ -12,7 +12,7 @@
   /*background-color: transparent;*/
 }
 
-body { padding-top: 70px; padding-bottom: 70px; }
+body { padding-top: 50px; padding-bottom: 70px; }
 
 h1, h2, h3, h4, h5, h6 {
   font-weight: 300;

data/app/assets/stylesheets/contour.css

@@ -7,7 +7,6 @@
  *= require bootstrap/bs-callout
  *= require glyphicons
  *= require bootstrap-overrides
- *= require twitter-bootstrap/bootstrap-scroll-modal
  *= require typeahead.js-bootstrap
  *= require jquery-ui-1.10.0.custom
  *= require datepicker

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 1
     TINY = 0
-    BUILD = "beta6" # nil, "pre", "rc", "rc2"
+    BUILD = "beta7" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta6
+  version: 2.1.0.beta7
 platform: ruby
 authors:
 - Remo Mueller
@@ -227,7 +227,6 @@ files:
 - app/assets/javascripts/external/highcharts-3.0.2.src.js
 - app/assets/javascripts/external/jquery-ui-1.10.0.custom.min.js
 - app/assets/javascripts/external/typeahead.js
-- app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
 - app/assets/stylesheets/bootstrap/bs-callout.css
 - app/assets/stylesheets/bootstrap/v3.0.0-rc1/bootstrap.css
@@ -241,7 +240,6 @@ files:
 - app/assets/stylesheets/jquery-ui-1.10.0.custom.css
 - app/assets/stylesheets/spinner.css.erb
 - app/assets/stylesheets/timepicker.css
-- app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css
 - app/assets/stylesheets/typeahead.js-bootstrap.css
 - app/controllers/contour/authentications_controller.rb
 - app/controllers/contour/confirmations_controller.rb

data/app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js

@@ -1,276 +0,0 @@
-/*!
- * Bootstrap Scroll Modal
- * Version: 1.2
- * Made for your convenience by @theericanderson.
- * A variaton of only small piece of the insanely awesome
- * Twitter Bootstrap (http://twitter.github.com/bootstrap).
- */
-
-/* =========================================================
- * bootstrap-modal.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
-
-  var Modal = function (element, options) {
-    this.options = options
-    this.$element = $(element)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
-  }
-
-  Modal.prototype = {
-
-      constructor: Modal
-
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
-
-    , show: function () {
-        var that = this
-          , e = $.Event('show')
-
-        if (this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = true
-
-        this.escape()
-
-        if (this.options.dynamic) {
-          this.$elementWrapper = $('<div class="modal-wrapper" />').insertBefore(this.$element)
-          this.$element.prependTo(this.$elementWrapper)
-        }
-
-        this.backdrop(function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
-
-          if (!that.$element.parent().length) {
-            that.$element.appendTo(document.body) //don't move modals dom position
-          }
-
-          that.$element
-            .show()
-
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
-
-          that.$element
-            .addClass('in')
-            .attr('aria-hidden', false)
-
-          that.enforceFocus()
-
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
-            that.$element.focus().trigger('shown')
-
-        })
-      }
-
-    , hide: function ( e ) {
-        e && e.preventDefault()
-
-        var that = this
-
-        e = $.Event('hide')
-
-        this.$element.trigger(e)
-
-        if (!this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = false
-
-        this.escape()
-
-        $(document).off('focusin.modal')
-
-        this.$element
-          .removeClass('in')
-          .attr('aria-hidden', true)
-
-        $.support.transition && this.$element.hasClass('fade') ?
-          this.hideWithTransition() :
-          this.hideModal()
-      }
-
-    , enforceFocus: function () {
-        var that = this
-        $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
-            that.$element.focus()
-          }
-        })
-      }
-
-    , escape: function () {
-        var that = this
-        if (this.isShown && this.options.keyboard) {
-          this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
-          })
-        } else if (!this.isShown) {
-          this.$element.off('keyup.dismiss.modal')
-        }
-      }
-
-    , hideWithTransition: function () {
-        var that = this
-          , timeout = setTimeout(function () {
-              that.$element.off($.support.transition.end)
-              that.hideModal()
-            }, 500)
-
-        this.$element.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          that.hideModal()
-        })
-      }
-
-    , hideModal: function (that) {
-        this.$element
-          .hide()
-          .trigger('hidden')
-
-        if (this.options.dynamic) {
-          this.$element.insertAfter(this.$elementWrapper)
-          this.$elementWrapper.remove()
-          this.$elementWrapper = null
-        }
-
-        this.backdrop()
-      }
-
-    , removeBackdrop: function () {
-        this.$element.insertAfter(this.$backdrop)
-        this.$backdrop.remove()
-        this.$backdrop = null
-        $('body').css({ 'overflow' : '' })
-      }
-
-    , backdrop: function (callback) {
-        var that = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-        if (this.isShown && this.options.backdrop) {
-          var doAnimate = $.support.transition && animate
-
-          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-            .appendTo(document.body)
-
-          // Below are Bootstrap Scroll Modal additions to the backdrop function.
-
-          if (!that.$element.parent().length) {
-            this.$backdrop.appendTo(document.body) // don't move modals dom position
-          } else if (this.options.dynamic) {
-            this.$backdrop.insertBefore(this.$elementWrapper)
-          } else {
-            this.$backdrop.insertBefore(this.$element)
-          }
-
-          if (this.options.dynamic) {
-            this.$elementWrapper.prependTo(this.$backdrop)
-              .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-          } else {
-            this.$element.prependTo(this.$backdrop)
-              .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-          }
-
-          $('body').css({ 'overflow' : 'hidden' })
-
-          this.$backdrop.on('click', function(e){
-            if (that.options.backdrop == 'static') {
-              $.proxy(that.$element[0].focus, that.$element[0])
-            } else if (e.target == e.delegateTarget) {
-              that.hide(e)
-            }
-          })
-
-          // end additions
-
-          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-          this.$backdrop.addClass('in')
-
-          doAnimate ?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (!this.isShown && this.$backdrop) {
-          this.$backdrop.removeClass('in')
-
-          $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) :
-            this.removeBackdrop()
-
-        } else if (callback) {
-          callback()
-        }
-      }
-  }
-
-
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.modal = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
-    })
-  }
-
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
- /* MODAL DATA-API
-  * ============== */
-
-  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this = $(this)
-      , href = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
-
-    e.preventDefault()
-
-    $target
-      .modal(option)
-      .one('hide', function () {
-        $this.focus()
-      })
-  })
-
-}(window.jQuery);

data/app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css

@@ -1,70 +0,0 @@
-/*!
- * Bootstrap Scroll Modal
- * Version: 1.2
- * Made for your convenience by @theericanderson
- * A variaton of but a small piece of the insanely awesome Twitter Bootstrap (http://twitter.github.com/bootstrap)
- */
-
-.modal-backdrop {
-  overflow-x: hidden;
-  overflow-y: auto;
-  background-color: rgba(0, 0, 0, 0.8);
-}
-.modal-backdrop.fade {
-  background-color: rgba(0, 0, 0, 0.0);
-}
-.modal-backdrop.fade.in {
-  background: rgba(0, 0, 0, 0.8);
-}
-.modal-backdrop.in, .modal-backdrop.fade.in {
-  opacity: 1.0;
-  filter: alpha(opacity=100);
-}
-.modal-wrapper {
-  position: relative;
-  top: 50px;
-  left: 50%;
-  z-index: 1050;
-  width: 560px;
-  margin-left: -280px;
-  margin-bottom: 100px;
-  overflow: visible;
-}
-.modal-wrapper .modal {
-  position: static;
-  margin: 0;
-  z-index: 1060;
-}
-/* Some different styling for dynamic height modals */
-.modal-wrapper .modal .modal-body {
-  overflow-y: visible;
-  max-height: none;
-  z-index: 1060; /* IE8 fix for radio button focus / blur issue */
-}
-
-/* Styles to ensure Scroll Modal works on smaller browsers, specifically mobile. */
-@media (max-width: 767px) {
-  .modal-wrapper {
-      position: relative;
-      top: 50px;
-      left: 20%;
-      z-index: 1050;
-      width: 70%;
-      margin-left: 0px;
-      margin-bottom: 80px;
-      overflow: visible;
-  }
-}
-
-@media (max-width : 480px) {
-  .modal-wrapper {
-      position: relative;
-      top: 50px;
-      left: 10%;
-      z-index: 1050;
-      width: 80%;
-      margin-left: 0px;
-      margin-bottom: 80px;
-      overflow: visible;
-  }
-}