Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Andres Keskküla 2015-01-08 11:51:16 +02:00
commit 0a9daae72f
2 changed files with 23 additions and 1 deletions

View file

@ -5,3 +5,14 @@
.edit-highlight {
background-color: #E7E7E7;
}
.navbar-brand {
line-height:12px;
padding-top:20px;
padding-bottom:5px;
}
.navbar-brand small {
display:block;
font-size:10px;
}

View file

@ -20,7 +20,18 @@
%span.icon-bar
%span.icon-bar
%span.icon-bar
= link_to APP_CONFIG['app_name'], root_path, class: 'navbar-brand'
= link_to root_path, class: 'navbar-brand' do
= APP_CONFIG['app_name']
- if request.host == 'registry.gitlab.eu'
.text-center
%small{style: 'color: #0074B3;'} GITLAB STAGING
- elsif Rails.env.development?
.text-center
%small{style: 'color: #D10000;'}= Rails.env.upcase
- elsif Rails.env.staging?
.text-center
%small{style: 'color: #0074B3;'}= Rails.env.upcase
.navbar-collapse.collapse
%ul.nav.navbar-nav
%li= link_to t('domains'), admin_domains_path