Browse Source

navbar fixes

pull/1/head
Nicolae Claudius 11 years ago
parent
commit
b4f5305dd6
  1. 1
      app/assets/stylesheets/application.css.scss
  2. 2
      app/assets/stylesheets/theme/logo.css.scss
  3. 2
      app/assets/stylesheets/theme/navbar.css.scss
  4. 4
      app/views/shared/_navigation.html.erb
  5. 2
      app/views/shared/navigation/_public.html.erb

1
app/assets/stylesheets/application.css.scss

@ -13,6 +13,7 @@
$label_color: #555; // hack for as labels ... $label_color: #555; // hack for as labels ...
$carousel-indicator-border-color: #333; $carousel-indicator-border-color: #333;
$carousel-indicator-active-bg: #333; $carousel-indicator-active-bg: #333;
$grid-float-breakpoint: 992px;
@import "bootstrap"; @import "bootstrap";
@import "bootstrap/theme"; @import "bootstrap/theme";

2
app/assets/stylesheets/theme/logo.css.scss

@ -2,7 +2,7 @@
@import "compass/css3/box-shadow"; @import "compass/css3/box-shadow";
@import "compass/css3/text-shadow"; @import "compass/css3/text-shadow";
.navbar .navbar-brand { .navbar .logo {
color: #53d4ff; color: #53d4ff;
@include text-shadow( @include text-shadow(
0 1px 0 rgba(0, 0, 0, 0.6), 0 1px 0 rgba(0, 0, 0, 0.6),

2
app/assets/stylesheets/theme/navbar.css.scss

@ -1,4 +1,4 @@
.navbar-inverse .nav { .navbar-main .nav {
li.highlight a { li.highlight a {
color: darken(yellow, 10%); color: darken(yellow, 10%);
&:hover { &:hover {

4
app/views/shared/_navigation.html.erb

@ -1,4 +1,4 @@
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="navbar navbar-inverse navbar-fixed-top navbar-main" role="navigation">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
@ -7,7 +7,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<%= link_to('EntryDNS', root_path, class: 'navbar-brand') %> <%= link_to('EntryDNS', root_path, class: 'navbar-brand logo') %>
</div> </div>
<div class="collapse navbar-collapse navbar-main-collapse"> <div class="collapse navbar-collapse navbar-main-collapse">

2
app/views/shared/navigation/_public.html.erb

@ -13,7 +13,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% semantic_navigation :session_nav, html: { class: 'nav navbar-nav pull-right' } do |n| %> <% semantic_navigation :session_nav, html: { class: 'nav navbar-nav navbar-right' } do |n| %>
<%= n.item '', link: Settings.news_link, <%= n.item '', link: Settings.news_link,
html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %> html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %>
<i class="glyphicon glyphicon-share-alt"></i> News <i class="glyphicon glyphicon-share-alt"></i> News

Loading…
Cancel
Save