diff --git a/app/assets/stylesheets/_dashboard.scss b/app/assets/stylesheets/_dashboard.scss index 4db48535..1f67302a 100644 --- a/app/assets/stylesheets/_dashboard.scss +++ b/app/assets/stylesheets/_dashboard.scss @@ -37,73 +37,96 @@ } #projects-listing, #projects-listing-pending, #projects-listing-approved { - table-layout: fixed; - border: 1px solid $gray-20; - border-radius: 3px; - padding: 5px 0px; - align-items: center; - gap: 16px; - color: $gray-60; - font-size: 12px; - font-style: normal; - font-weight: 400; - line-height: 18px; - width: 100%; - a { - text-decoration: none !important; + + table-layout: fixed; + border: 1px solid $gray-20; + border-radius: 3px; + padding: 5px 0px; + align-items: center; + gap: 16px; + color: $gray-60; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 18px; + width: 100%; + + .projects { + + &-caption { + caption-side: top; + } + + &-tabs { + align-content: center; + } + + &-filter { + text-align: center; + + &-btn { + height: 100%; + } } - thead .project th, tbody .project td { + } + + a { + text-decoration: none !important; + } + + thead .project th, tbody .project td { + border: none; + } + + .project { + display: flex; + flex-wrap: wrap; + font-family: $libre-franklin; + border-bottom: 1px solid $gray-20; + background: $white; + padding: 12px; + align-items: center; + gap: 8px; + align-self: stretch; + + td:first-child { + width: 100%; + } + + td: { border: none; } - - .project { - display: flex; - flex-wrap: wrap; - font-family: $libre-franklin; - border-bottom: 1px solid $gray-20; - background: $white; - padding: 12px; - align-items: center; - gap: 8px; - align-self: stretch; - - td:first-child { - width: 100%; - } - - td: { - border: none; - } - - h2 { - display: block; - overflow: hidden; - text-overflow: ellipsis; - color: $black; - font-family: $libre-franklin; - font-size: 16px !important; - font-style: normal; - font-weight: 600; - line-height: 24px; - text-decoration: none; - } - .details { - display: flex; - padding: 5px 0px; - align-items: center; - gap: 16px; - color: $gray-60; - font-size: 12px; - font-style: normal; - font-weight: 400; - line-height: 18px; - li { - float: left; - list-style: none; - padding: 0em .2em 0em 2em; - } - } + + h2 { + display: block; + overflow: hidden; + text-overflow: ellipsis; + color: $black; + font-family: $libre-franklin; + font-size: 16px !important; + font-style: normal; + font-weight: 600; + line-height: 24px; + text-decoration: none; + } + + .details { + display: flex; + padding: 5px 0px; + align-items: center; + gap: 16px; + color: $gray-60; + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 18px; + + li { + float: left; + list-style: none; + padding: 0em .2em 0em 2em; + } } .last { @@ -181,11 +204,11 @@ height: 20px; vertical-align: top; } - + } } #admin-listing { .section { margin-top: 2em; } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/_projects.scss b/app/assets/stylesheets/_projects.scss index d394efec..c5b6476c 100644 --- a/app/assets/stylesheets/_projects.scss +++ b/app/assets/stylesheets/_projects.scss @@ -51,7 +51,7 @@ padding-left: 20px; color: $red-darker; } - + #project-description { color: $black; font-family: "Libre Franklin"; diff --git a/app/javascript/entrypoints/pulDataTables.js b/app/javascript/entrypoints/pulDataTables.js index 759e47d8..47b7a117 100644 --- a/app/javascript/entrypoints/pulDataTables.js +++ b/app/javascript/entrypoints/pulDataTables.js @@ -19,7 +19,9 @@ export function setupTable(tableId) { // If we have a table initialize it with DataTables if (table) { - table.dataTable(datasetOptions); + if (table.dataTable) { + table.dataTable(datasetOptions); + } } } diff --git a/app/views/welcome/_projects_listing.html.erb b/app/views/welcome/_projects_listing.html.erb index 84b0458d..e601419d 100644 --- a/app/views/welcome/_projects_listing.html.erb +++ b/app/views/welcome/_projects_listing.html.erb @@ -1,18 +1,70 @@
- - - - - - - - - - - - - <%= render :partial => "project_list_view", :collection => projects, :as => :project %> - -
titlestatustype - roledownloadactivityquota_usage
-
\ No newline at end of file + + + + + + + + + + + + + + <%= render :partial => "project_list_view", :collection => projects, :as => :project %> + +
+ +
+
+ +
+ +
+ +
+ +
+
+
+
titlestatustype + roledownloadactivityquota_usage
+