Skip to content

Commit

Permalink
Merge pull request Netflix#293 from ahus1/ahus1-dashboardnoext
Browse files Browse the repository at this point in the history
Internalize internet dependencies from hystrix dashboard
  • Loading branch information
benjchristensen committed Aug 11, 2014
2 parents 2e37299 + 5ccfe51 commit 839474f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
8 changes: 4 additions & 4 deletions hystrix-dashboard/src/main/webapp/css/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ img {


#header {
background: #FFFFFF url(http://raw.github.com/wiki/Netflix/Hystrix/images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 0%;
background: #FFFFFF url(../images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 0%;
height: 65px;
margin-bottom: 5px;
}
Expand Down Expand Up @@ -58,14 +58,14 @@ img {


@media screen and (min-width: 1500px) {

#header .header_nav {
top:13px;
right:130px;
}

#header {
background: #FFFFFF url(http://raw.github.com/wiki/Netflix/Hystrix/images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 50%;
background: #FFFFFF url(../images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 50%;
height: 65px;
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions hystrix-dashboard/src/main/webapp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Hystrix Dashboard</title>

<!-- Javascript to monitor and display -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script>
<script src="./js/jquery.min.js" type="text/javascript"></script>

<script>
function sendToMonitor() {
Expand All @@ -29,7 +29,7 @@
<div style="width:800px;margin:0 auto;">

<center>
<img width="264" height="233" src="https://raw.github.com/wiki/Netflix/Hystrix/images/hystrix-logo.png">
<img width="264" height="233" src="./images/hystrix-logo.png">
<br>
<br>

Expand Down
4 changes: 4 additions & 0 deletions hystrix-dashboard/src/main/webapp/js/jquery.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hystrix-dashboard/src/main/webapp/monitor/monitor.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<script type="text/javascript" src="../js/d3.v2.min.js"></script>

<!-- Javascript to monitor and display -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script>
<script src="../js/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../js/jquery.tinysort.min.js"></script>
<script type="text/javascript" src="../js/tmpl.js"></script>

Expand Down

0 comments on commit 839474f

Please sign in to comment.