Remove CI css that exists in GitLab

app/assets/stylesheets/ci/application.scss

@@ -11,15 +11,19 @@
  *= require_self
  */
 
-@import "main/variables.scss";
-@import "main/mixins.scss";
-@import "main/fonts.scss";
-@import "main/layout.scss";
+@import "../base/fonts";
+@import "../base/variables";
+@import "../base/mixins";
+@import "../base/layout";
+@import "../base/gl_variables";
+@import "../base/gl_bootstrap";
 
 /**
- * Twitter bootstrap
+ * Customized Twitter bootstrap
  */
-@import 'bootstrap';
+@import '../base/gl_variables';
+@import '../base/gl_bootstrap';
+
 
 /**
  * Font icons
@@ -30,12 +34,13 @@
 /**
  * Generic css (forms, nav etc):
  */
-@import "generic/*";
+@import "../generic/**/*";
 
 /**
  * Page specific styles (issues, projects etc):
  */
 
+@import "xterm";
 @import "sections/*";
 
 /*
@@ -44,3 +49,7 @@
 $nprogress-color: #9BC;
 @import 'nprogress';
 @import 'nprogress-bootstrap';
+
+body {
+  padding-top: 0 !important;
+}

app/assets/stylesheets/ci/generic/avatar.scss

-.avatar {
-  float: left;
-  margin-right: 12px;
-  width: 40px;
-  height: 40px;
-  padding: 0;
-  @include border-radius($avatar_radius);
-
-  &.avatar-inline {
-    float: none;
-    margin-left: 4px;
-    margin-bottom: 2px;
-
-    &.s16 { margin-right: 4px; }
-    &.s24 { margin-right: 4px; }
-  }
-
-  &.avatar-tile {
-    @include border-radius(0px);
-  }
-
-  &.s16 { width: 16px; height: 16px; margin-right: 6px; }
-  &.s24 { width: 24px; height: 24px; margin-right: 8px; }
-  &.s26 { width: 26px; height: 26px; margin-right: 8px; }
-  &.s32 { width: 32px; height: 32px; margin-right: 10px; }
-  &.s60 { width: 60px; height: 60px; margin-right: 12px; }
-  &.s90 { width: 90px; height: 90px; margin-right: 15px; }
-  &.s160 { width: 160px; height: 160px; margin-right: 20px; }
-}

app/assets/stylesheets/ci/generic/buttons.scss

-.btn {
-  @extend .btn-default;
-
-  &.btn-save {
-    @extend .btn-primary;
-  }
-}

app/assets/stylesheets/ci/generic/callout.scss

-/*
- * Callouts from Bootstrap3 docs
- *
- * Not quite alerts, but custom and helpful notes for folks reading the docs.
- * Requires a base and modifier class.
- */
-
-/* Common styles for all types */
-.bs-callout {
-  margin: 20px 0;
-  padding: 20px;
-  border-left: 3px solid #eee;
-  color: #666;
-  background: #f9f9f9;
-}
-.bs-callout h4 {
-  margin-top: 0;
-  margin-bottom: 5px;
-}
-.bs-callout p:last-child {
-  margin-bottom: 0;
-}
-
-/* Variations */
-.bs-callout-danger {
-  background-color: #fdf7f7;
-  border-color: #eed3d7;
-  color: #b94a48;
-}
-.bs-callout-warning {
-  background-color: #faf8f0;
-  border-color: #faebcc;
-  color: #8a6d3b;
-}
-.bs-callout-info {
-  background-color: #f4f8fa;
-  border-color: #bce8f1;
-  color: #34789a;
-}
-.bs-callout-success {
-  background-color: #dff0d8;
-  border-color: #5cA64d;
-  color: #3c763d;
-}
-

app/assets/stylesheets/ci/generic/common.scss

