Merge github.com:gitlabhq/gitlab-ci into NewCharts

Conflicts:
	app/controllers/projects_controller.rb
	config/routes.rb

3 files changed, 131 insertions, 73 deletions

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 9277cb6..c0a86b9 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -11,6 +11,7 @@
 # GO AFTER THE REQUIRES BELOW.
 #
 #= require jquery
+#= require bootstrap
 #= require jquery_ujs
 #= require_tree .
 #
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
new file mode 100644
index 0000000..1f9cd2b
--- /dev/null
+++ b/app/assets/stylesheets/login.scss
@@ -0,0 +1,41 @@
+.form-signin {
+  max-width: 330px;
+  padding: 15px;
+  margin: 0 auto;
+}
+
+.form-signin .form-signin-heading {
+  margin-bottom: 10px;
+}
+
+.form-signin .form-control {
+  position: relative;
+  font-size: 16px;
+  height: auto;
+  padding: 10px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+
+
+  &.signin-select {
+    font-size: 14px;
+    height: 34px;
+  }
+}
+
+.form-signin .form-control:focus {
+  z-index: 2;
+}
+
+.form-signin input[type="text"] {
+  margin-bottom: -1px;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.form-signin input[type="password"] {
+  margin-bottom: 10px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index ef770d6..a4372db 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -1,6 +1,7 @@
 @import "bootstrap";
 @import "font-awesome";
 @import "xterm";
+@import "login";
 
 $style_color: #289;
 
@@ -11,6 +12,7 @@ $style_color: #289;
 body {
   color:#444;
   font-size: 13px;
+  -webkit-font-smoothing: antialiased;
 }
 
 a {
@@ -26,15 +28,24 @@ a {
   padding-left: 20px;
 }
 
+.navbar-brand {
+  color: #fff;
+
+  &:hover {
+    color: #fff;
+  }
+}
+
 .navbar-ci {
-  .navbar-inner {
-    padding: 4px;
-    background: $style_color;
+  background: $style_color;
 
-    .brand,
-    .nav > li > a {
-      color: #fff;
-      text-shadow: 0 1px 0 #167;
+  .brand,
+  .nav > li > a {
+    color: #fff;
+    text-shadow: 0 1px 0 #167;
+
+    &:hover {
+      background: none;
     }
   }
 }
@@ -83,22 +94,13 @@ pre.trace {
   }
 }
 
-.btn {
-  &.btn-primary {
-    background: #29a;
-    border:1px solid #279;
-    padding: 4px 20px;
-  }
-
-  &.btn-danger {
-    background: #D33;
-    border:1px solid red;
-    text-shadow: 0 1px 0 #D44;
-  }
-}
-
 .form-actions {
-  background: none;
+  padding: 17px 20px 18px;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  background-color: whitesmoke;
+  border-top: 1px solid #e5e5e5;
+  padding-left: 17%;
 }
 
 h3.error { color: #B94A48; }
@@ -199,23 +201,6 @@ td form {
   background: #AAA;
 }
 
-.login-box {
-  width: 400px;
-  position: relative;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  -ms-border-radius: 5px;
-  -o-border-radius: 5px;
-  border-radius: 5px;
-  margin: auto;
-  padding: 20px;
-  background: white;
-
-  input[type="email"], input[type="password"], input[type="text"], select {
-    width: 250px;
-  }
-}
-
 .table {
   th {
     background: #eee;
@@ -231,23 +216,6 @@ td form {
   margin: 0;
 }
 
-.nav-stacked {
-  li.active a {
-    font-weight: bold;
-    background: $style_color;
-    color: #FFF;
-
-    &:hover {
-      background: $style_color;
-      color: #FFF;
-    }
-  }
-
-  a {
-    background: #f9f9f9;
-  }
-}
-
 .well-list {
   @extend .unstyled;
   li {
@@ -283,27 +251,10 @@ td form {
   }
 }
 
-.project-menu {
-  a {
-    padding: 10px !important;
-  }
-}
-
 .profile-block {
   font-size: 14px;
 }
 
-.login-form {
-  .btn-success {
-    padding: 10px 20px;
-  }
-
-  input[type="text"],
-  input[type="password"] {
-    padding: 8px 14px;
-  }
-}
-
 h3 {
   font-size: 22px;
 }
@@ -340,3 +291,68 @@ h3 {
     left: 4px;
   }
 }
+
+#project_scripts {
+  font-family: monospace;
+}
+
+label {
+  &.control-label {
+    @extend .col-sm-2;
+  }
+}
+
+.prepend-top-20 { margin-top:20px }
+.append-bottom-20 { margin-bottom:20px }
+
+/**
+ * nav-pills
+ *
+ */
+.nav-pills {
+  .active a {
+    background: $style_color;
+  }
+
+  > li > a {
+    @include border-radius(0);
+  }
+
+  &.nav-stacked {
+    > li > a {
+      border-left: 4px solid #EEE;
+      padding: 12px;
+      color: #777;
+    }
+    > .active > a {
+      border-color: $style_color;
+      background: none;
+      color: #333;
+      font-weight: bolder;
+
+      &:hover {
+        background: none;
+        color: #333;
+      }
+    }
+
+    &.nav-stacked-menu {
+      li > a {
+        padding: 16px;
+      }
+    }
+  }
+
+  &.nav-pills-small {
+    > li > a {
+      padding: 8px 12px;
+      font-size: 12px;
+    }
+  }
+}
+
+.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
+
+.badge-codes-block {
+  display: none;
+}