Skip to content

Commit c9c45f8

Browse files
committed
Merge remote-tracking branch 'origin/4.12' into enhancement/merge-4.12-into-4.13.0
2 parents 18f3ee6 + fcf38a8 commit c9c45f8

35 files changed

+259
-38
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ All notable changes to this project will be documented in this file.
4949
- **Post-release**: Added the `ap-northeast-1` (Tokyo) region. ([#8818](https://github.com/wazuh/wazuh-documentation/pull/8818))
5050
- **Post-release**: Added a Q&A to the Cloud service FAQ section. ([#8832](https://github.com/wazuh/wazuh-documentation/pull/8832))
5151
- **Post-release**: Added agent restart commands to Agent enrollment methods section. ([#8836](https://github.com/wazuh/wazuh-documentation/pull/8836))
52+
- **Post-release**: Added Wazuh Docker support for Windows. ([#8852](https://github.com/wazuh/wazuh-documentation/pull/8852))
5253

5354
### Changed
5455

@@ -81,6 +82,8 @@ All notable changes to this project will be documented in this file.
8182
- **Post-release**: Updated the instruction and images in Wazuh server API getting started documentation to reflect the new navigation path (**Server management** > **Dev Tools**). ([#8811](https://github.com/wazuh/wazuh-documentation/pull/8811))
8283
- **Post-release**: Updated the *Getting started with Wazuh - Architecture* documentation. ([#8819](https://github.com/wazuh/wazuh-documentation/pull/8819))
8384
- **Post-release**: Changed Suricata ruleset file permission in POC guide. ([#8821](https://github.com/wazuh/wazuh-documentation/pull/8821))
85+
- **Post-release**: Adjusted the Data analysis documentation. ([#8850](https://github.com/wazuh/wazuh-documentation/pull/8850))
86+
- **Post-release**: Updated images and powershell command in **Leveraging LLMs for alert enrichment** PoC. [#8888](https://github.com/wazuh/wazuh-documentation/pull/8888)
8487

8588
### Fixed
8689

source/_themes/wazuh_doc_theme_v3/moved-content.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{%- block light_box_display %}{%- endblock -%}
55
{%- block gtm_head %}{%- endblock -%}
66
{%- block gtm_body %}{%- endblock -%}
7+
{%- block contact_side_tab %}{% endblock contact_side_tab -%}
78

89
{%- block body -%}
910
<h1>This content was moved</h1>

source/_themes/wazuh_doc_theme_v3/not-found.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
{%- extends "!wazuh_doc_theme_v3/template-parts/body.html" -%}
77

8+
{%- block contact_side_tab %}{% endblock contact_side_tab -%}
9+
810
{% block body %}
911
{{ super() }}
1012
{% endblock %}
Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
/* -------------------------------------------------------------------------------------------------
2+
Component - Contact side-tab
3+
------------------------------------------------------------------------------------------------- */
4+
5+
.contact-side-tab {
6+
width: 57px;
7+
height: 180px;
8+
background-color: $light-color-primary-lighter;
9+
position: fixed;
10+
z-index: 100;
11+
right: 0;
12+
bottom: calc(70% - 230px);
13+
border-radius: 10px 0 0 10px;
14+
border-top: 2px solid $light-color-primary-lighter;
15+
border-left: 2px solid $light-color-primary-lighter;
16+
border-bottom: 2px solid $light-color-primary-lighter;
17+
box-shadow: -2px 1px 5px 2px rgba($light-color-shadow, 0.15);
18+
transition: border-color .15s ease-in-out;
19+
@include media-max(xxl) {
20+
width: 40px;
21+
}
22+
@include media-max(sm) {
23+
height: 40px;
24+
}
25+
@include media-only(sm,xl) {
26+
height: 150px;
27+
}
28+
@media (min-width: 1200px) and (max-width: 1259px) {
29+
height: 40px;
30+
}
31+
@media (min-width: 1259px) and (max-width: 1399px) {
32+
height: 150px;
33+
}
34+
@include media-only(mid-xxl,xxl) {
35+
height: 40px;
36+
}
37+
@media (min-width: 1600px) and (max-width: 1699px) {
38+
height: 40px;
39+
}
40+
@media (min-width: 1700px) and (max-width: 1779px) {
41+
height: 150px;
42+
}
43+
@media (min-width: 1780px) and (max-width: 1879px) {
44+
height: 40px;
45+
}
46+
&:hover {
47+
background-color: $light-color-primary;
48+
}
49+
button {
50+
border: none;
51+
background-color: none;
52+
outline: none;
53+
&:focus {
54+
outline: none;
55+
box-shadow: none;
56+
}
57+
}
58+
a,
59+
form button,
60+
i,svg {
61+
color: $dark-color-main-text;
62+
font-size: 17px;
63+
@include media-only(wzh-xl,xxl) {
64+
font-size: 15px;
65+
}
66+
}
67+
i,svg {
68+
width: 40px;
69+
text-align: center;
70+
&.icon {
71+
display: inline-block;
72+
height: 17px;
73+
width: 21px;
74+
}
75+
}
76+
a,
77+
form {
78+
display: flex;
79+
align-items: center;
80+
height: 100%;
81+
padding: 20px 5px;
82+
&:hover {
83+
text-decoration: none;
84+
}
85+
button {
86+
&:hover {
87+
color: $dark-color-main-text;
88+
background-color: $light-color-primary;
89+
}
90+
}
91+
}
92+
.vertical-text {
93+
white-space: nowrap;
94+
width: 100%;
95+
height: 100%;
96+
display: flex;
97+
flex-direction: column;
98+
align-items: center;
99+
justify-content: center;
100+
position: absolute;
101+
top: 0;
102+
bottom: 0;
103+
left: 0;
104+
right: 0;
105+
.text {
106+
font-family: 'Manrope', sans-serif;
107+
position: absolute;
108+
top: 58px;
109+
transform: rotate(-90deg);
110+
font-weight: 600;
111+
margin-left: 20px;
112+
margin-right: 20px;
113+
word-spacing: 3px;
114+
@include media-max(sm) {
115+
display: none;
116+
}
117+
@include media-only(sm,xl) {
118+
display: flex;
119+
top: 50px;
120+
}
121+
@media (min-width: 1200px) and (max-width: 1259px) {
122+
display: none;
123+
}
124+
@media (min-width: 1259px) and (max-width: 1399px) {
125+
display: flex;
126+
top: 50px;
127+
}
128+
@include media-only(mid-xxl,xxl) {
129+
display: none;
130+
}
131+
@media (min-width: 1600px) and (max-width: 1699px) {
132+
display: none;
133+
}
134+
@media (min-width: 1700px) and (max-width: 1779px) {
135+
display: flex;
136+
top: 50px;
137+
}
138+
@media (min-width: 1780px) and (max-width: 1879px) {
139+
display: none;
140+
}
141+
}
142+
i,svg {
143+
position: absolute;
144+
bottom: 10px;
145+
left: calc(50% - 10px);
146+
147+
@include media-max(sm) {
148+
bottom: 8px;
149+
}
150+
@include media-only(xl,wzh-xl) {
151+
bottom: 8px;
152+
}
153+
@include media-min(xxl) {
154+
bottom: 20px;
155+
}
156+
@media (min-width: 1600px) and (max-width: 1879px) {
157+
bottom: 8px;
158+
}
159+
}
160+
}
161+
}
162+
163+
.icon-envelope {
164+
fill: $dark-color-main-text;
165+
display: block;
166+
width: 21px;
167+
height: 17px;
168+
margin: 0 auto;
169+
}

source/_themes/wazuh_doc_theme_v3/src/scss/pages/api-reference.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@import "../components/version-selector";
1212
@import "../components/mode-switch";
1313
@import "../components/back-to-top";
14+
@import "../components/contact-side-tab";
1415

1516
// Variables used only for ReDoc
1617
$light-color-redoc-type: #757575 !default;

source/_themes/wazuh_doc_theme_v3/src/scss/pages/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@import "../components/back-to-top";
1313
@import "../parts/header";
1414
@import "../parts/footer";
15+
@import "../components/contact-side-tab";
1516

1617
.index {
1718
header .mobile-secondary-header {

source/_themes/wazuh_doc_theme_v3/src/scss/pages/search-results.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
@import "../components/breadcrumbs";
1616
@import "../components/version-notice";
1717
@import "../components/back-to-top";
18+
@import "../components/contact-side-tab";
1819

1920
main {
2021
padding-top: 10px;

source/_themes/wazuh_doc_theme_v3/src/scss/pages/wazuh-documentation.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515

1616
@import "../components/version-notice";
1717
@import "../components/back-to-top";
18+
@import "../components/contact-side-tab";

source/_themes/wazuh_doc_theme_v3/static/css/min/api-reference.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/_themes/wazuh_doc_theme_v3/static/css/min/index.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)