diff --git a/VERSION b/VERSION index 62ea259..4148992 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.13 +0.9.17 diff --git a/bower.json b/bower.json index 5c77614..d325d4a 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery-sortable", - "version": "0.9.13", + "version": "0.9.17", "homepage": "http://johnny.github.io/jquery-sortable/", "authors": [ "Jonas von Andrian" diff --git a/package.json b/package.json index d9435dd..164e015 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jquery-sortable", - "version": "0.9.13", + "version": "0.9.17", "description": "jquery plugin for sortable, nestable lists", "main": "./source/js/jquery-sortable.js", "scripts": { diff --git a/sortable.jquery.json b/sortable.jquery.json index 425ac93..d4c224a 100644 --- a/sortable.jquery.json +++ b/sortable.jquery.json @@ -9,7 +9,7 @@ "drag", "drop" ], - "version": "0.9.13", + "version": "0.9.17", "author": { "name": "Jonas von Andrian" }, diff --git a/source/css/_base.sass b/source/css/_base.sass index 267db43..5f8f4dd 100644 --- a/source/css/_base.sass +++ b/source/css/_base.sass @@ -1 +1,5 @@ -@import bootstrap +// @import bootstrap +$linkColor: blue +$grayLighter: gray +$grayLight: gray +$grayDark: gray diff --git a/source/css/application.css.sass b/source/css/application.css.sass index 5f0c9b5..b5a2075 100644 --- a/source/css/application.css.sass +++ b/source/css/application.css.sass @@ -36,8 +36,6 @@ ol li.highlight background: $grayDark color: $grayLight - i.icon-move - background-image: url($iconWhiteSpritePath) ol.nested_with_switch, ol.nested_with_switch ol border: 1px solid $grayLighter diff --git a/source/js/application.js b/source/js/application.js index c569157..cf6d17f 100644 --- a/source/js/application.js +++ b/source/js/application.js @@ -1,9 +1,9 @@ -//= require "vendor/jquery" -//= require "vendor/jquery.color" -//= require "vendor/bootstrap-switch" -//= require "vendor/bootstrap-scrollspy" -//= require "vendor/bootstrap-dropdown" -//= require "vendor/bootstrap-button" +//= require "./vendor/jquery" +//= require "./vendor/jquery.color" +//= require "./vendor/bootstrap-switch" +//= require "./vendor/bootstrap-scrollspy" +//= require "./vendor/bootstrap-dropdown" +//= require "./vendor/bootstrap-button" //= require "jquery-sortable" //= require_directory "./examples/"