Commit dc9452d6 authored by Pat Kira's avatar Pat Kira
Browse files

Bug 1644646 - Moved search box on default theme

- Move seach box to next user navigation like other themes

  - Remove duplicated search box on default theme for desktop view
  - Remove styles associated with extra search box

Change-Id: I3ecf8c33dcfff6a54d68d56a11084b0ce218ac29
behatnotneeded: styling only
parent 10dc92d0
.header {
.navbar-toggle {
margin-top: 15px;
@include gradient-vertical($start-color: #FFFFFF, $end-color: #ececec, $start-percent: 10%, $end-percent: 100%);
border-color: #dddddd;
color: #676767;
......@@ -17,4 +15,4 @@
margin-top: 0;
}
}
}
\ No newline at end of file
}
......@@ -6,9 +6,6 @@
top: 0;
.logo-area {
margin-top: 10px;
margin-bottom: 10px;
.logo {
@media (max-width: $screen-xs-min) {
width: 23px;
......
......@@ -3,11 +3,6 @@
min-height: auto;
}
.navbar.header {
padding: 0;
border-bottom: 0;
}
.navbar-fixed-top {
position:relative;
border: 0;
......@@ -17,27 +12,6 @@
}
}
.navbar-form {
clear: right;
margin-top: 0;
border: 0;
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min - 1) {
clear: none;
margin-top: 7px;
}
@media (max-width: $screen-sm-min - 1) {
width:100%;
margin:0;
padding: 10px 0;
.container > & {
margin: 0 auto;
}
}
}
.navbar-inverse {
background-color: transparent;
......@@ -92,36 +66,3 @@
color: $theme-primary-color;
}
}
// hidding the search next to the top nav until its required for mobile, and vice versa for the search box next to the main-nav
.header .navbar-form.navbar-collapse {
display: none !important;
padding: 0;
margin: 0;
height: auto !important;
@media (max-width: $screen-lg-min) {
display: inline-block !important;
clear: none;
margin-top: 13px;
}
@media (max-width: $screen-sm-min - 1) {
margin: 0;
display: none !important;
&.in {
display: inline-block !important;
}
}
}
.main-nav {
border-bottom-width: 0;
.mainnav-search {
margin-top: 3px;
margin-bottom: 0;
}
.navbar-form.navbar-collapse {
display: inline-block;
@media (max-width: $screen-lg-min - 1) {
display: none !important;
}
}
}
\ No newline at end of file
.top-nav.navbar-nav {
margin: 10px 0 0 0;
padding: 0;
font-size: 13px;
text-align: right;
@media (max-width: $screen-md-min) {
position: inherit;
right: auto;
background-color: transparent;
border-radius: 0;
margin: 10px 10px;
font-size: 14px;
}
.login-link + .language-form {
float: none;
@media (min-width: $screen-xs-min) {
......@@ -29,11 +15,6 @@
> li {
> a {
padding: 10px;
@media (max-width: $screen-md-min) {
padding: 10px 5px;
}
&:focus,
&:hover {
color: lighten($theme-primary-color, 8%);
......@@ -98,4 +79,4 @@
}
}
}
}
\ No newline at end of file
}
......@@ -2,11 +2,6 @@
<nav id="main-nav" class="no-site-messages {if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}{if $DROPDOWNMENU}dropdown-adminnav navbar-default{else}adminnav navbar-inverse{/if}{else}navbar-inverse{/if} nav collapse navbar-collapse nav-main main-nav ">
<div class="container">
{if !$nosearch && ($LOGGEDIN || $publicsearchallowed)}
<div class="navbar-form navbar-right collapse navbar-collapse mainnav-search">
{header_search_form}
</div>
{/if}
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<div class="navbar-header">
<a class="navbar-text navbar-link" href="{$WWWROOT}" accesskey="h" class="return-site">
......
Supports Markdown
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