Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and update customization docs #4478

Merged
merged 44 commits into from
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
2989e8b
Fixes #4335: Create Stratos static web site with better documentation
vvaradhan Jul 13, 2020
45cd11c
1) Re-organize some more existing doc files.
vvaradhan Jul 13, 2020
d26b948
Landing Page WIP
nwmac Jul 20, 2020
7181236
Documentation tweaks
nwmac Jul 20, 2020
5b394a0
Use better action names
nwmac Jul 20, 2020
bcb5529
More visual improvements to landing page
nwmac Jul 20, 2020
5741bf9
More doc and landing page improvements
nwmac Jul 22, 2020
7383f69
Remove publish workflow for now
nwmac Jul 22, 2020
208baa0
Typo fix
nwmac Jul 22, 2020
fff9924
Moer documentation improvements
nwmac Jul 22, 2020
2bbb535
Remove extra title from helm doc
nwmac Jul 22, 2020
388245c
Fix script when used from npm
nwmac Jul 22, 2020
796729c
Improve layout on mobile devices
nwmac Jul 22, 2020
17aaf09
More documentation improvements
nwmac Jul 22, 2020
3f093d4
Fix typo
nwmac Jul 22, 2020
fd17825
Merge downstream (#4441)
richard-cox Jul 20, 2020
dd34fc5
Show all favorites for an endpoint favorite if there is only one (#4440)
nwmac Jul 20, 2020
244f9fe
Merge downstream - JSON Viewer with dark mode & Header Fixes (#4444)
richard-cox Jul 20, 2020
9c94d60
Fix issues with tests not running if build upload fails (#4453)
nwmac Jul 21, 2020
56f0389
Improve autoscaler e2e logging (#4456)
richard-cox Jul 21, 2020
a4e14c1
Fix check-e2e-pr.sh for pr's from other repos (#4459)
richard-cox Jul 21, 2020
560b524
Convert Client Secret Input Fields to `password` (#4455)
richard-cox Jul 21, 2020
17f4f11
Insecure tlsv10 and tlsv11 ciphers in Stratos UI, bsc#1173295 (#411) …
richard-cox Jul 21, 2020
de9fb7a
[Security] Bump codecov from 3.7.0 to 3.7.1 (#4457)
dependabot-preview[bot] Jul 21, 2020
85290ad
Bump lodash from 4.17.15 to 4.17.19 (#4452)
dependabot[bot] Jul 21, 2020
e3ae282
Website update: Wed 22 Jul 2020 21:55:00 BST
nwmac Jul 22, 2020
99bd6ad
Website update: Wed 22 Jul 2020 21:56:45 BST
nwmac Jul 22, 2020
71bf0ad
Website update: Wed 22 Jul 2020 21:58:22 BST
nwmac Jul 22, 2020
43ffaf6
Remove dist
nwmac Jul 22, 2020
fa55ff2
FIx deploy script to remove old files
nwmac Jul 22, 2020
7147c81
Moer tidy ups
nwmac Jul 23, 2020
c3c9c73
Add CNAME file when publishing
nwmac Jul 23, 2020
67b08dc
Add talks doc
nwmac Jul 23, 2020
f659099
* Fix broken links due to reorganization of documents
vvaradhan Jul 24, 2020
b9bdeda
* Fix Getting Started broken link in page footer
vvaradhan Jul 24, 2020
fbd53ae
Only publish if there are website changes
nwmac Jul 24, 2020
ca1e052
Merge remote-tracking branch 'origin/master' into website
nwmac Jul 24, 2020
a47e5dd
Remove old doc
nwmac Jul 24, 2020
e4785a6
Publish website on merge
nwmac Jul 24, 2020
8b9dc27
Apply new theming process to acme example
richard-cox Jul 28, 2020
092bf5f
First pass at customization docs, most of themeing done
richard-cox Jul 28, 2020
993a137
Final pass at customization docs
richard-cox Jul 29, 2020
1de99e3
Merge remote-tracking branch 'origin/master' into customization-docs
richard-cox Aug 7, 2020
02fc006
Merge fixes
richard-cox Aug 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@ src/frontend/sass
go-vendor-*.tgz

website/build
website/site-dist
website/site-dist
website/.docusaurus
4 changes: 2 additions & 2 deletions docs/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

### Actual behaviour

### Steps to reproduce the behaviour
### Steps to reproduce the behavior

### Log output covering before error and any error statements
```
Insert your log here
Insert log hereCopy
```


Expand Down
6 changes: 6 additions & 0 deletions docs/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
---
id: pull_request_template
title: Pull request template for contributions to Stratos
sidebar_label: PR template
---

<!--- Provide a general summary of your changes in the Title above -->

## Description
Expand Down
56 changes: 54 additions & 2 deletions src/frontend/packages/example-theme/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,60 @@

// Custom Theme
@import './sass/custom';
@import './sass/custom/acme-colors';

// Style overrides
@import './sass/custom/acme';

@function stratos-theme() {
$theme: stratos-theme-helper($stratos-theme);
@return $theme
}
@return (
default: create-custom-theme($stratos-theme),
dark: create-dark-theme()
);
}

@function create-custom-theme($base-theme) {
$theme: stratos-theme-helper($base-theme);

// Modify some of the colors
$app-theme: map-get($theme, app-theme);
$app-theme: map-merge($app-theme, (
header-background-color: $acme-text,
header-foreground-color: $acme-dark-gray,
header-background-span: false,
stratos-title-show-text: true,
user-avatar-background-color: $acme-text,
user-avatar-foreground-color: $acme-primary-color,
user-avatar-header-invert-colors: false,
side-nav: (
background: $acme-dark-gray,
text: $acme-text-gray,
active: $acme-side-nav-active,
active-text: $acme-text-gray,
hover: $acme-side-nav-active,
hover-text: $acme-text-gray
)
));

$theme: map-merge($theme, (
app-theme: $app-theme
));

@return $theme;
}

@function create-dark-theme() {
$theme: create-custom-theme($stratos-dark-theme);

$app-theme: map-get($theme, app-theme);
$app-theme: map-merge($app-theme, (
header-background-color: $acme-dark-gray,
header-foreground-color: $acme-text,
));

$theme: map-merge($theme, (
app-theme: $app-theme
));
@return $theme;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/frontend/packages/example-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"assets/core": "core/assets",
"assets/favicon.ico": "favicon.ico"
},
"theme":{
"theme": {
"loadingCss": "loader/loading.css",
"loadingHtml": "loader/loading.html"
}
Expand Down
2 changes: 0 additions & 2 deletions src/frontend/packages/example-theme/sass/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ $stratos-dark-theme: mat-dark-theme($acme-theme-primary, $acme-theme-primary, $a

// Default Theme
$stratos-theme: mat-light-theme($acme-theme-primary, $acme-theme-primary, $acme-theme-warn);

@import 'custom/acme';
16 changes: 16 additions & 0 deletions src/frontend/packages/example-theme/sass/custom/acme-colors.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
// These colors need tidying, some aren't used

$acme-primary: #00c081;
$acme-secondary: #00243e;
$acme-text: #fff;
$acme-text-gray: #ccc;
$acme-button-gray: #888;
$acme-dark-blue: #06253a;
$acme-blue: #073155;

// Acme Brand primary colour
$acme-primary-color: #035a97;

// Secondary blue colour
$acme-secondary: #035a97;
$acme-text: #fff;
$acme-text-gray: #ccc;
$acme-dark-blue: #06253a;
$acme-blue: #073155;
$acme-side-nav: $acme-secondary;
$acme-side-nav-active: #003358;

$acme-dark-gray: #333
70 changes: 5 additions & 65 deletions src/frontend/packages/example-theme/sass/custom/acme.scss
Original file line number Diff line number Diff line change
@@ -1,71 +1,11 @@
// Style overrides
// Acme Brand primary colour
$acme-primary-color: #035a97;
@import './acme-colors';

// Secondary blue colour
$acme-secondary: #035a97;
$acme-text: #fff;
$acme-text-gray: #ccc;
$acme-dark-blue: #06253a;
$acme-blue: #073155;
$acme-side-nav: $acme-secondary;
$acme-side-nav-active: #003358;
// Style overrides

body.stratos {
app-page-subheader {
.page-subheader {
background-color: #fff;
color: #333;
}
}

.page-header__divider {
color: #333;
}

.page-header__menu-button-icon {
background-color: $acme-primary-color;
color: $acme-text;
}

.mat-tab-nav-bar.mat-primary.mat-background-primary {
.mat-tab-links {
background-color: #fff;
color: #333;
}
.mat-tab-link {
color: #333;
}
.mat-ink-bar {
background-color: $acme-primary-color;
.favorite-list {
.app-no-content-container {
color: $acme-dark-blue;
}
}

.stratos-title__logo {
width: 160px;
}

.page-header .mat-toolbar.mat-primary {
background-color: #fff;
color: #333;
}

// Use Acme Blue Side Navigation
.side-nav,
.side-nav__top,
.side-nav__item--active:hover {
background-color: $acme-side-nav;
}
.side-nav__item--active,
.side-nav__item:hover {
background-color: $acme-side-nav-active;
}
.side-nav__bottom {
color: $acme-text-gray;
}

// Show the text Stratos beneath the Acme logo
.stratos-title > .stratos-title__header {
display: inline-block;
}
}
4 changes: 2 additions & 2 deletions website/docs/extensions/backend.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Currently, to create an extension to the backend:

1. Build Jetstream

> Note: There are a few plugins in the `src/jetstream/plugins` folder that should help serve as examples of how to write a plugin.
> There are a few plugins in the `src/jetstream/plugins` folder that should help serve as examples of how to write a plugin.

> Note: Jetstream uses the [Echo web server](https://echo.labstack.com/) from Labstack - some familiarity with this is required when developing backend plugins.
> Jetstream uses the [Echo web server](https://echo.labstack.com/) from Labstack - some familiarity with this is required when developing backend plugins.
## Plugin Interface

All plugins must implement the interface `interfaces.StratosPlugin` - this is defined in `src/jetstream/repository/interfaces/plugin.go`.
Expand Down
154 changes: 0 additions & 154 deletions website/docs/extensions/customizing.md

This file was deleted.

Loading