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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
3c484861
Commit
3c484861
authored
Oct 05, 2017
by
Mike Greiling
Committed by
Phil Hughes
Oct 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Monitoring graph empty states are gigantic on `screen-sm` viewport sizes"
parent
0a567f23
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
34 deletions
+22
-34
app/assets/javascripts/monitoring/components/empty_state.vue
app/assets/javascripts/monitoring/components/empty_state.vue
+15
-27
app/assets/javascripts/monitoring/monitoring_bundle.js
app/assets/javascripts/monitoring/monitoring_bundle.js
+1
-4
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+6
-3
No files found.
app/assets/javascripts/monitoring/components/empty_state.vue
View file @
3c484861
...
@@ -73,34 +73,22 @@
...
@@ -73,34 +73,22 @@
<
template
>
<
template
>
<div
class=
"prometheus-state"
>
<div
class=
"prometheus-state"
>
<div
class=
"row"
>
<div
class=
"state-svg svg-content"
>
<div
class=
"col-md-4 col-md-offset-4 state-svg svg-content"
>
<img
:src=
"currentState.svgUrl"
/>
<img
:src=
"currentState.svgUrl"
/>
</div>
</div>
</div>
<h4
class=
"state-title"
>
<div
class=
"row"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<h4
class=
"text-center state-title"
>
{{
currentState
.
title
}}
{{
currentState
.
title
}}
</h4>
</h4>
</div>
<p
class=
"state-description"
>
</div>
<div
class=
"row"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"description-text text-center state-description"
>
{{
currentState
.
description
}}
{{
currentState
.
description
}}
<a
v-if=
"showButtonDescription"
:href=
"settingsPath"
>
<a
v-if=
"showButtonDescription"
:href=
"settingsPath"
>
Prometheus server
Prometheus server
</a>
</a>
</div>
</p>
</div>
<div
class=
"state-button"
>
</div>
<div
class=
"row state-button-section"
>
<div
class=
"col-md-4 col-md-offset-4 text-center state-button"
>
<a
class=
"btn btn-success"
:href=
"buttonPath"
>
<a
class=
"btn btn-success"
:href=
"buttonPath"
>
{{
currentState
.
buttonText
}}
{{
currentState
.
buttonText
}}
</a>
</a>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/monitoring/monitoring_bundle.js
View file @
3c484861
...
@@ -3,8 +3,5 @@ import Dashboard from './components/dashboard.vue';
...
@@ -3,8 +3,5 @@ import Dashboard from './components/dashboard.vue';
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
el
:
'
#prometheus-graphs
'
,
el
:
'
#prometheus-graphs
'
,
components
:
{
render
:
createElement
=>
createElement
(
Dashboard
),
Dashboard
,
},
render
:
createElement
=>
createElement
(
'
dashboard
'
),
}));
}));
app/assets/stylesheets/pages/environments.scss
View file @
3c484861
...
@@ -207,10 +207,13 @@
...
@@ -207,10 +207,13 @@
}
}
.prometheus-state
{
.prometheus-state
{
margin-top
:
10px
;
max-width
:
430px
;
margin
:
10px
auto
;
text-align
:
center
;
.state-button-section
{
.state-svg
{
margin-top
:
10px
;
max-width
:
80vw
;
margin
:
0
auto
;
}
}
}
}
...
...
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