Commit d7f2c389 authored by Phil Höfer's avatar Phil Höfer
Browse files

header changes

parent a5baff5a
......@@ -4124,7 +4124,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar {
position: relative;
min-height: 50px;
min-height: 40px;
margin-bottom: 20px;
border: 1px solid transparent;
}
......@@ -4230,10 +4230,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar-brand {
float: left;
padding: 15px 15px;
padding: 10px 15px;
font-size: 18px;
line-height: 20px;
height: 50px;
height: 40px;
}
.navbar-brand:hover,
.navbar-brand:focus {
......@@ -4253,8 +4253,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: right;
margin-right: 15px;
padding: 9px 10px;
margin-top: 8px;
margin-bottom: 8px;
margin-top: 3px;
margin-bottom: 3px;
background-color: transparent;
background-image: none;
border: 1px solid transparent;
......@@ -4278,7 +4278,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-nav {
margin: 7.5px -15px;
margin: 5px -15px;
}
.navbar-nav > li > a {
padding-top: 10px;
......@@ -4316,8 +4316,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: left;
}
.navbar-nav > li > a {
padding-top: 15px;
padding-bottom: 15px;
padding-top: 10px;
padding-bottom: 10px;
}
}
.navbar-form {
......@@ -4327,8 +4327,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
margin-top: 8px;
margin-bottom: 8px;
margin-top: 3px;
margin-bottom: 3px;
}
@media (min-width: 768px) {
.navbar-form .form-group {
......@@ -4412,20 +4412,20 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-bottom-left-radius: 0;
}
.navbar-btn {
margin-top: 8px;
margin-bottom: 8px;
margin-top: 3px;
margin-bottom: 3px;
}
.navbar-btn.btn-sm {
margin-top: 10px;
margin-bottom: 10px;
margin-top: 5px;
margin-bottom: 5px;
}
.navbar-btn.btn-xs {
margin-top: 14px;
margin-bottom: 14px;
margin-top: 9px;
margin-bottom: 9px;
}
.navbar-text {
margin-top: 15px;
margin-bottom: 15px;
margin-top: 10px;
margin-bottom: 10px;
}
@media (min-width: 768px) {
.navbar-text {
......@@ -7286,7 +7286,7 @@ nav .input-group {
padding-left: 15px;
padding-right: 15px;
}
#research nav ul li + li + li {
#research nav ul li + li {
width: 80%;
}
#research {
......
This diff is collapsed.
......@@ -99,7 +99,7 @@ nav .input-group {
padding-right: 15px;
}
#research nav ul li + li + li {
#research nav ul li + li {
width: 80%;
}
......
......@@ -16,4 +16,5 @@
@link-hover-decoration: underline;
@font-size-base: 14px;
\ No newline at end of file
@font-size-base: 14px;
@navbar-height: 40px;
\ No newline at end of file
......@@ -12,12 +12,9 @@
<header id="research">
<nav class="navbar navbar-default">
<ul class="list-inline">
<li class="hidden-xs hidden-sm pull-left">
<div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MetaGer</h1></a>
</div>
</li>
<li class="visible-xs visible-sm pull-left">
<div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MG</h1></a>
<li class="pull-left">
<div class="logo">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
</div>
</li>
<li class="pull-right">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment