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/application.css.sass b/source/css/application.css.sass index 5f0c9b5..be91148 100644 --- a/source/css/application.css.sass +++ b/source/css/application.css.sass @@ -34,22 +34,22 @@ ol i.icon-move cursor: pointer li.highlight - background: $grayDark - color: $grayLight + background: #333 + color: #777 i.icon-move - background-image: url($iconWhiteSpritePath) + background-image: url('') ol.nested_with_switch, ol.nested_with_switch ol - border: 1px solid $grayLighter + border: 1px solid #eee &.active - border: 1px solid $grayDark + border: 1px solid #333 ol.nested_with_switch, ol.simple_with_animation, ol.serialization, ol.default li cursor: pointer ol.simple_with_animation - border: 1px solid $grayLight + border: 1px solid #777 .switch-container display: block diff --git a/source/css/jquery-sortable.css.sass b/source/css/jquery-sortable.css.sass index 655ab43..5ea09f8 100644 --- a/source/css/jquery-sortable.css.sass +++ b/source/css/jquery-sortable.css.sass @@ -15,8 +15,8 @@ ol.vertical margin: 5px padding: 5px border: 1px solid #CCC - color: $linkColor - background: $grayLighter + color: #eee + background: #eee li.placeholder position: relative margin: 0 diff --git a/source/js/application.js b/source/js/application.js index c569157..11e7436 100644 --- a/source/js/application.js +++ b/source/js/application.js @@ -1,17 +1,17 @@ -//= 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 "./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/" $(function () { if(!/test/.test(window.location.pathname)) - $('body').scrollspy(); + $('body').scrollspy() $('.show-code').on('click', function () { - $(this).closest('.row').children('.example').slideToggle(); - }); - $('ol.default').sortable(); -}); + $(this).closest('.row').children('.example').slideToggle() + }) + $('ol.default').sortable() +})