Skip to content
Snippets Groups Projects
Commit b4916ff7 authored by Lukas Eipert's avatar Lukas Eipert
Browse files

Merge branch '366605-remove-unused-banner-css' into 'master'

Remove unused css and css class selectors

See merge request !127554



Merged-by: Lukas Eipert's avatarLukas 'Eipi' Eipert <leipert@gitlab.com>
Approved-by: Lukas Eipert's avatarLukas 'Eipi' Eipert <leipert@gitlab.com>
Reviewed-by: Alexander Turinske's avatarAlexander Turinske <aturinske@gitlab.com>
Co-authored-by: Alexander Turinske's avatarAlexander Turinske <aturinske@gitlab.com>
parents 01193cd6 d5f9b329
No related branches found
No related tags found
1 merge request!127554Remove unused css and css class selectors
Pipeline #947440925 failed
Pipeline: E2E Omnibus GitLab EE

#947605836

    Pipeline: GitLab

    #947486001

      Pipeline: E2E GDK

      #947473302

        ......@@ -4,8 +4,6 @@ export default class EETrialBanner {
        constructor($trialBanner) {
        this.COOKIE_KEY = 'show_ee_trial_banner';
        this.$trialBanner = $trialBanner;
        this.$mainNavbar = this.$trialBanner.siblings('.js-navbar-gitlab');
        this.$secondaryNavbar = this.$mainNavbar.siblings('.js-page-with-sidebar');
        this.licenseExpiresOn = new Date(this.$trialBanner.data('licenseExpiry'));
        }
        ......@@ -74,22 +72,8 @@ export default class EETrialBanner {
        }
        }
        toggleMainNavbarMargin(state) {
        if (this.$mainNavbar.length) {
        this.$mainNavbar.toggleClass('has-trial-banner', state);
        }
        }
        toggleSecondaryNavbarMargin(state) {
        if (this.$secondaryNavbar.length) {
        this.$secondaryNavbar.toggleClass('has-trial-banner', state);
        }
        }
        toggleBanner(state) {
        this.$trialBanner.toggleClass('hidden', !state);
        this.toggleMainNavbarMargin(state);
        this.toggleSecondaryNavbarMargin(state);
        }
        handleTrialBannerDismiss(element) {
        ......@@ -100,8 +84,6 @@ export default class EETrialBanner {
        // A closed button has been clicked, dismiss the banner and handle setting the cookie
        this.toggleBanner(false);
        this.toggleMainNavbarMargin(false);
        this.toggleSecondaryNavbarMargin(false);
        if (getCookie(this.COOKIE_KEY)) {
        setCookie(this.COOKIE_KEY, 'false');
        }
        ......
        /* EE Trial Specific Stylesheet */
        /* Main Nav Overrides */
        .navbar-gitlab.has-trial-banner {
        top: 52px;
        }
        .page-with-sidebar.has-trial-banner {
        /* Secondary Nav Overrides - Old Nav */
        margin-top: 102px;
        /* Sidebar Nav Overrides - New Nav */
        .nav-sidebar {
        top: 102px;
        }
        }
        ......@@ -9,6 +9,7 @@
        alert_options: { data: { license_expiry: subscribable.expires_at, defer_links: "true", testid: 'subscribable_banner' }}) do |c|
        - c.with_body do
        = message
        - c.with_actions do
        - if subscribable.block_changes?
        = link_to_button_style(path: renew_subscription_path, track_property: 'renew')
        - elsif subscribable.expired?
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment