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
|
|
@ -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