Commit 9ab61e17 authored by Phil Hughes's avatar Phil Hughes

i18n on some strings

moved heights into variables
parent b0e92f3b
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
v-if="!stagedList" v-if="!stagedList"
id="discard-all-changes" id="discard-all-changes"
:footer-primary-button-text="__('Discard all changes')" :footer-primary-button-text="__('Discard all changes')"
header-title-text="Discard all unstaged changes?" :header-title-text="__('Discard all unstaged changes?')"
footer-primary-button-variant="danger" footer-primary-button-variant="danger"
@submit="discardAllChanges" @submit="discardAllChanges"
> >
......
<script> <script>
import $ from 'jquery'; import $ from 'jquery';
import { mapActions } from 'vuex'; import { mapActions } from 'vuex';
import { sprintf, __ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
import GlModal from '~/vue_shared/components/gl_modal.vue'; import GlModal from '~/vue_shared/components/gl_modal.vue';
...@@ -24,7 +25,10 @@ export default { ...@@ -24,7 +25,10 @@ export default {
return `discard-file-${this.path}`; return `discard-file-${this.path}`;
}, },
modalTitle() { modalTitle() {
return `Discard changes to ${this.path}?`; return sprintf(
__('Discard changes to %{path}?'),
{ path: this.path },
);
}, },
}, },
methods: { methods: {
......
...@@ -7,6 +7,8 @@ $ide-context-header-padding: 10px; ...@@ -7,6 +7,8 @@ $ide-context-header-padding: 10px;
$ide-project-avatar-end: $ide-context-header-padding + 48px; $ide-project-avatar-end: $ide-context-header-padding + 48px;
$ide-tree-padding: $gl-padding; $ide-tree-padding: $gl-padding;
$ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
$ide-commit-row-height: 32px;
$ide-commit-header-height: 48px;
.project-refs-form, .project-refs-form,
.project-refs-target-form { .project-refs-target-form {
...@@ -567,7 +569,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; ...@@ -567,7 +569,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
} }
.multi-file-commit-panel-header { .multi-file-commit-panel-header {
height: 48px; height: $ide-commit-header-height;
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
padding: 12px 0; padding: 12px 0;
} }
...@@ -645,7 +647,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; ...@@ -645,7 +647,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
.multi-file-commit-list-path { .multi-file-commit-list-path {
cursor: pointer; cursor: pointer;
height: 32px; height: $ide-commit-row-height;
padding-right: 0; padding-right: 0;
&.is-active { &.is-active {
...@@ -682,8 +684,8 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; ...@@ -682,8 +684,8 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
.multi-file-discard-btn { .multi-file-discard-btn {
> .btn { > .btn {
display: none; display: none;
width: 32px; width: $ide-commit-row-height;
height: 32px; height: $ide-commit-row-height;
} }
svg { svg {
...@@ -803,8 +805,8 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; ...@@ -803,8 +805,8 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
} }
.ide-staged-action-btn { .ide-staged-action-btn {
width: 32px; width: $ide-commit-row-height;
height: 32px; height: $ide-commit-row-height;
color: inherit; color: inherit;
> svg { > svg {
...@@ -1460,6 +1462,6 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding; ...@@ -1460,6 +1462,6 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
} }
.ide-commit-list-changed-icon { .ide-commit-list-changed-icon {
width: 32px; width: $ide-commit-row-height;
height: 32px; height: $ide-commit-row-height;
} }
...@@ -2307,9 +2307,15 @@ msgstr "" ...@@ -2307,9 +2307,15 @@ msgstr ""
msgid "Discard all changes" msgid "Discard all changes"
msgstr "" msgstr ""
msgid "Discard all unstaged changes?"
msgstr ""
msgid "Discard changes" msgid "Discard changes"
msgstr "" msgstr ""
msgid "Discard changes to %{path}?"
msgstr ""
msgid "Discard draft" msgid "Discard draft"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment