Remove ui-box css

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 19 insertions, 175 deletions

diff --git a/app/assets/stylesheets/generic/ui_box.scss b/app/assets/stylesheets/generic/ui_box.scss
deleted file mode 100644
index 461e8e2ba59..00000000000
--- a/app/assets/stylesheets/generic/ui_box.scss
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * UI box:
- * Block element for separating information on page.
- * Used for storing issues lists, grouped data.
- * You can have multiple ui boxes on one page
- *
- * Classes:
- *   .ui-box   - for any block & widgets
- *   .ui-box.ui-box-small - same but with smaller title
- *   .ui-box.ui-box-danger - with red title
- *
- * Ex. 1: List
- *   .ui-box
- *     .title
- *       # title here
- *     %ul
- *       # content here
- *
- * Ex. 2: Block data
- *   .ui-box
- *     .title
- *       # title here
- *     .body
- *       # content here
- *
- */
-
-.ui-box {
-  background: #FFF;
-  margin-bottom: 20px;
-  border: 1px solid #DDD;
-  word-wrap: break-word;
-
-  img {
-    max-width: 100%;
-  }
-
-  pre {
-    code {
-      background: none !important;
-    }
-  }
-
-  ul {
-    margin: 0;
-    padding: 0;
-  }
-
-  .title {
-    background-color: #EEE;
-    border-bottom: 1px solid #DDD;
-    color: #666;
-    font-size: 16px;
-    text-shadow: 0 1px 1px #fff;
-    padding: 0 10px;
-    font-size: 14px;
-    line-height: 40px;
-    font-weight: normal;
-    margin: 0;
-
-    > a {
-      text-shadow: 0 1px 1px #fff;
-    }
-
-    form {
-      margin-bottom: 0;
-      margin-top: 0;
-    }
-
-    .btn {
-      vertical-align: middle;
-      padding: 4px 12px;
-      @include box-shadow(0 0px 1px 1px #f2f2f2);
-    }
-
-    .nav-pills {
-      > li {
-        > a {
-          padding: 13px;
-          margin: 0;
-          font-size: 13px;
-        }
-        &.active {
-          > a {
-            background: #D5D5D5;
-            color: $style_color;
-            @include border-radius(0);
-            border-radius: 0;
-            border-left: 1px solid #CCC;
-            border-right: 1px solid #CCC;
-          }
-        }
-      }
-    }
-  }
-
-  .body {
-    padding: 10px;
-  }
-
-  &.padded {
-    h5, .title {
-      margin: -20px;
-      margin-bottom: 0;
-      padding: 5px 20px;
-    }
-  }
-
-  .form-holder {
-    padding-top: 20px;
-    form {
-      margin-bottom: 0;
-      legend {
-        text-indent: 10px;
-      }
-      .form-actions {
-        margin-bottom: 0;
-      }
-    }
-  }
-}
-
-/*
- * Small box
- */
-.ui-box.ui-box-small {
-  margin-bottom: 10px;
-
-  .title {
-    font-size: 13px;
-    line-height: 30px;
-
-    a {
-      color: #666;
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-}
-
-/*
- * Danger box
- */
-.ui-box.ui-box-danger {
-  background: #f7f7f7;
-  border: none;
-
-  .title {
-    background: #D65;
-    color: #fff;
-    text-shadow: none;
-    font-weight: 500;
-  }
-}
-
-/*
- * Block under tw-bootstrap tabs
- */
-.tab-pane {
-  .ui-box {
-    margin: 3px 3px 25px 3px;
-  }
-}
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 15f08ccc10a..55a1d50a092 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.scss
@@ -227,5 +227,14 @@ ul.breadcrumb {
  *
  */
 .panel {
-
+  .panel-heading {
+    font-size: 14px;
+    line-height: 18px;
+
+    .panel-head-actions {
+      position: relative;
+      top: -7px;
+      float: right;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index e70757e0406..0ec21ff50fa 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -1,10 +1,11 @@
 .dashboard {
   .side {
-    .ui-box {
-      margin: 0px;
-      box-shadow: none;
-
-      .nav-projects-tabs li { padding: 0; }
+    .panel {
+      .panel-heading {
+        background: #EEE;
+        border-top-left-radius: 0;
+      }
+      border-top-left-radius: 0;
     }
   }
 }
@@ -24,9 +25,7 @@
 
 .dashboard {
   .dash-filter {
-    margin: 7px 0;
-    padding: 4px 6px;
-    width: 220px;
+    width: 205px;
     float: left;
     height: inherit;
   }
@@ -34,7 +33,7 @@
 
 @media (max-width: 1200px) {
   .dashboard .dash-filter {
-    width: 150px;
+    width: 140px;
   }
 }
 
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 520310bc433..a6ca41877a4 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -2,7 +2,7 @@
   .panel-heading
     Projects (#{projects.count})
     - if can? current_user, :create_projects, @group
-      %span.pull-right
+      .panel-head-actions
         = link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do
           %i.icon-plus
           New project