fix bootstrap references

Artur Babagulyyev · Artur Babagulyyev · commit c3e39699ff6e · 2017-05-29T18:42:42.000+03:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.16
+0.9.17
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-sortable",
-  "version": "0.9.16",
+  "version": "0.9.17",
   "homepage": "http://johnny.github.io/jquery-sortable/",
   "authors": [
     "Jonas von Andrian"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-sortable",
-  "version": "0.9.16",
+  "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
@@ -9,7 +9,7 @@
     "drag",
     "drop"
   ],
-  "version": "0.9.16",
+  "version": "0.9.17",
   "author": {
     "name": "Jonas von Andrian"
   },
diff --git a/source/css/_base.sass b/source/css/_base.sass
@@ -1 +1,5 @@
 // @import bootstrap
+$linkColor: blue
+$grayLighter: gray
+$grayLight: gray
+$grayDark: gray
diff --git a/source/css/application.css.sass b/source/css/application.css.sass
@@ -33,14 +33,22 @@ ol
   list-style-type: none
   i.icon-move
     cursor: pointer
+  li.highlight
+    background: $grayDark
+    color: $grayLight
 
 ol.nested_with_switch, ol.nested_with_switch ol
+  border: 1px solid $grayLighter
   &.active
+    border: 1px solid $grayDark
 
 ol.nested_with_switch, ol.simple_with_animation, ol.serialization, ol.default
   li
     cursor: pointer
 
+ol.simple_with_animation
+  border: 1px solid $grayLight
+
 .switch-container
   display: block
   margin-left: auto
diff --git a/source/css/jquery-sortable.css.sass b/source/css/jquery-sortable.css.sass
@@ -15,6 +15,8 @@ ol.vertical
     margin: 5px
     padding: 5px
     border: 1px solid #CCC
+    color: $linkColor
+    background: $grayLighter
   li.placeholder
     position: relative
     margin: 0
@@ -29,4 +31,5 @@ ol.vertical
       left: -5px
       top: -4px
       border: 5px solid transparent
+      border-left-color: $error
       border-right: none
diff --git 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/"
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jquery-sortable",`
`3`		`- "version": "0.9.16",`
	`3`	`+ "version": "0.9.17",`
`4`	`4`	`"homepage": "http://johnny.github.io/jquery-sortable/",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Jonas von Andrian"`