Skip to content

Commit

Permalink
Layout/CSS boilerplate
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielfone
danielfone committed Oct 19, 2013
1 parent c889990 commit fd4055e
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 63 deletions.
28 changes: 27 additions & 1 deletion app/assets/stylesheets/bootstrap_and_overrides.css
View file
Expand Up @@ -4,4 +4,30 @@
Use Font Awesome icons (default)
To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
=require twitter-bootstrap-static/fontawesome
*/
*/

dt, dd {
line-height: 28px;
min-height: 28px;
}

code {
color: #555;
}

.multi-select {
top: -25px;
position: relative;
}

.multi-select label {
float: left;
margin-left: 0.5em;
}

.multi-select input {
display: block;
float: left;
clear: left;
}

76 changes: 14 additions & 62 deletions app/views/layouts/application.html.erb
View file
Expand Up @@ -14,73 +14,25 @@

<%= stylesheet_link_tag "application", :media => "all" %>
<!-- For third-generation iPad with high-resolution Retina display: -->
<!-- Size should be 144 x 144 pixels -->
<%= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>

<!-- For iPhone with high-resolution Retina display: -->
<!-- Size should be 114 x 114 pixels -->
<%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>

<!-- For first- and second-generation iPad: -->
<!-- Size should be 72 x 72 pixels -->
<%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>

<!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
<!-- Size should be 57 x 57 pixels -->
<%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>

<!-- For all other devices -->
<!-- Size should be 32 x 32 pixels -->
<%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
<%= javascript_include_tag "application" %>
</head>
<body>

<div class="navbar navbar-fluid-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">ReimburserWizard</a>
<div class="container-fluid nav-collapse">
<ul class="nav">
<li><%= link_to "Link1", "/path1" %></li>
<li><%= link_to "Link2", "/path2" %></li>
<li><%= link_to "Link3", "/path3" %></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
</div>

<div class="container-fluid">
<div class="row-fluid">
<div class="span3">
<div class="well sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header">Sidebar</li>
<li><%= link_to "Link1", "/path1" %></li>
<li><%= link_to "Link2", "/path2" %></li>
<li><%= link_to "Link3", "/path3" %></li>
</ul>
</div><!--/.well -->
</div><!--/span-->
<div class="span9">
<%= bootstrap_flash %>
<%= yield %>
</div>
</div><!--/row-->
<%= nav_bar brand: 'ReimburserWizard', responsive: true do %>
<%= menu_group do %>
<%= menu_item 'Reimbursements', reimbursements_path %>
<%= menu_item 'Employees', employees_path %>
<% end %>
<%- end -%>

<footer>
<p>&copy; Company 2013</p>
</footer>

</div> <!-- /container -->
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<%= bootstrap_flash %>
<%= yield %>
</div>
</div><!--/row-->
</div> <!-- /container -->

</body>
</html>

0 comments on commit fd4055e

Please sign in to comment.