Skip to content

Commit 15cf01d

Browse files
authored
Merge pull request #67 from anmol372/expNetlify
Improve look and feel of olm site
2 parents eed7c52 + bc29dd5 commit 15cf01d

File tree

15 files changed

+298
-32
lines changed

15 files changed

+298
-32
lines changed

assets/scss/_docs.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.td-sidebar-nav .td-sidebar-link__page {
22
color: #222;
3-
font-weight: normal;
3+
//font-weight: normal;
44
}
55

66
.of-docs__wrapper {
@@ -11,12 +11,13 @@
1111
list-style: disc;
1212
margin-left: 2rem;
1313
}
14-
.td-sidebar-nav .td-sidebar-link__page {
14+
.td-sidebar-nav .td-sidebar-link__page {
1515
font-weight: normal;
1616
}
1717
h1,h2,h3,h4,h5,h6 {
1818
color: var(--of--Color--brand--200);
1919
font-weight: 800;
20+
letter-spacing: 2px;
2021
margin: var(--of--spacer--md) 0 var(--of--spacer--sm);
2122

2223
a:hover {

assets/scss/_sidebar-tree.scss

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
//
2+
// Left side navigation
3+
//
4+
.td-sidebar-nav {
5+
padding-right: 0.5rem;
6+
margin-right: -15px;
7+
margin-left: -15px;
8+
9+
@include media-breakpoint-up(md) {
10+
@supports (position: sticky) {
11+
// max-height: calc(100vh - 10rem);
12+
max-height: calc(100vh - 4rem);
13+
overflow-y: auto;
14+
}
15+
}
16+
17+
18+
@include media-breakpoint-up(md) {
19+
display: block !important;
20+
}
21+
22+
23+
&__section {
24+
li {
25+
list-style: none;
26+
}
27+
28+
ul {
29+
padding: 0;
30+
margin: 0;
31+
}
32+
33+
@include media-breakpoint-up(md) {
34+
& > ul {
35+
padding-left: .5rem;
36+
}
37+
}
38+
39+
40+
padding-left: 0;
41+
}
42+
43+
&__section-title {
44+
display: block;
45+
//font-weight: $font-weight-medium;
46+
font-weight: 550;
47+
48+
.active {
49+
//font-weight: $font-weight-bold;
50+
font-weight: 800;
51+
color: $gray-900;
52+
}
53+
54+
a {
55+
color: $gray-700;
56+
}
57+
}
58+
59+
.td-sidebar-link {
60+
display: block;
61+
padding-bottom: 0.375rem;
62+
63+
&__page {
64+
color: $gray-600;
65+
font-weight: $font-weight-light;
66+
}
67+
}
68+
69+
a {
70+
&:hover {
71+
color: $blue;
72+
text-decoration: none;
73+
}
74+
75+
&.active {
76+
//font-weight: $font-weight-bold;
77+
font-weight: 800;
78+
color: $gray-800;
79+
80+
}
81+
}
82+
83+
.dropdown {
84+
a {
85+
color: $gray-700;
86+
}
87+
88+
.nav-link {
89+
padding: 0 0 1rem;
90+
}
91+
}
92+
}
93+
94+
.td-sidebar {
95+
padding-top: 4rem;
96+
margin-bottom: var(--of--spacer--md);
97+
display:flex;
98+
justify-content: center;
99+
background: var(--of--color-white--200);
100+
span {
101+
margin-left: var(--of--spacer--md);
102+
font-family: var(--of--font-family);
103+
}
104+
@include media-breakpoint-up(md) {
105+
padding-top: var(--of--spacer--md);
106+
padding-bottom: 4rem;
107+
background-color: $td-sidebar-bg-color;
108+
margin-bottom: 0;
109+
padding-right: 1rem;
110+
border-right: 1px solid $td-sidebar-border-color;
111+
}
112+
113+
&__toggle {
114+
line-height: 1;
115+
color: $gray-900;
116+
margin: 1rem;
117+
}
118+
119+
&__search {
120+
padding: 1rem 15px;
121+
margin-right: -15px;
122+
margin-left: -15px;
123+
}
124+
125+
&__inner {
126+
order: 0;
127+
128+
@include media-breakpoint-up(md) {
129+
@supports (position: sticky) {
130+
position: sticky;
131+
top:71px;
132+
z-index: 10;
133+
height: calc(100vh - 6rem);
134+
}
135+
}
136+
137+
138+
@include media-breakpoint-up(xl) {
139+
flex: 0 1 320px;
140+
}
141+
142+
143+
.td-search-box {
144+
width: 100%;
145+
}
146+
147+
&__heading {
148+
padding: var(--of--spacer--md);
149+
background: var(--of--color-brand--300);
150+
color: var(--of--color-white--100);
151+
margin-left: -15px;
152+
margin-right: -15px;
153+
}
154+
}
155+
}

assets/scss/_styles_project.scss

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,68 @@
1+
@import "../../themes/docsy/assets/scss/support/functions";
2+
@import "../../themes/docsy/assets/scss/bs-variables";
3+
@import "../../themes/docsy/assets/scss/support/mixins";
4+
5+
@import "../../themes/docsy/assets/vendor/bootstrap/scss/bootstrap";
6+
7+
@import "../../themes/docsy/assets/vendor/Font-Awesome/scss/fontawesome.scss";
8+
@import "../../themes/docsy/assets/vendor/Font-Awesome/scss/solid.scss";
9+
@import "../../themes/docsy/assets/vendor/Font-Awesome/scss/brands.scss";
10+
11+
@import "../../themes/docsy/assets/scss/support/utilities";
12+
@import "../../themes/docsy/assets/scss/colors";
13+
@import "../../themes/docsy/assets/scss/boxes";
14+
@import "../../themes/docsy/assets/scss/blog";
15+
@import "../../themes/docsy/assets/scss/code";
16+
@import "../../themes/docsy/assets/scss/nav";
17+
//@import "../../themes/docsy/assets/scss/sidebar-tree";
18+
@import "../../themes/docsy/assets/scss/sidebar-toc";
19+
@import "../../themes/docsy/assets/scss/buttons";
20+
@import "../../themes/docsy/assets/scss/breadcrumb";
21+
@import "../../themes/docsy/assets/scss/alerts";
22+
@import "../../themes/docsy/assets/scss/content";
23+
@import "../../themes/docsy/assets/scss/search";
24+
@import "../../themes/docsy/assets/scss/main-container";
25+
@import "../../themes/docsy/assets/scss/blocks/blocks";
26+
@import "../../themes/docsy/assets/scss/section-index";
27+
@import "../../themes/docsy/assets/scss/pageinfo";
28+
29+
@if $td-enable-google-fonts {
30+
@import url($web-font-path);
31+
}
32+
33+
footer {
34+
min-height: 150px;
35+
36+
@include media-breakpoint-down(md) {
37+
min-height: 200px;
38+
}
39+
}
40+
41+
// Adjust anchors vs the fixed menu.
42+
@include media-breakpoint-up(md) {
43+
.td-offset-anchor:target {
44+
display: block;
45+
position: relative;
46+
top: -4rem;
47+
visibility: hidden;
48+
}
49+
50+
h2[id]:before, h3[id]:before, h4[id]:before, h5[id]:before {
51+
display: block;
52+
content: " ";
53+
margin-top: -5rem;
54+
height: 5rem;
55+
visibility: hidden;
56+
}
57+
}
58+
59+
60+
161
@import "functions";
262
@import "variables";
363
@import "reset";
464
@import "type";
65+
@import "sidebar-tree";
566

667
//components
768
@import "header";

content/en/docs/Concepts/crds/subscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ weight: 4
44
---
55

66

7-
A Subscription represents an intention to install an operator. It is the CustomResource that relate an operator to a CatalogSource. Subscriptions describe which [channel](/docs/glossary/glossary/#channel) of an operator package to subscribe to, and whether to perform updates automatically or manually. If set to automatic, the Subscription ensures OLM will manage and upgrade the operator to ensure the latest version is always running in the cluster.
7+
A Subscription represents an intention to install an operator. It is the CustomResource that relate an operator to a CatalogSource. Subscriptions describe which [channel](/docs/glossary/#channel) of an operator package to subscribe to, and whether to perform updates automatically or manually. If set to automatic, the Subscription ensures OLM will manage and upgrade the operator to ensure the latest version is always running in the cluster.
88

99
Here's an example of a Subscription definition:
1010

content/en/docs/Tasks/install-operator-with-olm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >
66
Install your operator from a catalog of operators
77
---
88

9-
[Once you've made your operator available in a catalog](/docs/tasks/make-operator-part-of-catalog/), or you've chosen an operator from the [list of operators available to be installed in the cluster](/docs/tasks/list-operators-available-to-install/), you can install your operator by creating a [`Subscription`](/docs/concepts/crds/subscription/) to a specific [channel](/docs/glossary/glossary/#channel).
9+
[Once you've made your operator available in a catalog](/docs/tasks/make-operator-part-of-catalog/), or you've chosen an operator from the [list of operators available to be installed in the cluster](/docs/tasks/list-operators-available-to-install/), you can install your operator by creating a [`Subscription`](/docs/concepts/crds/subscription/) to a specific [channel](/docs/glossary/#channel).
1010

1111
## Prerequisites
1212

content/en/docs/advanced-tasks/ship-operator-supporting-multiarch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ $ kubectl get packagemanifests -l operatorframework.io/os.windows=supported
5555

5656
## Caveats
5757

58-
Only the labels on the [HEAD of the default channel](/docs/glossary/glossary/#channel-head) are considered for filtering PackageManifests by label.
58+
Only the labels on the [HEAD of the default channel](/docs/glossary/#channel-head) are considered for filtering PackageManifests by label.
5959

6060
This means, for example, that providing an alternate architecture for an operator in the non-default channel is possible, but will not be available for filtering in the PackageManifest API.

content/en/docs/getting-started/_index.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ description: >
1111

1212
- [git](https://git-scm.com/downloads)
1313
- [go](https://golang.org/dl/) version `v1.12+`.
14-
- [docker](https://docs.docker.com/install/) version `17.03`+.
15-
- Alternatively [podman](https://github.com/containers/libpod/blob/master/install.md) `v1.2.0+` or [buildah](https://github.com/containers/buildah/blob/master/install.md) `v1.7+`
14+
- [docker](https://docs.docker.com/install/) version `17.03`+ or [podman](https://github.com/containers/libpod/blob/master/install.md) `v1.2.0+` or [buildah](https://github.com/containers/buildah/blob/master/install.md) `v1.7+`.
1615
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) `v1.11.3+`.
1716
- Access to a Kubernetes `v1.11.3+` cluster.
1817

1918
## Installing OLM in your cluster
2019

2120
### Install Released OLM
22-
For installing release versions of OLM, for example version 0.12.0, you can use the following command:
21+
For installing release versions of OLM, for example version 0.15.1, you can use the following command:
2322

24-
```bash
23+
```sh
2524
export olm_release=0.15.1
2625
kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${olm_release}/crds.yaml
2726
kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${olm_release}/olm.yaml
@@ -32,7 +31,7 @@ Learn more about available releases [here](https://github.com/operator-framework
3231

3332
To deploy OLM locally on a [minikube cluster](https://kubernetes.io/docs/tasks/tools/install-minikube/) for development work, use the `run-local` target in the [Makefile](https://github.com/operator-framework/operator-lifecycle-manager/blob/master/Makefile).
3433

35-
```bash
34+
```sh
3635
git clone https://github.com/operator-framework/operator-lifecycle-manager.git
3736
cd operator-lifecycle-manager
3837
make run-local
@@ -42,7 +41,7 @@ make run-local
4241

4342
You can verify your installation of OLM by first checking for all the neccesasary CRDs in the cluster:
4443

45-
```bash
44+
```sh
4645
$ kubectl get crd
4746
NAME CREATED AT
4847
catalogsources.operators.coreos.com 2019-10-21T18:15:27Z
@@ -54,7 +53,7 @@ subscriptions.operators.coreos.com 2019-10-21T18:15:27Z
5453

5554
And then inspecting the deployments of OLM and it's related components:
5655

57-
```bash
56+
```sh
5857
$ kubectl get deploy -n olm
5958
NAME READY UP-TO-DATE AVAILABLE AGE
6059
catalog-operator 1/1 1 1 5m52s
@@ -67,7 +66,7 @@ packageserver 2/2 2 2 5m43s
6766
When you install OLM, it comes packaged with a number of Operators developed by the community that you can install instantly.
6867
You can use the `pacakagemanifest` api to see the operators available for you to install in your cluster:
6968

70-
```bash
69+
```sh
7170
$ kubectl get packagemanifest -n olm
7271
NAME CATALOG AGE
7372
cassandra-operator Community Operators 26m
@@ -79,7 +78,7 @@ wildfly Community Operators 26m
7978

8079
To install the etcd operator in the default namespace, first create an `OperatorGroup` for the default namespace:
8180

82-
```bash
81+
```sh
8382
$ cat operatorgroup.yaml
8483
kind: OperatorGroup
8584
apiVersion: operators.coreos.com/v1
@@ -96,7 +95,7 @@ operatorgroup.operators.coreos.com/og-single created
9695

9796
Then create a subscription for the etcd operator:
9897

99-
```bash
98+
```sh
10099
$ cat subscription.yaml
101100
apiVersion: operators.coreos.com/v1alpha1
102101
kind: Subscription
@@ -117,7 +116,7 @@ subscription.operators.coreos.com/etcd created
117116

118117
This installs the v0.9.2 version of the etcd operator, and then upgrades to the latest version of the etcd operator in your cluster.
119118

120-
```bash
119+
```sh
121120
$ kubectl get sub -n default
122121
NAME PACKAGE SOURCE CHANNEL
123122
etcd etcd operatorhubio-catalog singlenamespace-alpha

layouts/docs/list.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{ define "main" }}
2+
<div class="td-content">
3+
<h1>{{ .Title }}</h1>
4+
{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
5+
{{ .Content }}
6+
{{ partial "section-index.html" . }}
7+
{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
8+
{{ partial "feedback.html" .Site.Params.ui.feedback }}
9+
<br />
10+
{{ end }}
11+
{{ if (.Site.DisqusShortname) }}
12+
<br />
13+
{{ partial "disqus-comment.html" . }}
14+
{{ end }}
15+
<div class="text-muted mt-5 pt-3 border-top">{{ partial "page-meta-lastmod.html" . }}</div>
16+
</div>
17+
{{ end }}

layouts/docs/single.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{ define "main" }}
2+
{{ .Render "content" }}
3+
{{ end }}

0 commit comments

Comments
 (0)