Merge remote-tracking branch 'remotes/origin/bootstrap3'
Conflicts: app/views/packages/index.html.erb
This commit is contained in:
commit
0277a4e3d0
7 changed files with 61 additions and 35 deletions
|
|
@ -14,4 +14,5 @@
|
|||
//= require jquery_ujs
|
||||
//= require fancybox
|
||||
//= require turbolinks
|
||||
//= require twitter/bootstrap
|
||||
//= require_tree .
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
/*
|
||||
* This is a manifest file that'll be compiled into application.css, which will include all the files
|
||||
* listed below.
|
||||
*
|
||||
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
|
||||
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
|
||||
*
|
||||
* You're free to add application-wide styles to this file and they'll appear at the top of the
|
||||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
*= require_tree .
|
||||
*= require fancybox
|
||||
*/
|
||||
|
||||
//= require bootstrap
|
||||
|
|
@ -1,2 +1,16 @@
|
|||
@import 'bootstrap';
|
||||
@import 'bootstrap-responsive';
|
||||
/*
|
||||
* This is a manifest file that'll be compiled into application.css, which will include all the files
|
||||
* listed below.
|
||||
*
|
||||
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
|
||||
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
|
||||
*
|
||||
* You're free to add application-wide styles to this file and they'll appear at the top of the
|
||||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
*= require_tree .
|
||||
*= require fancybox
|
||||
*/
|
||||
|
||||
@import "twitter/bootstrap";
|
||||
|
|
|
|||
|
|
@ -24,6 +24,28 @@ foo
|
|||
<!-- Show only packages with screenshots -->
|
||||
<!--</label>-->
|
||||
</div>
|
||||
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#"><i class="icon-align-left"></i></a>
|
||||
<a class="btn" href="#"><i class="icon-align-center"></i></a>
|
||||
<a class="btn" href="#"><i class="icon-align-right"></i></a>
|
||||
<a class="btn" href="#"><i class="icon-align-justify"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="btn-group" data-toggle="buttons">
|
||||
<label class="btn btn-primary">
|
||||
<input type="radio" name="options" id="option1"> Option 1
|
||||
</label>
|
||||
<label class="btn btn-primary">
|
||||
<input type="radio" name="options" id="option2"> Option 2
|
||||
</label>
|
||||
<label class="btn btn-primary">
|
||||
<input type="radio" name="options" id="option3"> Option 3
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
|
||||
<%= render "packages_search_results", object: @packages %>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue