Skip to content

Commit

Permalink
fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
dpsoft committed Jan 18, 2014
1 parent 83cb41c commit 16b6f8e
Show file tree
Hide file tree
Showing 21 changed files with 534 additions and 199 deletions.
2 changes: 1 addition & 1 deletion kamon-dashboard/src/main/resources/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-toggle"></span>
</button>
<a class="navbar-brand" href="#"><img src="img/kamon-verde-120x120.png" width="20" height="20"/> Kamon</a>
<a class="navbar-brand" href="#"><img src="img/kamon-verde-120x120.png" width="30" height="30"/> Kamon</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
Expand Down
20 changes: 16 additions & 4 deletions site/src/jekyll/_includes/navigation-bar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
Expand All @@ -8,13 +8,25 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand kamon-title" href="/"><strong>Kamon</strong> <span class="small hidden-xs">Reactive Applications Monitoring</span>
</a>
<a class="navbar-brand kamon-title" href="/"><img src="../assets/img/kamon-verde-120x120.png" width="20" height="20"/> <strong>Kamon</strong></a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav">
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="modules">Modules <span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="download">
<li><a tabindex="-1" href="/spray">Spray</a></li>
<li><a tabindex="-1" href="/akka">Akka</a></li>
<li><a tabindex="-1" href="/newrelic">NewRelic</a></li>
<li class="divider"></li>
<li><a tabindex="-1" href="/dashboard">Dashboard</a></li>
<li><a tabindex="-1" href="/traces">Traces</a></li>
</ul>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="/teamblog/">Team Blog</a></li>
</ul>
</div>
Expand Down
5 changes: 3 additions & 2 deletions site/src/jekyll/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<link rel="stylesheet" href="/assets/css/bootstrap.min.css">
<link rel="stylesheet" href="/assets/css/syntax-highlight.css">
<link rel="stylesheet" href="/assets/css/font-awesome.min.css">
<link rel="stylesheet" href="/assets/css/kamon.css">

</head>
Expand All @@ -22,12 +23,12 @@

<footer class="footer">
<div class="container">
<p class="muted credit text-center">Kamon is a open source project, go and check out the code at
<p class="muted credit text-center">Kamon is a open source project, go and check out the code at
<a href="http://github.com/kamon-io/Kamon"><img src="/assets/img/github-logo.png" id="github-logo" alt="GitHub"></a>
</p>
</div>
</footer>

<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="/assets/js/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
Expand Down
20 changes: 10 additions & 10 deletions site/src/jekyll/akka/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ title: kamon | Akka Toolkit | Documentation
layout: default
---

Documentation
Akka Module
===

---
Dependencies
---

Expand All @@ -29,13 +30,13 @@ Since kamon uses the same configuration technique as [Spray](http://spray.io/doc

In order to see Kamon in action you need first to set up your sbt project.

1. Add Kamon repository to resolvers
1) Add Kamon repository to resolvers

```scala
"Kamon Repository" at "http://repo.kamon.io"
```

2. Add libraryDepenency
2) Add libraryDepenency

```scala
"kamon" %% "kamon-spray" % "0.0.11",
Expand All @@ -51,11 +52,10 @@ In addition we suggest to create aspectj.sbt file and add this content
javaOptions <++= AspectjKeys.weaverOptions in Aspectj
```

3. Add to your plugins.sbt in project folder (if you don't have one yet, create the file) and add the Kamon release to the resolver and the aspecj.
3) Add to your plugins.sbt in project folder (if you don't have one yet, create the file) and add the Kamon release to the resolver and the aspecj.

```scala
resolvers += Resolver.url("Kamon Releases",
url("http://repo.kamon.io"))(Resolver.ivyStylePatterns)
resolvers += Resolver.url("Kamon Releases", url("http://repo.kamon.io"))(Resolver.ivyStylePatterns)

addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.2")
```
Expand All @@ -65,9 +65,9 @@ In addition we suggest to create aspectj.sbt file and add this content
akka {
loggers = ["akka.event.slf4j.Slf4jLogger"]

actor {
debug {
unhandled = on
actor {
debug {
unhandled = on
}
}
}
Expand All @@ -94,4 +94,4 @@ In order to see how it works, you need to send a message to the rest service

```bash
curl -v --header 'X-UOW:YOUR_TRACER_ID' -X GET 'http://0.0.0.0:6666/fibonacci'
```
```
9 changes: 0 additions & 9 deletions site/src/jekyll/assets/css/bootstrap-theme.min.css

This file was deleted.

2 changes: 1 addition & 1 deletion site/src/jekyll/assets/css/bootstrap.min.css

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions site/src/jekyll/assets/css/font-awesome.min.css

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion site/src/jekyll/assets/css/kamon.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ body {
}

.jumbotron {
background-color: #BDBDBD;
background-color: #eeeeee;
}

img[alt=newrelic] { width: 100%; }


Binary file added site/src/jekyll/assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 16b6f8e

Please sign in to comment.