Truncate fix, remove unneeded admin-specific css

5 files changed, 28 insertions, 54 deletions

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 57db5eaa2b3..fbcb2659585 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -1,8 +1,3 @@
-.light-well {
-  background-color: $background-color;
-  padding: 15px;
-}
-
 .centered-light-block {
   text-align: center;
   color: $gl-gray;
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 16646e33a4b..b662282aa1d 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -379,7 +379,9 @@ table {
   border-top: 1px solid $border-color;
 }
 
-.hide-bottom-border { border-bottom: none !important; }
+.hide-bottom-border {
+  border-bottom: none !important;
+}
 
 .gl-accessibility {
   &:focus {
@@ -396,3 +398,9 @@ table {
     z-index: 1;
   }
 }
+
+.str-truncated {
+  &-60 {
+    @include str-truncated(60%);
+  }
+}
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 192939f4527..f2860dfe84d 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -43,3 +43,16 @@
     background-color: $well-expand-item;
   }
 }
+
+.light-well {
+  background-color: $background-color;
+  padding: 15px;
+}
+
+.well-centered {
+  h1 {
+    font-weight: normal;
+    text-align: center;
+    font-size: 48px;
+  }
+}
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss
index 44eac21b143..dbf9db39651 100644
--- a/app/assets/stylesheets/pages/admin.scss
+++ b/app/assets/stylesheets/pages/admin.scss
@@ -2,48 +2,6 @@
  * Admin area
  *
  */
-.admin-dashboard {
-  .data {
-    a {
-      h1 {
-        line-height: 48px;
-        font-size: 48px;
-        padding: 20px;
-        text-align: center;
-        font-weight: normal;
-      }
-    }
-  }
-
-  .str-truncated {
-    max-width: 60%;
-  }
-}
-
-.admin-filter form {
-  .select2-container {
-    width: 100%;
-  }
-
-  .controls {
-    margin-left: 130px;
-  }
-
-  .form-actions {
-    padding-left: 130px;
-    background: $white-light;
-   }
-
-  .visibility-levels {
-    .controls {
-      margin-bottom: 9px;
-    }
-
-    i {
-      color: inherit;
-    }
-  }
-}
 
 .broadcast-messages {
   .message {
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 1db2150f336..e51f4ac1d93 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -113,7 +113,7 @@
     %hr
     .row
       .col-sm-4
-        .light-well
+        .light-well.well-centered
           %h4 Projects
           .data
             = link_to admin_namespaces_projects_path do
@@ -121,7 +121,7 @@
             %hr
             = link_to('New Project', new_project_path, class: "btn btn-new")
       .col-sm-4
-        .light-well
+        .light-well.well-centered
           %h4 Users
           .data
             = link_to admin_users_path do
@@ -129,7 +129,7 @@
             %hr
             = link_to 'New User', new_admin_user_path, class: "btn btn-new"
       .col-sm-4
-        .light-well
+        .light-well.well-centered
           %h4 Groups
           .data
             = link_to admin_groups_path do
@@ -143,7 +143,7 @@
         %hr
         - @projects.each do |project|
           %p
-            = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated'
+            = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60'
             %span.light.pull-right
               #{time_ago_with_tooltip(project.created_at)}
 
@@ -152,7 +152,7 @@
         %hr
         - @users.each do |user|
           %p
-            = link_to [:admin, user], class: 'str-truncated' do
+            = link_to [:admin, user], class: 'str-truncated-60' do
               = user.name
             %span.light.pull-right
               #{time_ago_with_tooltip(user.created_at)}
@@ -162,7 +162,7 @@
         %hr
         - @groups.each do |group|
           %p
-            = link_to [:admin, group], class: 'str-truncated' do
+            = link_to [:admin, group], class: 'str-truncated-60' do
               = group.name
             %span.light.pull-right
               #{time_ago_with_tooltip(group.created_at)}