Commit dec8c844 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

Final revision from HK. January 16th 2014.

parent 20d379c1
......@@ -57,8 +57,7 @@ body {
background-color:#eeebe8;
font-family: 'colfaxRegular', Arial, sans-serif;
font-size: 16px;
line-height: 1.6;
min-height: 2000px;
line-height: 1.6;
padding-top: 70px;
}
......@@ -101,6 +100,15 @@ h2, .h2 {
}
.uninett-author-results {
font-family: 'colfaxRegular', Helvetica, Arial, sans-serif;
font-size: 12px;
color: #999;
margin-top: 10px;
margin-bottom: 10px;
}
a {
color: #005c9e;
......@@ -128,7 +136,7 @@ i, em {
input[type="search"] {
-webkit-appearance: none;
border-radius: 0 3px 3px 0;
border-radius: 3px;
}
......@@ -161,6 +169,7 @@ input[type="search"] {
.navbar-nav {
margin-top: 17px;
float: none;
}
......@@ -178,6 +187,41 @@ input[type="search"] {
}
.navbar-nav .uninett-search {
float:right;
}
.navbar-nav .uninett-login {
float:right;
z-index: 100;
}
.navbar-header:after {
clear: none !important;
}
.uninett-menu-search {
margin-top: 6px;
}
.navbar-form-uninett {
margin-left: 0px;
margin-right: 0px;
padding: 0px;
border-top: 0px solid transparent;
border-bottom: 0px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);
margin-top: 0px;
margin-bottom: 0px;
}
.navbar-default .navbar-nav > li > a {
color: #666464;
}
......@@ -255,6 +299,9 @@ input[type="search"] {
border-bottom-color: #eb212e;
}
.dropdown-menu>.active>a, .dropdown-menu>.active>a:hover, .dropdown-menu>.active>a:focus {
background-color: #eb212e;
}
.jumbotron {
......@@ -338,11 +385,19 @@ input[type="search"] {
background-color: #eb212e;
}
.uninett-color-orange {
background-color: #f3823e;
}
.uninett-fontColor-black {
color: #231f20;
}
.uninett-fontColor-grey {
color: #a0a0a0;
}
.uninett-fontColor-white {
color: #ffffff;
}
......@@ -353,7 +408,7 @@ input[type="search"] {
.uninett-pattern1 {
background-image:url(../images/uninett_stuktur1.jpg);
background-image:url(../images/uninett_struktur1.jpg);
}
......@@ -478,20 +533,17 @@ input[type="search"] {
}
.glyphicon_search_menu {
top: 12px;
margin-left: 20px;
top: 14px;
margin-left: -27px;
font-size: 18px;
}
.breadcrumb {
opacity: 0.5;
border-radius: 0px;
font-family: 'colfaxRegularItalic', Arial, sans-serif;
font-size: 12px;
padding: 4px 11px;
margin-bottom: 16px;
background-color: #f5f5f5;
......@@ -597,13 +649,21 @@ input[type="search"] {
}
.footer-uninett {
margin: 0 auto;
width: 150px;
margin: 0 auto 1em auto;
float: right;
right: 50%;
position: relative;
}
.footer-content-uninett {
float: right;
right: -50%;
position: relative;
}
.footer-logo {
float:left;
padding: 5px;
......@@ -612,7 +672,8 @@ input[type="search"] {
.footer-logo img {
max-height: 20px;
width: 0.9em;
height: 1.2em;
}
......@@ -642,12 +703,40 @@ input[type="search"] {
.uninett-login-btn {
margin-right: 10px;
margin-right: 0px;
margin-top: 6px;
margin-left: 14px;
}
.modal-login-footer {
margin-top: 15px;
padding: 19px 20px 20px;
text-align: center;
border-top: 0px solid #fff;
}
.modal-login-title {
text-align: center;
font-size: 30px;
}
.modal-login-header {
padding: 15px;
border-bottom: 0px solid #fff;
}
dt {
font-family: "colfaxMedium", Helvetica, Arial, sans-serif;
font-weight: normal;
}
@media (min-width: 768px) {
.navbar > .container .navbar-brand {
margin-left: -14px;
......@@ -664,6 +753,12 @@ input[type="search"] {
margin-top: 16px;
}
.uninett-login-btn {
margin-right: 0px;
margin-left: 16px;
}
.navbar > .container .navbar-brand {
margin-left: -13px;
......@@ -684,20 +779,16 @@ input[type="search"] {
}
.navbar img {
max-width: 100%;
.navbar-toggle {
margin-top: 15px;
}
.department {
font-family: 'colfaxRegular', Arial, sans-serif;
font-size: 22px;
float: left;
padding-right: 20px;
padding-top: 15px;
.navbar img {
max-width: 100%;
}
.navbar-nav > li > a {
......@@ -710,11 +801,32 @@ input[type="search"] {
}
.navbar-nav .uninett-search {
float:none;
height: 60px;
}
.uninett-menu-search {
margin-left: 13px;
margin-top: 6px;
}
.glyphicon_search_menu {
top: 8px;
margin-left: 18px;
top: 12px;
margin-left: -24px;
font-size: 16px;
}
.department {
font-family: 'colfaxRegular', Arial, sans-serif;
font-size: 22px;
float: left;
padding-right: 20px;
padding-top: 15px;
}
......@@ -739,7 +851,7 @@ input[type="search"] {
}
.navbar-nav {
margin-bottom: 36px;
margin-bottom: 30px;
}
......@@ -756,6 +868,13 @@ input[type="search"] {
}
.navbar-nav .uninett-search {
float:none;
height: 60px;
}
.department {
font-family: 'colfaxLight', Arial, sans-serif;
font-size: 18px;
......@@ -765,6 +884,10 @@ input[type="search"] {
}
.navbar-default .navbar-nav .open .dropdown-menu>.active>a, .navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover, .navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus {
background-color: #eb212e;
color: #fff;
}
.container > .navbar-header, .container > .navbar-collapse {
......@@ -840,22 +963,29 @@ input[type="search"] {
}
.uninett-author-results {
font-size: 10px;
margin-top: 10px;
margin-bottom: 10px;
}
.uninett-menu-search {
margin-left: 20px;
margin-top: 10px;
width: 87%;
width: 50%;
}
.glyphicon_search_menu {
top: 17px;
top: 13px;
margin-left: -29px;
font-size: 18px;
}
.uninett-login-btn {
margin-right: 0px;
margin-right: 20px;
margin-left: 20px;
}
......
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