Skip to content

Commit

Permalink
Fixing component dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
hunvreus committed Feb 7, 2013
1 parent 8678209 commit fe650d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 35 deletions.
6 changes: 3 additions & 3 deletions assets.css
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,6 @@ table {
}


.sticked {
position: fixed !important;
}

/* GENERAL */
html,
Expand Down Expand Up @@ -493,6 +490,9 @@ code {
#sidebar input {
background: #111;
border: 0;
border-radius: 2px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 5px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 5px rgba(0, 0, 0, 0.2);
Expand Down
31 changes: 0 additions & 31 deletions assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -9611,31 +9611,6 @@ if ( typeof define === "function" && define.amd && define.amd.jQuery ) {

})( window );

});
require.register("sticky/index.js", function(exports, require, module){
// Dependencies
var $ = require('jquery');

// Expose `Sticky`.
module.exports = Sticky;

/**
* Initialize a `Sticky` element.
*/
function Sticky(el) {
this.el = el;
this.limit = $(this.el).offset().top;
var self = this;
$(window).scroll(function(e) {
if ($(window).scrollTop() > self.limit) {
$(self.el).addClass('sticked');
}
else {
$(self.el).removeClass('sticked');
}
});
return this;
}
});
require.register("filter/index.js", function(exports, require, module){
// Dependencies
Expand Down Expand Up @@ -9736,19 +9711,13 @@ hide.click(function () {
});
$('#content').prepend(hide);

// Making our navigation sticky
new Sticky($('#sidebar'));

// Making our navigation sticky
new Filter($('#sidebar > ul'));
});
require.alias("boot/index.js", "carte/deps/boot/index.js");

require.alias("component-jquery/index.js", "boot/deps/jquery/index.js");

require.alias("sticky/index.js", "boot/deps/sticky/index.js");
require.alias("component-jquery/index.js", "sticky/deps/jquery/index.js");

require.alias("filter/index.js", "boot/deps/filter/index.js");
require.alias("component-jquery/index.js", "filter/deps/jquery/index.js");

2 changes: 1 addition & 1 deletion lib/boot/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"necolas/normalize.css": "*",
"component/jquery": "*"
},
"local": ["sticky", "filter"],
"local": ["filter"],
"scripts": ["index.js"],
"styles": ["style.css"]
}

0 comments on commit fe650d8

Please sign in to comment.