diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:01 +0300 |
commit | f607152a0802a68067343ad73f989033cb8e9a06 (patch) | |
tree | bbc16fd5f827ea5e30527d455a01dd6b1249a19c /spec/frontend | |
parent | 7c862041c66833ebf49d9964f1797d93b1829690 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
-rw-r--r-- | spec/frontend/fixtures/static/environments_logs.html | 109 |
1 files changed, 91 insertions, 18 deletions
diff --git a/spec/frontend/fixtures/static/environments_logs.html b/spec/frontend/fixtures/static/environments_logs.html index 6179d3dbc23..ccf9c364154 100644 --- a/spec/frontend/fixtures/static/environments_logs.html +++ b/spec/frontend/fixtures/static/environments_logs.html @@ -1,29 +1,102 @@ -<div class="js-kubernetes-logs" data-logs-path="/root/kubernetes-app/environments/1/logs"> - <div class="build-page"> +<div + class="js-kubernetes-logs" + data-current-environment-name="production" + data-environments-path="/root/my-project/environments.json" + data-logs-page="/root/my-project/environments/1/logs" + data-logs-path="/root/my-project/environments/1/logs.json" +> + <div class="build-page-pod-logs"> <div class="build-trace-container prepend-top-default"> - <div class="top-bar js-top-bar"> - <div class="truncated-info hidden-xs pull-left"></div> - <div class="dropdown prepend-left-10 js-pod-dropdown"> - <button aria-expanded="false" class="dropdown-menu-toggle" data-toggle="dropdown" type="button"> - <i class="fa fa-chevron-down"></i> - </button> - <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"></div> + <div class="top-bar js-top-bar d-flex"> + <div class="row"> + <div class="form-group col-6" role="group"> + <label class="d-block col-form-label-sm col-form-label"> + Environment + </label> + <div class="dropdown js-environment-dropdown d-flex"> + <button + aria-expanded="false" + class="dropdown-menu-toggle d-flex align-content-center align-self-center" + data-toggle="dropdown" + type="button" + > + <i aria-hidden="true" data-hidden="true" class="fa fa-chevron-down"></i> + <div class="dropdown-toggle-text"> + + </div> + </button> + <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"></div> + </div> + </div> + <div class="form-group col-6" role="group"> + <label class="d-block col-form-label-sm col-form-label"> + Pod logs from + </label> + <div class="dropdown js-pod-dropdown d-flex"> + <button + aria-expanded="false" + class="dropdown-menu-toggle d-flex align-content-center align-self-center" + data-toggle="dropdown" + type="button" + > + <i aria-hidden="true" data-hidden="true" class="fa fa-chevron-down"></i> + <div class="dropdown-toggle-text"> + + </div> + </button> + <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"></div> + </div> + </div> </div> - <div class="controllers pull-right"> - <div class="has-tooltip controllers-buttons" data-container="body" data-placement="top" title="Scroll to top"> - <button class="js-scroll-up btn-scroll btn-transparent btn-blank" disabled type="button"></button> + <div class="controllers align-self-end"> + <div + class="has-tooltip controllers-buttons" + data-container="body" + data-placement="top" + title="Scroll to top" + > + <button + class="js-scroll-up btn-scroll btn-transparent btn-blank" + disabled + type="button" + ></button> </div> - <div class="has-tooltip controllers-buttons" data-container="body" data-placement="top" title="Scroll to bottom"> - <button class="js-scroll-down btn-scroll btn-transparent btn-blank" disabled type="button"></button> + <div + class="has-tooltip controllers-buttons" + data-container="body" + data-placement="top" + title="Scroll to bottom" + > + <button + class="js-scroll-down btn-scroll btn-transparent btn-blank" + disabled + type="button" + ></button> </div> - <div class="refresh-control pull-right"> - <div class="has-tooltip controllers-buttons" data-container="body" data-placement="top" title="Refresh"> - <button class="js-refresh-log btn-default btn-refresh" disabled type="button"></button> + <div class="refresh-control"> + <div + class="has-tooltip controllers-buttons" + data-container="body" + data-placement="top" + title="Refresh" + > + <button + class="js-refresh-log btn btn-default btn-refresh h-32-px" + disabled + type="button" + ></button> </div> </div> </div> </div> - <pre class="build-trace" id="build-trace"><code class="bash js-build-output"><div class="build-loader-animation js-build-refresh"></div></code></pre> + <pre class="build-trace" id="build-trace"> + <code class="bash js-build-output"></code> + <div class="build-loader-animation js-build-refresh"> + <div class="dot"></div> + <div class="dot"></div> + <div class="dot"></div> + </div> + </pre> </div> </div> </div> |