-/** COLORS **/
-.cgray { color: gray }
-.clgray { color: #BBB }
-.cred { color: #D12F19 }
-.cgreen { color: #4a2 }
-.cblue { color: #29A }
-.cblack { color: #111 }
-.cdark { color: #444 }
-.camber { color: #ffc000 }
-.cwhite { color: #fff!important }
-.bgred { background: #F2DEDE!important }
-
-/** COMMON CLASSES **/
-.prepend-top-10 { margin-top:10px }
-.prepend-top-20 { margin-top:20px }
-.prepend-left-10 { margin-left:10px }
-.prepend-left-20 { margin-left:20px }
-.append-right-10 { margin-right:10px }
-.append-right-20 { margin-right:20px }
-.append-bottom-10 { margin-bottom:10px }
-.append-bottom-15 { margin-bottom:15px }
-.append-bottom-20 { margin-bottom:20px }
-.inline { display: inline-block }
-.padded { padding:20px }
-.ipadded { padding:20px!important }
-.lborder { border-left:1px solid #eee }
-.underlined_link { text-decoration: underline; }
-.hint { font-style: italic; color: #999; }
-.light { color: #888 }
-.tiny { font-weight: normal }
-.vtop { vertical-align: top !important; }
-
-
-.dropdown-menu > li > a {
-  text-shadow: none;
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  background: #29b;
-}
-
-.breadcrumb > li + li:before {
-  content: "/";
-  padding: 0;
-  color: #666;
-}
-
-.str-truncated {
-  display: inline-block;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  vertical-align: top;
-  white-space: nowrap;
-  max-width: 82%;
-}
-
-.page-title {
-  color: #444;
-  line-height: 1.5;
-  margin-top: 0px;
-  margin-bottom: 15px;
-}
-
-.slead {
-  margin-bottom: 18px;
-  font-size: 16px;
-  font-weight: normal;
-  line-height: 1.4;
-}
-
-.help-callout {
-  li {
-    font-size: 15px;
-    line-height: 1.6;
-  }
-}
-
-/** light list with border-bottom between li **/
-ul.bordered-list {
-  margin: 5px 0px;
-  padding: 0px;
-  li {
-    padding: 5px 0;
-    border-bottom: 1px solid #EEE;
-    overflow: hidden;
-    display: block;
-    margin: 0px;
-    &:last-child { border:none }
-    &.active {
-      background: #f9f9f9;
-      a { font-weight: bold; }
-    }
-  }
-
-  &.top-list {
-    li:first-child {
-      padding-top: 0;
-      h4, h5 {
-        margin-top: 0;
-      }
-    }
-  }
-}
-
-.underlined-title {
-  border-bottom: 1px solid #ccc;
-  padding: 0 0 3px 3px;
-}
-
-// Nav tabs
-.nav.nav-tabs {
-  li {
-    > a {
-      padding: 8px 20px;
-      margin-right: 7px;
-      line-height: 20px;
-      border-color: #EEE;
-      color: #888;
-      border-bottom: 1px solid #ddd;
-      .badge {
-        background-color: #eee;
-        color: #888;
-        text-shadow: 0 1px 1px #fff;
-      }
-      i.fa {
-        line-height: 14px;
-      }
-    }
-    &.active {
-      > a {
-        border-color: #CCC;
-        border-bottom: 1px solid #fff;
-        color: #333;
-        font-weight: bold;
-      }
-    }
-  }
-
-  &.nav-small-tabs > li > a {
-    padding: 6px 9px;
-  }
-}
-
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  color: #666;
-}
-
-.nav-small > li > a {
-  padding: 3px 5px;
-  font-size: 12px;
-}
-
-
-
-// Breadcrumb
-ul.breadcrumb {
-  background: white;
-  border: none;
-  li {
-    display: inline;
-    text-shadow: 0 1px 0 white
-  }
-
-  a {
-    font-size: 16px;
-  }
-}
-
-/**
- * fix to keep tooltips position in top navigation bar
- *
- */
-.navbar .nav > li {
-  position: relative;
-  white-space: nowrap;
-}
-
-// alerts
-.alert-disabled {
-  background-color: #e6e6e6;
-  border-color: #ebccd1;
-  color: #b0b0b0;
-}
-
-.label {
-  margin-right: 5px;
-  font-weight: normal;
-}

app/assets/stylesheets/ci/generic/forms.scss

-input[type='text'].danger {
-  background: #F2DEDE!important;
-  border-color: #D66;
-  text-shadow: 0 1px 1px #fff
-}
-
-fieldset {
-  margin-bottom: 25px;
-}
-
-.form-actions {
-  padding: 17px 20px 18px;
-  margin-top: 18px;
-  margin-bottom: 18px;
-  background-color: whitesmoke;
-  border-top: 1px solid #e5e5e5;
-  padding-left: 17%;
-}
-
-label {
-  &.control-label {
-    @extend .col-sm-2;
-  }
-
-  &.inline-label {
-    margin: 0;
-  }
-}

app/assets/stylesheets/ci/generic/tables.scss

-table {
-  &.table {
-    tr {
-      td, th {
-        padding: 8px 10px;
-        line-height: 20px;
-        vertical-align: middle;
-      }
-      th {
-        font-weight: normal;
-        font-size: 15px;
-        border-bottom: 1px solid #CCC !important;
-      }
-      td {
-        border-color: #F1F1F1 !important;
-        border-bottom: 1px solid;
-      }
-    }
-  }
-}

app/assets/stylesheets/ci/generic/typography.scss

-h6 {
-  color: #888;
-  text-transform: uppercase;
-}
-
-pre {
-  font-family: $monospace_font;
-
-  &.dark {
-    background: #333;
-    color: #f5f5f5;
-  }
-}
-
-/**
- * Links
- *
- */
-a {
-  outline: none;
-  color: $link_color;
-  &:hover {
-    text-decoration: none;
-    color: $primary_color;
-  }
-
-  &:focus {
-    text-decoration: underline;
-  }
-
-  &.dark {
-    color: $style_color;
-  }
-
-  &.lined {
-    text-decoration: underline;
-    &:hover { text-decoration: underline; }
-  }
-
-  &.gray {
-    color: gray;
-  }
-
-  &.supp_diff_link {
-    text-align: center;
-    padding: 20px 0;
-    background: #f1f1f1;
-    width: 100%;
-    float: left;
-  }
-
-  &.neib  {
-    margin-right: 15px;
-  }
-}
-
-a:focus {
-  outline: none;
-}
-
-.monospace {
-  font-family: $monospace_font;
-}

app/assets/stylesheets/ci/main/fonts.scss

-/** Typo **/
-$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;

app/assets/stylesheets/ci/main/layout.scss

-html {
-  overflow-y: scroll;
-
-  &.touch .tooltip { display: none !important; }
-}
-
-body {
-  margin-bottom: 20px;
-}
-
-.container {
-  padding-top: 0;
-  z-index: 5;
-}
-
-.container .content {
-  margin: 0 0;
-}

app/assets/stylesheets/ci/main/mixins.scss

-@mixin box-shadow($shadow) {
-  -webkit-box-shadow: $shadow;
-  -moz-box-shadow: $shadow;
-  -ms-box-shadow: $shadow;
-  -o-box-shadow: $shadow;
-  box-shadow: $shadow;
-}
-
-@mixin border-radius($radius) {
-  -webkit-border-radius: $radius;
-  -moz-border-radius: $radius;
-  -ms-border-radius: $radius;
-  -o-border-radius: $radius;
-  border-radius: $radius;
-}
-
-@mixin linear-gradient($from, $to) {
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
-  background-image: -webkit-linear-gradient($from, $to);
-  background-image: -moz-linear-gradient($from, $to);
-  background-image: -ms-linear-gradient($from, $to);
-  background-image: -o-linear-gradient($from, $to);
-}
-
-@mixin transition($transition) {
-  -webkit-transition: $transition;
-  -moz-transition: $transition;
-  -ms-transition: $transition;
-  -o-transition: $transition;
-  transition: $transition;
-}

app/assets/stylesheets/ci/main/variables.scss

-/**
- * General Colors
- */
-$primary_color: #2FA0BB;
-$link_color: #3A89A3;
-$style_color: #246;
-$bg_style_color: #246;
-$hover: #D9EDF7;
-
-/*
- * Success colors (green)
- */
-$border_success: #019875;
-$bg_success: #019875;
-
-/*
- * Danger colors (red)
- */
-$border_danger: #d43f3a;
-$bg_danger: #d9534f;
-
-/*
- * Primary colors (blue)
- */
-$border_primary: #246;
-$bg_primary: #246;
-
-/*
- * Warning colors (yellow)
- */
-$bg_warning: #EB9532;
-$border_warning: #EB9532;
-
-/**
- * Twitter bootstrap variables
- */
-$font-size-base: 13px !default;
-$nav-pills-active-link-hover-bg: $bg_style_color;
-$pagination-active-bg: $bg_style_color;
-
-/**
- * Avatar variables
- */
-$avatar_radius: 50%;

app/assets/stylesheets/ci/sections/navbar.scss

@@ -3,7 +3,7 @@
 }
 
 .navbar-ci {
-  background: $style_color;
+  background: #224466;
 
   .navbar-brand {
     color: #fff;

app/views/layouts/ci/_nav.html.haml

@@ -19,7 +19,7 @@
       %ul.nav.navbar-nav.pull-right
         - if current_user
           %li
-            = link_to new_user_session_path do
+            = link_to "/profile", no_turbolink do
               .profile-holder
                 = image_tag user_avatar_url(current_user, 64), class: 'avatar s32', alt: ''
                 %span= current_user.name

app/views/layouts/ci/admin.html.haml

@@ -9,9 +9,10 @@
         = yield(:title)
       %hr
 
-    .container
-      .row
-        .col-md-2.append-bottom-20
-          = render 'layouts/ci/nav_admin'
-        .col-md-10
-          = yield
+    .container.container-body
+      .content
+        .row
+          .col-md-2.append-bottom-20
+            = render 'layouts/ci/nav_admin'
+          .col-md-10
+            = yield

app/views/layouts/ci/application.html.haml

@@ -10,4 +10,5 @@
       %hr
 
     .container.container-body
-      = yield
+      .content
+        = yield

app/views/layouts/ci/empty.html.haml

@@ -9,5 +9,6 @@
       %hr
 
     .container.container-body
-      = yield
+      .content
+        = yield
 

app/views/layouts/ci/project.html.haml

@@ -15,12 +15,13 @@
         .pull-right
           = link_to 'View on GitLab', @project.gitlab_url, no_turbolink.merge( class: 'btn btn-sm' )
     %hr
-    .container
-      - if current_user && can?(current_user, :manage_project, gl_project)
-        .row
-          .col-md-2.append-bottom-20
-            = render 'layouts/ci/nav_project'
-          .col-md-10
-            = yield
-      - else
-        = yield
+    .container.container-body
+      .content
+        - if current_user && can?(current_user, :manage_project, gl_project)
+          .row
+            .col-md-2.append-bottom-20
+              = render 'layouts/ci/nav_project'
+            .col-md-10
+              = yield
+        - else
+          = yield