From 8efa208d4f79cf015592d1f4b8babac6a19eeded Mon Sep 17 00:00:00 2001 From: Artur Babagulyyev Date: Mon, 29 May 2017 18:07:43 +0300 Subject: [PATCH 1/5] comment broken code --- source/css/_base.sass | 2 +- source/css/jquery-sortable.css.sass | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/source/css/_base.sass b/source/css/_base.sass index 267db43..27882df 100644 --- a/source/css/_base.sass +++ b/source/css/_base.sass @@ -1 +1 @@ -@import bootstrap +// @import bootstrap diff --git a/source/css/jquery-sortable.css.sass b/source/css/jquery-sortable.css.sass index 655ab43..3e8335a 100644 --- a/source/css/jquery-sortable.css.sass +++ b/source/css/jquery-sortable.css.sass @@ -15,8 +15,6 @@ ol.vertical margin: 5px padding: 5px border: 1px solid #CCC - color: $linkColor - background: $grayLighter li.placeholder position: relative margin: 0 @@ -31,5 +29,4 @@ ol.vertical left: -5px top: -4px border: 5px solid transparent - border-left-color: $error border-right: none From 9b196ddbd65068f5de0b5790d57041689949d841 Mon Sep 17 00:00:00 2001 From: Artur Babagulyyev Date: Mon, 29 May 2017 18:17:38 +0300 Subject: [PATCH 2/5] increment version --- VERSION | 2 +- bower.json | 2 +- package.json | 2 +- sortable.jquery.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 62ea259..6d44d22 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.13 +0.9.14 diff --git a/bower.json b/bower.json index 5c77614..38915fb 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery-sortable", - "version": "0.9.13", + "version": "0.9.14", "homepage": "http://johnny.github.io/jquery-sortable/", "authors": [ "Jonas von Andrian" diff --git a/package.json b/package.json index d9435dd..7b7ea52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jquery-sortable", - "version": "0.9.13", + "version": "0.9.14", "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..55ebf7a 100644 --- a/sortable.jquery.json +++ b/sortable.jquery.json @@ -9,7 +9,7 @@ "drag", "drop" ], - "version": "0.9.13", + "version": "0.9.14", "author": { "name": "Jonas von Andrian" }, From f6ad1b05e8dbeae86c84f941312b5363a91271e3 Mon Sep 17 00:00:00 2001 From: Artur Babagulyyev Date: Mon, 29 May 2017 18:29:53 +0300 Subject: [PATCH 3/5] comment varibales --- source/css/application.css.sass | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/source/css/application.css.sass b/source/css/application.css.sass index 5f0c9b5..5c90bde 100644 --- a/source/css/application.css.sass +++ b/source/css/application.css.sass @@ -33,24 +33,14 @@ ol list-style-type: none i.icon-move cursor: pointer - 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 &.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 From 7de05f89d115a171d9aca634e6ea15fd102ea2de Mon Sep 17 00:00:00 2001 From: Artur Babagulyyev Date: Mon, 29 May 2017 18:31:43 +0300 Subject: [PATCH 4/5] change version --- VERSION | 2 +- bower.json | 2 +- package.json | 2 +- sortable.jquery.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 6d44d22..f806549 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.14 +0.9.16 diff --git a/bower.json b/bower.json index 38915fb..34425dd 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery-sortable", - "version": "0.9.14", + "version": "0.9.16", "homepage": "http://johnny.github.io/jquery-sortable/", "authors": [ "Jonas von Andrian" diff --git a/package.json b/package.json index 7b7ea52..e7868c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jquery-sortable", - "version": "0.9.14", + "version": "0.9.16", "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 55ebf7a..9a1bd89 100644 --- a/sortable.jquery.json +++ b/sortable.jquery.json @@ -9,7 +9,7 @@ "drag", "drop" ], - "version": "0.9.14", + "version": "0.9.16", "author": { "name": "Jonas von Andrian" }, From c3e39699ff6e5e74f9def0948161b49a9ed86090 Mon Sep 17 00:00:00 2001 From: Artur Babagulyyev Date: Mon, 29 May 2017 18:42:42 +0300 Subject: [PATCH 5/5] fix bootstrap references --- VERSION | 2 +- bower.json | 2 +- package.json | 2 +- sortable.jquery.json | 2 +- source/css/_base.sass | 4 ++++ source/css/application.css.sass | 8 ++++++++ source/css/jquery-sortable.css.sass | 3 +++ source/js/application.js | 12 ++++++------ 8 files changed, 25 insertions(+), 10 deletions(-) diff --git a/VERSION b/VERSION index f806549..4148992 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.16 +0.9.17 diff --git a/bower.json b/bower.json index 34425dd..d325d4a 100644 --- 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 index e7868c5..164e015 100644 --- 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 index 9a1bd89..d4c224a 100644 --- 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 index 27882df..5f8f4dd 100644 --- 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 index 5c90bde..b5a2075 100644 --- 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 index 3e8335a..655ab43 100644 --- 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 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/"