diff options
author | Jose Vargas <jvargas@gitlab.com> | 2018-09-26 15:44:48 -0500 |
---|---|---|
committer | Jose Vargas <jvargas@gitlab.com> | 2018-10-02 16:36:01 -0500 |
commit | 65e18817a439b6f14f32ad8518ea2e99f84da200 (patch) | |
tree | 7544bcb34b177d0f05edd987ba3eee71c6c32555 /app | |
parent | 9087964c8c6a5d068832334b4377188fdd88d578 (diff) | |
download | gitlab-ce-65e18817a439b6f14f32ad8518ea2e99f84da200.tar.gz |
Add gl-button from gitlab-ui
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/boards/components/board_new_issue.vue | 16 | ||||
-rw-r--r-- | app/assets/javascripts/environments/components/environment_monitoring.vue | 9 |
2 files changed, 16 insertions, 9 deletions
diff --git a/app/assets/javascripts/boards/components/board_new_issue.vue b/app/assets/javascripts/boards/components/board_new_issue.vue index f248f53fa51..f7ce5128964 100644 --- a/app/assets/javascripts/boards/components/board_new_issue.vue +++ b/app/assets/javascripts/boards/components/board_new_issue.vue @@ -1,5 +1,6 @@ <script> import $ from 'jquery'; +import { Button } from '@gitlab-org/gitlab-ui'; import eventHub from '../eventhub'; import ProjectSelect from './project_select.vue'; import ListIssue from '../models/issue'; @@ -10,6 +11,7 @@ export default { name: 'BoardNewIssue', components: { ProjectSelect, + 'gl-button': Button, }, props: { groupId: { @@ -123,21 +125,23 @@ export default { :group-id="groupId" /> <div class="clearfix prepend-top-10"> - <button + <gl-button ref="submit-button" :disabled="disabled" - class="btn btn-success float-left" + class="float-left" + variant="success" type="submit" > Submit issue - </button> - <button - class="btn btn-default float-right" + </gl-button> + <gl-button + class="float-right" type="button" + variant="default" @click="cancel" > Cancel - </button> + </gl-button> </div> </form> </div> diff --git a/app/assets/javascripts/environments/components/environment_monitoring.vue b/app/assets/javascripts/environments/components/environment_monitoring.vue index ccc8419ca6d..a0797b594cb 100644 --- a/app/assets/javascripts/environments/components/environment_monitoring.vue +++ b/app/assets/javascripts/environments/components/environment_monitoring.vue @@ -2,12 +2,14 @@ /** * Renders the Monitoring (Metrics) link in environments table. */ +import { Button } from '@gitlab-org/gitlab-ui'; import Icon from '~/vue_shared/components/icon.vue'; import tooltip from '../../vue_shared/directives/tooltip'; export default { components: { Icon, + 'gl-button': Button, }, directives: { tooltip, @@ -26,15 +28,16 @@ export default { }; </script> <template> - <a + <gl-button v-tooltip :href="monitoringUrl" :title="title" :aria-label="title" - class="btn monitoring-url d-none d-sm-none d-md-block" + class="monitoring-url d-none d-sm-none d-md-block" data-container="body" rel="noopener noreferrer nofollow" + variant="default" > <icon name="chart" /> - </a> + </gl-button> </template> |