diff --git a/app/assets/images/applications.svg b/app/assets/images/applications.svg
new file mode 100644
index 0000000..2aa100e
--- /dev/null
+++ b/app/assets/images/applications.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/data.svg b/app/assets/images/data.svg
new file mode 100644
index 0000000..a06b89a
--- /dev/null
+++ b/app/assets/images/data.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/experiment.svg b/app/assets/images/experiment.svg
new file mode 100644
index 0000000..c0496dd
--- /dev/null
+++ b/app/assets/images/experiment.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/funds-screenshot.png b/app/assets/images/funds-screenshot.png
new file mode 100644
index 0000000..48a9d5c
Binary files /dev/null and b/app/assets/images/funds-screenshot.png differ
diff --git a/app/assets/images/indexes.svg b/app/assets/images/indexes.svg
new file mode 100644
index 0000000..9fa21eb
--- /dev/null
+++ b/app/assets/images/indexes.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/logo-chan-z.png b/app/assets/images/logo-chan-z.png
new file mode 100644
index 0000000..bf09c4a
Binary files /dev/null and b/app/assets/images/logo-chan-z.png differ
diff --git a/app/assets/images/logo-microsoft.png b/app/assets/images/logo-microsoft.png
new file mode 100644
index 0000000..122d309
Binary files /dev/null and b/app/assets/images/logo-microsoft.png differ
diff --git a/app/assets/images/logo-osc-white.png b/app/assets/images/logo-osc-white.png
new file mode 100644
index 0000000..d1f9911
Binary files /dev/null and b/app/assets/images/logo-osc-white.png differ
diff --git a/app/assets/images/logo-osc.png b/app/assets/images/logo-osc.png
new file mode 100644
index 0000000..4506990
Binary files /dev/null and b/app/assets/images/logo-osc.png differ
diff --git a/app/assets/images/logo-schmidt-white.svg b/app/assets/images/logo-schmidt-white.svg
new file mode 100644
index 0000000..6a533b2
--- /dev/null
+++ b/app/assets/images/logo-schmidt-white.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/logo-snyk-white.svg b/app/assets/images/logo-snyk-white.svg
new file mode 100644
index 0000000..3ba4d6f
--- /dev/null
+++ b/app/assets/images/logo-snyk-white.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/logo-snyk.svg b/app/assets/images/logo-snyk.svg
new file mode 100644
index 0000000..ca73928
--- /dev/null
+++ b/app/assets/images/logo-snyk.svg
@@ -0,0 +1,22 @@
+
diff --git a/app/assets/images/logo-socket-white.png b/app/assets/images/logo-socket-white.png
new file mode 100644
index 0000000..f34cd59
Binary files /dev/null and b/app/assets/images/logo-socket-white.png differ
diff --git a/app/assets/images/logo-socket.png b/app/assets/images/logo-socket.png
new file mode 100644
index 0000000..f5864f8
Binary files /dev/null and b/app/assets/images/logo-socket.png differ
diff --git a/app/assets/images/stone-1.svg b/app/assets/images/stone-1.svg
index a9f3c0a..b95cc64 100644
--- a/app/assets/images/stone-1.svg
+++ b/app/assets/images/stone-1.svg
@@ -1,9 +1 @@
-
+
\ No newline at end of file
diff --git a/app/assets/images/stone-2.svg b/app/assets/images/stone-2.svg
new file mode 100644
index 0000000..5babcec
--- /dev/null
+++ b/app/assets/images/stone-2.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/stone-3.svg b/app/assets/images/stone-3.svg
new file mode 100644
index 0000000..f63ccda
--- /dev/null
+++ b/app/assets/images/stone-3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/images/tools.svg b/app/assets/images/tools.svg
new file mode 100644
index 0000000..ece41e5
--- /dev/null
+++ b/app/assets/images/tools.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/assets/stylesheets/ecosystems.scss b/app/assets/stylesheets/ecosystems.scss
index c84f0ff..31b4c64 100644
--- a/app/assets/stylesheets/ecosystems.scss
+++ b/app/assets/stylesheets/ecosystems.scss
@@ -21,39 +21,14 @@ $color-grey: #DCDCE0;
$color-grey-dark: #4C4C61;
/* Tokens to override bootstrap colours */
-$bootstrap-primary: $color-purple;
-$bootstrap-secondary: $color-grey;
-$bootstrap-success: $color-green;
-$bootstrap-info: $color-purple-light;
-$bootstrap-warning: $color-orange-light;
-$bootstrap-danger: $color-orange-dark;
-$bootstrap-light: $color-grey-light;
-$bootstrap-dark: $color-black;
-
-/* Bootstrap SCSS colour variables */
-$theme-colors: (
- "primary": $bootstrap-primary,
- "secondary": $bootstrap-secondary,
- "success": $bootstrap-success,
- "info": $bootstrap-info,
- "warning": $bootstrap-warning,
- "danger": $bootstrap-danger,
- "light": $bootstrap-light,
- "dark": $bootstrap-dark
-);
-
-/* Bootstrap CSS colour variables */
-:root {
- --bs-primary: $bootstrap-primary;
- --bs-success: $bootstrap-success;
- --bs-danger: $bootstrap-danger;
- --bs-warning: $bootstrap-warning;
- --bs-info: $bootstrap-info;
- --bs-light: $bootstrap-light;
- --bs-dark: $bootstrap-dark;
- --bs-list-group-border-color: $color-purple-light;
- --bs-pagination-color: $color-purple-dark;
-}
+$primary: $color-purple;
+$secondary: $color-grey;
+$success: $color-green;
+$info: $color-purple-light;
+$warning: $color-orange-light;
+$danger: $color-orange-dark;
+$light: $color-grey-light;
+$dark: $color-black;
/* Typography */
$font-family-base: "Inter", sans-serif;
@@ -73,6 +48,9 @@ $headings-font-weight: 700;
$display-font-weight: 900;
$lead-font-weight: 400;
+$link-color: $color-purple-dark;
+$link-hover-color: $color-purple;
+
$transition-collapse: height .35s ease;
$btn-padding-y: 0.5em;
@@ -80,6 +58,9 @@ $btn-padding-x: 1em;
$btn-font-weight: 600;
$btn-color: $color-white;
+$badge-font-weight: 400;
+$badge-padding-y: 0.4em;
+
@import "bootstrap";
@mixin spesh-link (
@@ -210,44 +191,12 @@ $btn-color: $color-white;
border: 0;
}
-.alert-primary {
- background-color: lighten($color-purple-light, 4%);
- color: $color-black;
-}
-
-.alert-secondary {
- background-color: $color-grey-light;
- color: $color-black;
-}
-
-.alert-success {
- background-color: lighten($color-green-light, 8%);
- color: darken( $color-green-dark, 25%);
-}
-
-.alert-danger {
- background-color: lighten($color-orange-light, 4%);
- color: darken( $color-orange-dark, 45%);
-}
-
-.alert-warning {
- background-color: lighten($color-orange-light, 12%);
- color: darken( $color-orange-dark, 23%);
-}
-
-.alert-info {
- background-color: lighten($color-purple-light, 12%);
- color: darken( $color-purple-dark, 33%);
-}
-
-.alert-light {
- background-color: $color-grey-light;
- color: lighten( $color-black, 33%);
-}
-
.alert-dark {
background-color: $color-grey-dark;
color: $color-white;
+ a {
+ color: $color-white;
+ }
}
hr {
@@ -272,7 +221,6 @@ body {
font-optical-sizing: auto;
}
-
.header__global {
width: 100%;
}
@@ -529,12 +477,6 @@ body {
font-weight: 800;
}
-.badge {
- background-color: $color-purple-light;
- font-weight: normal;
- color: $color-black;
-}
-
.well {
background-color: $color-grey-light;
border-radius: $border-radius;
@@ -710,21 +652,10 @@ body {
max-width: 150px;
}
-
-//pagination
-.page-link {
- color: $color-purple-dark;
- border-color: $color-grey;
- &:hover {
- color: $color-purple;
- }
+.bg-secondary {
+ color: $color-black;
}
-.page-link.active, .active > .page-link {
- background-color: $color-purple-dark;
- border-color: $color-purple-dark;
- }
-
.listing {
border: 0;
border-radius: 0;
@@ -794,3 +725,49 @@ body {
border-bottom-right-radius: 800px;
}
}
+
+
+// Form validation
+.invalid-feedback {
+ color: $color-orange-dark;
+}
+
+.was-validated .form-control:valid,
+.form-control.is-valid {
+ border-color: $color-green-dark;
+}
+
+.valid-feedback {
+ color: $color-green-darker;
+}
+
+.sidebar {
+ background-color: $color-grey-light;
+ p {
+ @include font-size(1rem);
+ }
+ h2 {
+ @include font-size(1.25rem);
+
+ border-top: 1px solid $color-purple-light;
+ padding-top: 1rem;
+ &:first-of-type {
+ border-top: 0;
+ padding-top: 0;
+ }
+ }
+
+ h3 {
+ @include font-size(1rem);
+
+ }
+
+ code {
+ color: $color-purple-dark;
+ }
+
+ a {
+ @include spesh-link();
+ line-break: anywhere;
+ }
+}
\ No newline at end of file
diff --git a/lib/tasks/ecosystems.rake b/lib/tasks/ecosystems.rake
index b45dc5f..ad47660 100644
--- a/lib/tasks/ecosystems.rake
+++ b/lib/tasks/ecosystems.rake
@@ -1,6 +1,6 @@
namespace :ecosystems do
task :update_shared_assets do
- shared_asset_repo = "https://github.com/ecosyste-ms/advisories"
+ shared_asset_repo = "https://github.com/ecosyste-ms/documentation"
branch = "main"
temp_dir = "tmp/ecosystems_assets"
ecosystems_rake_path = "lib/tasks/ecosystems.rake"
@@ -37,7 +37,6 @@ namespace :ecosystems do
# Copy required files
`cp #{temp_rake_file} #{ecosystems_rake_path}`
- `cp #{temp_dir}/app/views/shared/_header.html.erb app/views/shared/`
`cp #{temp_dir}/app/views/shared/_footer.html.erb app/views/shared/`
`cp #{temp_dir}/app/views/layouts/application.html.erb app/views/layouts/`
`cp #{temp_dir}/app/assets/stylesheets/ecosystems.scss app/assets/stylesheets/`
@@ -50,7 +49,13 @@ namespace :ecosystems do
unless File.exist?(menu_file)
`cp #{temp_dir}/app/views/shared/_menu.html.erb #{menu_file}`
end
-
+
+ # Copy _header.html.erb only if it does not already exist
+ header_file = "app/views/shared/_header.html.erb"
+ unless File.exist?(header_file)
+ `cp #{temp_dir}/app/views/shared/_header.html.erb #{header_file}`
+ end
+
# Cleanup
`rm -rf #{temp_dir}`