Commit ce78dc84 authored by Evonne Cheung's avatar Evonne Cheung
Browse files

Bug 1845104 Ocean theme changes 

- removed redundant styles
- take custom font out of list-group titles for better readability
- put necessary changes back to raw
- put styles in custom.scss into right files

behatnotneeded

Change-Id: I3b43b631460b2557c07211e307648ef3e95fd94a
parent 6a0358f3

htdocs/theme/ocean/sass/_custom.scss

+0 −35
Original line number Diff line number Diff line 
// Generic custom css (anything longer than a screen view should have its own component file)



// link hover color

// override bootstrap's lighten() as it looks a bit odd with the blue used for $theme-primary-color

a,

.text-link,

.list-group a.text-link,

.list-group-item-heading a,

.collapsible legend h3 .secondary-link,

.collapsible legend h4 .secondary-link,

.card-header .secondary-link,

.pagination > li > a,

.pagination > li > span {

    &:hover,

    &:focus {

        color: scale-color($theme-primary-color, $lightness: 30%);

    }

}

.list-group-item-heading a:hover .metadata,

.list-group-item-heading a:focus .metadata {

    color: scale-color($theme-primary-color, $lightness: 30%);

}



// cards

.card-secondary .card-header-nested,

.card-secondary >.card-header {

    border-left: 0;

    background-color: transparent;

}

.loading-inner {

    background: transparent;

    .icon-spinner {

        color: #fff;

    }

}

htdocs/theme/ocean/sass/components/_arrow-bar.scss

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
.arrow-bar {

    background-color: $arrow-bar-bg;



    .arrow {

        background-color: $arrow-color;

        &:after {

            border-left: 14px solid $arrow-color;

        }

        .text {

            color: $arrow-text-color;

        }

    }

}





.nav-inpage {

    &.nav > li {

        > a, button {

            color: $arrow-link-color;

            &:hover,

            &:focus {

                background: $arrow-link-background-color;

                color: $arrow-link-hover-color;

            }

        }

        &.active > a,

        &.active > button  {

            color: $theme-text-color;

            background: $arrow-link-background-color;

            &:hover,

            &:focus {

                color: $arrow-link-active-color;

            }

        }

    }

}

htdocs/theme/ocean/sass/components/_list-group.scss

0 → 100644
+12 −0
Original line number Diff line number Diff line 
.list-group-item {

  h4.title,

  h4.list-group-item-heading,

  h5.title,

  h5.list-group-item-heading {

    font-family: $font-family-sans-serif;

  }

}



.list-group-item-heading {

  font-family: $font-family-sans-serif;

}

htdocs/theme/ocean/sass/components/_loading-inner.scss

0 → 100644
+3 −0
Original line number Diff line number Diff line 
.loading-inner {

    color: $white;

}

htdocs/theme/ocean/sass/components/_toggles.scss

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
// Navigation toggle styles

.nav-toggle-area {

    .user-icon {

        &:hover,

        &:focus {

            color: $navbar-toggle-hover-color;

            background-color: $navbar-toggle-hover-bg;

        }

    }

}



.navbar-toggle {

    color: $navbar-toggle-color;

    background-color: $navbar-toggle-bg;

    background-image: none;

    border: 1px solid transparent;



    &:hover,

    &:focus {

        color: $navbar-toggle-hover-color;

        background-color: $navbar-toggle-hover-bg;

    }



    &.collapsed {

        background-color: transparent;

        &:hover,

        &:focus {

            color: $navbar-toggle-hover-color;

            background-color: $navbar-toggle-hover-bg;

        }

    }



    &.search-toggle {

        @include media-breakpoint-up(md) {

            display: none;

        }

        .icon {

            color: $navbar-toggle-color;

            background-color: $navbar-toggle-bg;

        }

    }



    &.user-toggle {

        color: $navbar-toggle-color;

        background-color: $navbar-toggle-bg;

        @include media-breakpoint-up(md) {

            border-left-width: 1px;

        }

        &:hover,

        &:focus {

            color: $navbar-toggle-hover-color;

            background-color: $navbar-toggle-hover-bg;

        }

    }



    &:last-of-type {

        border-left-width: 1px;

    }

}



// navbar menu children toggles

.nav {

    .navbar-showchildren {

        color: $navbar-inverse-toggle-color;

        background: $navbar-inverse-toggle-bg;

        border: 0;



        &:hover,

        &:focus {

            background: $navbar-inverse-toggle-hover-bg;

            .icon {

                color: $navbar-inverse-toggle-hover-color;

            }

        }

        .active & {

            background-color: $navbar-inverse-toggle-active-bg;

            .icon {

                color: $navbar-inverse-toggle-active-color;

            }

        }

    }

}