sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

FogBugz #123: Umstellen auf Bootstrap.

Browse source
This commit is contained in:
Roland Jesse 2012-04-28 00:12:19 +02:00
parent dbfce111b8
commit 66f2b23962
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/application.css.scss
View file

@ -1,6 +1,6 @@
@import "bourbon";
//@import "bourbon";
@import "layout";
@import "big_form";
//@import "big_form";
@import "bootstrap_and_overrides";
// Gray background for page content

7
app/assets/stylesheets/bootstrap_and_overrides.css.scss vendored
View file

@ -1,6 +1,11 @@
// Set the correct sprite paths
$iconSpritePath: image-path('glyphicons-halflings.png');
$iconWhiteSpritePath: image-path('glyphicons-halflings-white.png');
// We don't want no black header, please.
$navbarBackground: #f0f0f0;
$navbarBackgroundHighlight: lighten($navbarBackground, 10%);
@import "bootstrap";
body { padding-top: 60px; }
body { padding-top: 50px; }
@import "bootstrap-responsive";

2
app/assets/stylesheets/layout.css
View file

@ -103,7 +103,7 @@ h2 {
.logo_contact, .logo_o-rama {
font-weight: bold;
font-size: 150%;
/* font-size: 125%; */
}
.logo_contact {
color: #ed8200; /* orange */

11
app/views/layouts/_navigation.html.erb
View file

@ -1,12 +1,13 @@
<span class="logo_contact">Contact</span><span class="logo_o-rama">-o-Rama</span>
<a href="#" class="brand"><span class="logo_contact">Contact</span><span class="logo_o-rama">-o-Rama</span></a>
<ul class="nav">
<li><%= link_to 'Home', root_path %></li>
<li><%= link_to 'A..Z', contacts_path %></li>
<li><%= link_to 'Birthdays', birthdays_path %></li>
<li><%= link_to 'New', new_contact_path %></li>
<li class="active"><%= link_to 'A..Z', contacts_path %></li>
<li class=""><%= link_to 'Birthdays', birthdays_path %></li>
<li class=""><%= link_to 'New', new_contact_path %></li>
<li class="divider-vertical"></li>
<% if user_signed_in? %>
<li><%= link_to '(|)', destroy_user_session_path, :method => 'delete' %></li>
<% else %>
<li><%= link_to('Login', new_user_session_path) %></li>
<% end %>
<li class="divider-vertical"></li>
</ul>