Skip to content

Commit

Permalink
added some jquery goodness to the asset packager.
Browse files Browse the repository at this point in the history
  • Loading branch information
agnellvj committed Jun 28, 2010
1 parent 10261c2 commit 7155ded
Show file tree
Hide file tree
Showing 5 changed files with 677 additions and 23 deletions.
7 changes: 0 additions & 7 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,7 @@
%meta{:name => "description", :content => "UTF-8" }
= stylesheet_link_merged(:base)
= javascript_include_merged(:base)
= stylesheet_link_tag 'screen.css'
= javascript_include_tag 'jquery'
:erb
<script src="http://www.google.com/jsapi?key=ABQIAAAAwMGM5ffHbRkfompsxZzyhBRAq9ByDnCnKGDAy21ra59LiMlHbxTOAAdR4Lm-nIzv41bqQyq7HeRtzg" type="text/javascript"></script>
:javascript
google.load("jquery", "1.4.2");
google.load("jqueryui", "1.8.2");
%body
#wrapper
#top_nav
Expand Down
3 changes: 3 additions & 0 deletions config/asset_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ javascripts:
- jquery
- application
- jquery.treeview
- jquery-ui-1.8.custom
stylesheets:
- base:
- jquery.treeview
- screen
- jquery-ui
6 changes: 0 additions & 6 deletions public/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
// This file is automatically included by javascript_include_tag :defaults
$(document).ready(function(){

$("#navigation").treeview({
persist: "location",
collapsed: true,
unique: true
});

$("#browser").treeview({
collapsed: true
});
Expand Down
668 changes: 666 additions & 2 deletions public/javascripts/base_packaged.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions public/stylesheets/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* In this file you should write your main styles. (or centralize your imports)
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
/* line 14, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 14, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
Expand All @@ -22,42 +22,42 @@ table, caption, tbody, tfoot, thead, tr, th, td {
vertical-align: baseline;
}

/* line 17, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 17, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
body {
line-height: 1;
color: black;
background: white;
}

/* line 19, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 19, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
ol, ul {
list-style: none;
}

/* line 21, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 21, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
table {
border-collapse: separate;
border-spacing: 0;
vertical-align: middle;
}

/* line 23, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 23, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
caption, th, td {
text-align: left;
font-weight: normal;
vertical-align: middle;
}

/* line 25, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 25, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q, blockquote {
quotes: "" "";
}
/* line 96, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 96, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after {
content: "";
}

/* line 27, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
/* line 27, ../../../../.rvm/gems/ruby-1.8.7-p248@compare_standards/gems/compass-0.10.2/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
a img {
border: none;
}
Expand Down

0 comments on commit 7155ded

Please sign in to comment.