diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 12:09:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 12:09:50 +0300 |
commit | 43ae0b9e403cf774060267ee6d1a3dd502638068 (patch) | |
tree | fe4f1601df28af77a4f657392f93adcd9af0019d /spec/frontend/fixtures/static | |
parent | d5e4aa5266e94798f1c4a1a83a77fa0354056f0e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures/static')
4 files changed, 50 insertions, 19 deletions
diff --git a/spec/frontend/fixtures/static/create_item_dropdown.html b/spec/frontend/fixtures/static/create_item_dropdown.html index d2d38370092..aac7d3397ce 100644 --- a/spec/frontend/fixtures/static/create_item_dropdown.html +++ b/spec/frontend/fixtures/static/create_item_dropdown.html @@ -1,11 +1,42 @@ <div class="js-create-item-dropdown-fixture-root"> -<input name="variable[environment]" type="hidden"> -<div class="dropdown "><button class="dropdown-menu-toggle js-dropdown-menu-toggle" type="button" data-toggle="dropdown"><span class="dropdown-toggle-text ">some label</span><i aria-hidden="true" data-hidden="true" class="fa fa-chevron-down"></i></button><div class="dropdown-menu dropdown-select dropdown-menu-selectable"><div class="dropdown-input"><input type="search" id="" class="dropdown-input-field" autocomplete="off" /><i aria-hidden="true" data-hidden="true" class="fa fa-search dropdown-input-search"></i><i aria-hidden="true" data-hidden="true" role="button" class="fa fa-times dropdown-input-clear js-dropdown-input-clear"></i></div><div class="dropdown-content js-dropdown-content"></div><div class="dropdown-footer"><ul class="dropdown-footer-list"> -<li> -<button class="dropdown-create-new-item-button js-dropdown-create-new-item"> -Create wildcard -<code></code> -</button> -</li> -</ul> -</div><div class="dropdown-loading"><i aria-hidden="true" data-hidden="true" class="fa fa-spinner fa-spin"></i></div></div></div></div> + <input name="variable[environment]" type="hidden" /> + <div class="dropdown "> + <button + class="dropdown-menu-toggle js-dropdown-menu-toggle" + type="button" + data-toggle="dropdown" + > + <span class="dropdown-toggle-text ">some label</span + ><i aria-hidden="true" data-hidden="true" class="fa fa-chevron-down"></i> + </button> + <div class="dropdown-menu dropdown-select dropdown-menu-selectable"> + <div class="dropdown-input"> + <input type="search" id="" class="dropdown-input-field" autocomplete="off" /><i + aria-hidden="true" + data-hidden="true" + class="fa fa-search dropdown-input-search" + ></i + ><i + aria-hidden="true" + data-hidden="true" + role="button" + class="fa fa-times dropdown-input-clear js-dropdown-input-clear" + ></i> + </div> + <div class="dropdown-content js-dropdown-content"></div> + <div class="dropdown-footer"> + <ul class="dropdown-footer-list"> + <li> + <button class="dropdown-create-new-item-button js-dropdown-create-new-item"> + Create wildcard + <code></code> + </button> + </li> + </ul> + </div> + <div class="dropdown-loading"> + <span aria-hidden="true" data-hidden="true" class="gl-spinner"></span> + </div> + </div> + </div> +</div> diff --git a/spec/frontend/fixtures/static/deprecated_jquery_dropdown.html b/spec/frontend/fixtures/static/deprecated_jquery_dropdown.html index 3db9bafcb9f..41e7170b5c6 100644 --- a/spec/frontend/fixtures/static/deprecated_jquery_dropdown.html +++ b/spec/frontend/fixtures/static/deprecated_jquery_dropdown.html @@ -32,7 +32,7 @@ </div> <div class="dropdown-content"></div> <div class="dropdown-loading"> - <i class="fa fa-spinner fa-spin"></i> + <span class="gl-spinner"></span> </div> </div> </div> diff --git a/spec/frontend/fixtures/static/mini_dropdown_graph.html b/spec/frontend/fixtures/static/mini_dropdown_graph.html index cb55698b709..cde811d4f52 100644 --- a/spec/frontend/fixtures/static/mini_dropdown_graph.html +++ b/spec/frontend/fixtures/static/mini_dropdown_graph.html @@ -7,7 +7,7 @@ <ul></ul> </li> <li class="js-builds-dropdown-loading hidden"> - <span class="fa fa-spinner"></span> + <span class="gl-spinner"></span> </li> </ul> </div> diff --git a/spec/frontend/fixtures/static/project_select_combo_button.html b/spec/frontend/fixtures/static/project_select_combo_button.html index 50c826051c0..f13f9075706 100644 --- a/spec/frontend/fixtures/static/project_select_combo_button.html +++ b/spec/frontend/fixtures/static/project_select_combo_button.html @@ -1,9 +1,9 @@ <div class="project-item-select-holder"> -<input class="project-item-select" data-group-id="12345" data-relative-path="issues/new"> -<a class="new-project-item-link" data-label="New issue" data-type="issues" href=""> -<i class="fa fa-spinner spin"></i> -</a> -<a class="new-project-item-select-button"> -<i class="fa fa-caret-down"></i> -</a> + <input class="project-item-select" data-group-id="12345" data-relative-path="issues/new" /> + <a class="new-project-item-link" data-label="New issue" data-type="issues" href=""> + <span class="gl-spinner"></span> + </a> + <a class="new-project-item-select-button"> + <i class="fa fa-caret-down"></i> + </a> </div> |