Skip to content

Commit

Permalink
Merge pull request #1 from airbnb/upstream_assets
Browse files Browse the repository at this point in the history
[web-ui] Bringing the web ui up to date.
  • Loading branch information
andykram committed Mar 15, 2013
2 parents 166bb9c + f03f9a4 commit b23f5bd
Show file tree
Hide file tree
Showing 234 changed files with 1,218 additions and 18,079 deletions.
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.*sw?
*.iml
*.log
.idea/*
target
src/main/resources/**/temp
src/main/resources/**/build
.DS_Store
.rvmrc
node_modules
src/main/resources/**/components
chronos.arx
chronos.tbz
.classpath.txt
24 changes: 24 additions & 0 deletions docs/FAQ.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Chronos FAQ
## Table of Contents
1. [[osx] making mesos fails on `warning: 'JNI_CreateJavaVM' is deprecated`](#osx-making-mesos-fails-on-deprecated-warning)


## [osx] Making mesos fails on deprecated header warning
Error message such as:
`conftest.cpp:7: warning: 'JNI_CreateJavaVM' is deprecated (declared at /System/Library/Frameworks/JavaVM.framework/Headers/jni.h:1937)`

This error is the result of OSX shipping with an outdated version of the JDK and associated libraries. To resolve this issue, do the following.

1. [Download](http://www.oracle.com/technetwork/java/javase/downloads/index.html) and install JDK7.
2. Set JDK7 as active:
`export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)`
**Note:** Stick this in your `~/.*rc` to always use 1.7
3. Find your JNI headers, these should be in `$JAVA_HOME/include` and `$JAVA_HOME/include/darwin`.
4. Configure mesos with `JAVA_CPPFLAGS` set to the JNI path.

**Example Assumptions:**
* `$JAVA_HOME` in this example is `/Library/Java/JavaVirtualMachines/jdk1.7.0_12.jdk/Contents/Home`
* The current working directory is `mesos/build` as advised by the [mesos README](https://github.com/apache/mesos/blob/trunk/README#L13)

**Example:**
`JAVA_CPPFLAGS='-I/Library/Java/JavaVirtualMachines/jdk1.7.0_12.jdk/Contents/Home/include/ -I/Library/Java/JavaVirtualMachines/jdk1.7.0_12.jdk/Contents/Home/include/darwin/' ../configure`
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
5 changes: 4 additions & 1 deletion src/main/resources/assets/app/scripts/styles/bootstrap.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
@import "vendor/bootstrap/less/tables.less";

// Components: common
@import "vendor/bootstrap/less/sprites.less";
//
// Replace sprites.less (glyphicons) with font-awesome.less (fontawesome)
// @import "vendor/bootstrap/less/sprites.less";
@import "vendor/fontawesome/font-awesome.less";
@import "vendor/bootstrap/less/dropdowns.less";
@import "vendor/bootstrap/less/wells.less";
@import "vendor/bootstrap/less/component-animations.less";
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/assets/app/scripts/styles/core.less
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ textarea::-webkit-input-placeholder {
cursor: pointer;
}

[class^="icon-"],
[class*=" icon-"] {
background-image: url("/images/glyphicons-halflings-white.png");
}

.middle [class*="span"] {
min-height: auto;
}
Expand Down Expand Up @@ -812,6 +807,11 @@ margin-top: -70px;
border-right: 1px solid rgba(0,0,0,0.7);
}

.nav-item [class^="icon-"],
.nav-item [class*=" icon-"] {
color: #fff;
}

.job-detail-nav .nav-item:hover {
opacity: 0.4;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
@russoFontFamily : 'Russo One', sans-serif;
@iconSpritePath : "/images/glyphicons-halflings.png";
@iconWhiteSpritePath : "/images/glyphicons-halflings-white.png";
@FontAwesomePath: "../../../fonts/vendor/fontawesome";
Loading

0 comments on commit b23f5bd

Please sign in to comment.