diff --git a/app/assets/stylesheets/layout/header.css.scss b/app/assets/stylesheets/layout/header.css.scss index ea4c14c6ce..9f447c5788 100644 --- a/app/assets/stylesheets/layout/header.css.scss +++ b/app/assets/stylesheets/layout/header.css.scss @@ -86,29 +86,6 @@ .account-nav li > ul > li { max-width: 350px; } -#header .search_field { - position: relative; - border: 0; - border-radius: 25px; - -webkit-border-radius: 25px; - background: #FFFFFF url(image-path('magnifier.png')) no-repeat 94% center; - top: 6px; - width: 140px; - outline: 0px; - padding: 7px 30px 7px 10px; - font-family: 'LatoRegular', 'Lucida Grande', Helvetica, Arial, sans-serif; - color: #000000; -} -input::-webkit-input-placeholder { - color: #000000; -} -input:-moz-placeholder { - color: #000000; - } -#search { - margin: 7px 25px 0 0; - float: left; -} #header li.open > a { position: relative; top: 0px; @@ -140,34 +117,6 @@ input:-moz-placeholder { line-height: 15px; } -#nav-login-content { - position: relative; - position-top: 44px; - float: right; - background: white; - border: 0px solid #194E60; - border-top: 0; - padding-left: 5px; - padding-top: 5px; - padding-right: 10px; - padding-bottom: 8px; - color: #333333; - line-height: 19px; -} -#nav-login-content input[type=text], #nav-login-content input[type=password] { - height: 20px; - width: 150px; -} -#nav-login-content div a { - display: inline; - color: #333333; - padding: 0; -} -div#optional_login_fields { - top: 10px; - white-space: nowrap; - margin-left: 2px; -} .account-nav > li { margin-left: 3px; margin-right: 3px; diff --git a/app/assets/stylesheets/layout/top_menu.css.sass b/app/assets/stylesheets/layout/top_menu.css.sass index 6c423b99e2..2c683ccaa0 100644 --- a/app/assets/stylesheets/layout/top_menu.css.sass +++ b/app/assets/stylesheets/layout/top_menu.css.sass @@ -30,6 +30,12 @@ font-size: 14px font-family: 'LatoRegular', 'Lucida Grande', Helvetica, Arial, sans-serif font-weight: normal + +@mixin header-pulldown-fonts($color) + color: $color + font-size: 13px + font-family: 'LatoRegular', 'Lucida Grande', Helvetica, Arial, sans-serif + font-weight: normal #top-menu background-color: #3493B3 @@ -38,7 +44,25 @@ z-index: 21 position: relative a,span,div,li,ul - @include header-fonts(#fff) + #search + margin: 7px 25px 0 0 + float: left + .search_field + position: relative + border: 0 + border-radius: 25px + -webkit-border-radius: 25px + background: #FFFFFF url(image-path('magnifier.png')) no-repeat 94% center + top: 6px + width: 140px + outline: 0px + padding: 7px 30px 7px 10px + font-family: 'LatoRegular', 'Lucida Grande', Helvetica, Arial, sans-serif + color: #000000 + ::-webkit-input-placeholder + color: #000000 + :-moz-placeholder + color: #000000 ul margin: 0 margin-top: 12px @@ -74,6 +98,42 @@ float: right margin-right: 0.5em color: #fff + #nav-login-content + position: relative + position-top: 44px + float: right + background: #FFFFFF + border: 0px solid #194E60 + border-top: 0 + padding: 10px + line-height: 19px + @include header-pulldown-fonts(#555555) + #nav-login-content input[type=text] + height: 16px + width: 150px + border: 1px solid #CCCCCC + padding: 5px + #nav-login-content input[type=password] + height: 16px + width: 150px + border: 1px solid #CCCCCC + padding: 5px + #nav-login-content input[type=submit] + background: #06799F + border-radius: 20px + color: #FFFFFF + padding: 6px 13px + border: none + cursor: pointer + #nav-login-content div a + display: inline + color: #06799F + padding: 0 + #nav-login-content table td + padding: 3px + #optional_login_fields + white-space: nowrap + margin: 5px 0 0 3px #quick-search float: right