Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d14397ff
Commit
d14397ff
authored
7 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed context translation
Fixes CSS widths when translating
parent
657664f9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
...pts/cycle_analytics/components/limit_warning_component.js
+1
-1
app/assets/javascripts/locale/index.js
app/assets/javascripts/locale/index.js
+4
-1
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+4
-8
No files found.
app/assets/javascripts/cycle_analytics/components/limit_warning_component.js
View file @
d14397ff
...
...
@@ -6,7 +6,7 @@ export default {
},
},
template
:
`
<span v-if="count === 50
|| true
" class="events-info pull-right">
<span v-if="count === 50" class="events-info pull-right">
<i class="fa fa-warning has-tooltip"
aria-hidden="true"
:title="__('Limited to showing 50 events at most')"
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/locale/index.js
View file @
d14397ff
...
...
@@ -13,7 +13,10 @@ const lang = document.querySelector('html').getAttribute('lang') || 'en';
const
locale
=
new
Jed
(
locales
[
lang
]);
const
gettext
=
locale
.
gettext
.
bind
(
locale
);
const
ngettext
=
locale
.
ngettext
.
bind
(
locale
);
const
pgettext
=
locale
.
pgettext
.
bind
(
locale
);
const
pgettext
=
(
context
,
key
)
=>
{
const
joinedKey
=
[
context
,
key
].
join
(
'
|
'
);
return
gettext
(
joinedKey
).
split
(
'
|
'
).
pop
();
};
export
{
lang
};
export
{
gettext
as
__
};
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
d14397ff
...
...
@@ -213,7 +213,7 @@
}
.stage-nav-item
{
display
:
block
;
display
:
flex
;
line-height
:
65px
;
border-top
:
1px
solid
transparent
;
border-bottom
:
1px
solid
transparent
;
...
...
@@ -247,14 +247,10 @@
}
.stage-nav-item-cell
{
float
:
left
;
&
.stage-name
{
width
:
65%
;
}
&
.stage-median
{
width
:
35%
;
margin-left
:
auto
;
margin-right
:
$gl-padding
;
min-width
:
calc
(
35%
-
#{
$gl-padding
}
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment