Commit 8683bae0 authored by Pat Kira's avatar Pat Kira Committed by Son Nguyen
Browse files

Fix admin main navbar color on hover (bug: 1465107) 

behatnotneeded
Note: Only on default theme
Also fix repsonsive view for user search form with advanced options

Change-Id: Ida62dde454039e9e66b34f947ad1a558e75a9deb
(cherry picked from commit 780c9fea)
parent aa2585d0

htdocs/theme/default/sass/layout/nav/_main-nav.scss

+19 −6
Original line number Diff line number Diff line
@@ -20,16 +20,29 @@ 
        @media (max-width: $screen-sm-min) {

            background-color: #f1f1f1;

        }



        .nav > li > a {

        .nav {

            > li > a {

                padding: 10px 10px;

                font-family: $font-family-serif;

                font-size: 16px;

                font-weight: 300;



                &:hover {

                    color: #ffffff;

                }



                @media (max-width: $screen-sm-min) {

                    padding: 10px 20px;

                }

            }



            > li.active > a {

                &:hover,

                &:focus {

                    color: $navbar-default-link-color;

                }

            }

        }

    }



    // Only shown on mobile, or when dropdowns are turned on

htdocs/theme/default/sass/layout/nav/_navbar.scss

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
    background-color: transparent;



    .navbar-nav {



        > li {

            > a {

                font-family: $font-family-serif;

htdocs/theme/raw/sass/form/_dropdown-group.scss

+5 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
            top: 0;

            width: 240px;

            z-index: 5;



        }

        label {

            @include sr-only;
@@ -101,6 +100,11 @@ 


// User search dropdown-group

.admin-user-search {

    .usersearchform {

        @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {

            width: 65%;

        }

    }

    .dropdown-group {

        .picker {

            @media (min-width: $screen-sm-min) {

htdocs/theme/raw/templates/admin/groups/archives.tpl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
            <button id="query-button" class="btn-search btn btn-primary" type="submit">{str tag="search"}</button>

        </div>

        {else}

        <div class="usersearchform text input-group">

        <div class="searchform text input-group">

            <label class="sr-only" for="query">{str tag='usersearch' section='admin'}</label>

            <input placeholder="{str tag='usersearch' section='admin'}" class="text form-control" type="text" name="query" id="query"{if $search->query} value="{$search->query}"{/if}>

            <div class="input-group-btn button">

htdocs/theme/raw/templates/admin/users/exportqueue.tpl

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    {/if}

    <div class="admin-user-search">

        {if count($institutions) > 1}

        <div class="usersearchformdropdown-group js-dropdown-group form-group">

        <div class="dropdown-group js-dropdown-group form-group">

            <fieldset class="pieform-fieldset dropdown-group form-group js-dropdown-group">

                <div class="with-dropdown js-with-dropdown text form-group">

                    <label for="query">{str tag='usersearch' section='admin'}: </label>
@@ -36,7 +36,7 @@ 
            <button id="query-button" class="btn-search btn btn-primary" type="submit">{str tag="go"}</button>

        </div>

        {else}

        <div class="usersearchform text input-group">

        <div class="searchform text input-group">

            <label class="sr-only" for="query">{str tag='usersearch' section='admin'}</label>

            <input placeholder="{str tag='usersearch' section='admin'}" class="text form-control" type="text" name="query" id="query"{if $search->query} value="{$search->query}"{/if}>

            <div class="input-group-btn button">