021cc99492
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2 from the bootstrap-sass gem. I had to modify layouts/application to get the stream page to render properly, looks like a slight conflict between Bootstrap and Blueprint grid systems, with .span-24 instead of .row I was seeing the whole right bar dropped to the bottom of the page below the left bar. I also modified two other templates since Bootstrap 2.0.2 includes a "badge" class that was making our navbar badges look funny. :)
43 lines
1.2 KiB
JavaScript
43 lines
1.2 KiB
JavaScript
/* Copyright (c) 2010-2011, Diaspora Inc. This file is
|
|
* licensed under the Affero General Public License version 3 or later. See
|
|
* the COPYRIGHT file.
|
|
*/
|
|
//= require underscore
|
|
//= require backbone
|
|
//= require rails.validations
|
|
//= require jquery.hotkeys
|
|
//= require jquery.remotipart
|
|
//= require jquery.autoresize
|
|
//= require jquery-ui-1.8.9.custom.min
|
|
//= require jquery.charcount
|
|
//= require jquery.placeholder
|
|
//= require timeago
|
|
//= require facebox
|
|
//= require jquery.events.input
|
|
//= require jquery.elastic
|
|
//= require jquery.mentionsInput
|
|
//= require jquery.idle-timer
|
|
//= require jquery.infinitescroll-custom
|
|
//= require jquery.autocomplete-custom
|
|
//= require keycodes
|
|
//= require fileuploader-custom
|
|
//= require handlebars-1.0.0.beta.6
|
|
//= require markdown
|
|
//= require punycode
|
|
//= require parse_url
|
|
//= require clear-form
|
|
//= require validation
|
|
//= require app/app
|
|
//= require diaspora
|
|
//= require_tree ./helpers
|
|
//= require_tree ./pages
|
|
//= require_tree ./widgets
|
|
//= require view
|
|
//= require aspects-dropdown
|
|
//= require contact-edit
|
|
//= require contact-list
|
|
//= require aspect-sorting
|
|
//= require mentions
|
|
//= require bootstrap-tooltip
|
|
//= require bootstrap-popover
|
|
//= require bootstrap-dropdown
|