summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-09-07 11:25:44 +0100
committerPhil Hughes <me@iamphill.com>2018-09-07 11:28:04 +0100
commit9ab61e17bb16f772ab9f696b234603cf2b1911db (patch)
tree8498b7d23768c0cdc05c9918faa68a645aec3689 /app/assets
parentb0e92f3b3042080ff96a8c5ccc84e3e149d3a488 (diff)
downloadgitlab-ce-9ab61e17bb16f772ab9f696b234603cf2b1911db.tar.gz
i18n on some strings
moved heights into variables
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/list.vue2
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue6
-rw-r--r--app/assets/stylesheets/page_bundles/ide.scss18
3 files changed, 16 insertions, 10 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
index daae3be7d44..3fdd35ad228 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
@@ -186,7 +186,7 @@ export default {
v-if="!stagedList"
id="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"
@submit="discardAllChanges"
>
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue
index f5a2af00612..8a1836a5c92 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue
@@ -1,6 +1,7 @@
<script>
import $ from 'jquery';
import { mapActions } from 'vuex';
+import { sprintf, __ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue';
import tooltip from '~/vue_shared/directives/tooltip';
import GlModal from '~/vue_shared/components/gl_modal.vue';
@@ -24,7 +25,10 @@ export default {
return `discard-file-${this.path}`;
},
modalTitle() {
- return `Discard changes to ${this.path}?`;
+ return sprintf(
+ __('Discard changes to %{path}?'),
+ { path: this.path },
+ );
},
},
methods: {
diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss
index 35ba1fca2b7..45df8391f9a 100644
--- a/app/assets/stylesheets/page_bundles/ide.scss
+++ b/app/assets/stylesheets/page_bundles/ide.scss
@@ -7,6 +7,8 @@ $ide-context-header-padding: 10px;
$ide-project-avatar-end: $ide-context-header-padding + 48px;
$ide-tree-padding: $gl-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-target-form {
@@ -567,7 +569,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
}
.multi-file-commit-panel-header {
- height: 48px;
+ height: $ide-commit-header-height;
border-bottom: 1px solid $white-dark;
padding: 12px 0;
}
@@ -645,7 +647,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
.multi-file-commit-list-path {
cursor: pointer;
- height: 32px;
+ height: $ide-commit-row-height;
padding-right: 0;
&.is-active {
@@ -682,8 +684,8 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
.multi-file-discard-btn {
> .btn {
display: none;
- width: 32px;
- height: 32px;
+ width: $ide-commit-row-height;
+ height: $ide-commit-row-height;
}
svg {
@@ -803,8 +805,8 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
}
.ide-staged-action-btn {
- width: 32px;
- height: 32px;
+ width: $ide-commit-row-height;
+ height: $ide-commit-row-height;
color: inherit;
> svg {
@@ -1460,6 +1462,6 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
}
.ide-commit-list-changed-icon {
- width: 32px;
- height: 32px;
+ width: $ide-commit-row-height;
+ height: $ide-commit-row-height;
}