mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	Rename "clear_search_button" to "old_clear_search_button".
This temporary change allows us to preserve these old styles while iteratively move all the close buttons to new styles. Once the migration is complete, `old_clear_search_button` won't exist anymore and there will be new styles for `clear_search_button`.
This commit is contained in:
		@@ -402,7 +402,7 @@ input.settings_text_input {
 | 
			
		||||
   should be replaced with a Zulip icon,
 | 
			
		||||
   and its formatting should have no extra
 | 
			
		||||
   space around its viewbox in SVG. */
 | 
			
		||||
.clear_search_button {
 | 
			
		||||
.old_clear_search_button {
 | 
			
		||||
    &:hover {
 | 
			
		||||
        color: var(--color-text-clear-search-button-hover);
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -84,7 +84,7 @@
 | 
			
		||||
    .topic_search_section {
 | 
			
		||||
        margin: 3px 0;
 | 
			
		||||
 | 
			
		||||
        .clear_search_button {
 | 
			
		||||
        .old_clear_search_button {
 | 
			
		||||
            grid-area: clear-button;
 | 
			
		||||
            /* Override app-component positioning. */
 | 
			
		||||
            position: static;
 | 
			
		||||
@@ -1745,7 +1745,7 @@ li.topic-list-item {
 | 
			
		||||
        padding-right: 30px;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .clear_search_button {
 | 
			
		||||
    .old_clear_search_button {
 | 
			
		||||
        /* Use the border-box model so flex
 | 
			
		||||
           can do its thing despite whatever
 | 
			
		||||
           padding and border we specify. */
 | 
			
		||||
 
 | 
			
		||||
@@ -163,7 +163,7 @@
 | 
			
		||||
        overflow: hidden;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .clear_search_button {
 | 
			
		||||
    .old_clear_search_button {
 | 
			
		||||
        grid-area: clear-search;
 | 
			
		||||
        padding: 0;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -481,7 +481,7 @@ $user_status_emoji_width: 24px;
 | 
			
		||||
            white-space: nowrap;
 | 
			
		||||
            text-overflow: ellipsis;
 | 
			
		||||
            overflow: hidden;
 | 
			
		||||
            /* Prevent text from colliding with #clear_search_button */
 | 
			
		||||
            /* Prevent text from colliding with #old_clear_search_button */
 | 
			
		||||
            padding-right: 28px;
 | 
			
		||||
            height: var(--line-height-sidebar-row-prominent);
 | 
			
		||||
            box-sizing: border-box;
 | 
			
		||||
 
 | 
			
		||||
@@ -23,7 +23,7 @@
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        .clear_search_button {
 | 
			
		||||
        .old_clear_search_button {
 | 
			
		||||
            position: static;
 | 
			
		||||
            padding: 6px;
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<div class="topic_search_section filter-topics">
 | 
			
		||||
    <input class="topic-list-filter home-page-input filter_text_input" id="filter-topic-input" type="text" autocomplete="off" placeholder="{{t 'Filter topics'}}" />
 | 
			
		||||
    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_topic_button">
 | 
			
		||||
    <button type="button" class="bootstrap-btn old_clear_search_button" id="clear_search_topic_button">
 | 
			
		||||
        <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
    </button>
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -165,7 +165,7 @@
 | 
			
		||||
        </a>
 | 
			
		||||
        <div class="zoom-out-hide direct-messages-search-section">
 | 
			
		||||
            <input class="direct-messages-list-filter filter_text_input home-page-input" type="text" autocomplete="off" placeholder="{{t 'Filter direct messages' }}" />
 | 
			
		||||
            <button type="button" class="bootstrap-btn clear_search_button" id="clear-direct-messages-search-button">
 | 
			
		||||
            <button type="button" class="bootstrap-btn old_clear_search_button" id="clear-direct-messages-search-button">
 | 
			
		||||
                <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
            </button>
 | 
			
		||||
        </div>
 | 
			
		||||
@@ -194,7 +194,7 @@
 | 
			
		||||
 | 
			
		||||
                <div class="notdisplayed stream_search_section">
 | 
			
		||||
                    <input class="stream-list-filter home-page-input filter_text_input" type="text" autocomplete="off" placeholder="{{t 'Filter channels' }}" />
 | 
			
		||||
                    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_stream_button">
 | 
			
		||||
                    <button type="button" class="bootstrap-btn old_clear_search_button" id="clear_search_stream_button">
 | 
			
		||||
                        <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
                    </button>
 | 
			
		||||
                </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="search_group" role="group">
 | 
			
		||||
        <input type="text" id="recent_view_search" class="filter_text_input" value="{{ search_val }}" autocomplete="off" placeholder="{{t 'Filter topics (t)' }}" />
 | 
			
		||||
        <button type="button" class="bootstrap-btn clear_search_button" id="recent_view_search_clear">
 | 
			
		||||
        <button type="button" class="bootstrap-btn old_clear_search_button" id="recent_view_search_clear">
 | 
			
		||||
            <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
        </button>
 | 
			
		||||
    </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
        </div>
 | 
			
		||||
    </div>
 | 
			
		||||
    <input type="text" class="user-status modal_text_input" placeholder="{{t 'Your status' }}" maxlength="60"/>
 | 
			
		||||
    <button type="button" class="bootstrap-btn clear_search_button" id="clear_status_message_button" disabled="disabled">
 | 
			
		||||
    <button type="button" class="bootstrap-btn old_clear_search_button" id="clear_status_message_button" disabled="disabled">
 | 
			
		||||
        <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
    </button>
 | 
			
		||||
</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -22,7 +22,7 @@
 | 
			
		||||
                <div class="input-append stream_name_search_section" id="stream_filter">
 | 
			
		||||
                    <input type="text" name="stream_name" id="search_stream_name" class="filter_text_input" autocomplete="off"
 | 
			
		||||
                      placeholder="{{t 'Filter channels' }}" value=""/>
 | 
			
		||||
                    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_stream_name">
 | 
			
		||||
                    <button type="button" class="bootstrap-btn old_clear_search_button" id="clear_search_stream_name">
 | 
			
		||||
                        <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
                    </button>
 | 
			
		||||
                </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -22,7 +22,7 @@
 | 
			
		||||
                <div class="input-append group_name_search_section" id="group_filter">
 | 
			
		||||
                    <input type="text" name="group_name" id="search_group_name" class="filter_text_input" autocomplete="off"
 | 
			
		||||
                      placeholder="{{t 'Filter groups' }}" value=""/>
 | 
			
		||||
                    <button type="button" class="bootstrap-btn clear_search_button" id="clear_search_group_name">
 | 
			
		||||
                    <button type="button" class="bootstrap-btn old_clear_search_button" id="clear_search_group_name">
 | 
			
		||||
                        <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
                    </button>
 | 
			
		||||
                </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -119,7 +119,7 @@
 | 
			
		||||
                            </div>
 | 
			
		||||
                            <div class="stream-search-container">
 | 
			
		||||
                                <input type="text" class="stream-search modal_text_input" placeholder="{{t 'Filter channels' }}" />
 | 
			
		||||
                                <button type="button" class="clear_search_button" id="clear_stream_search">
 | 
			
		||||
                                <button type="button" class="old_clear_search_button" id="clear_stream_search">
 | 
			
		||||
                                    <i class="fa fa-remove" aria-hidden="true"></i>
 | 
			
		||||
                                </button>
 | 
			
		||||
                            </div>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user