Skip to content

Commit a7ba974

Browse files
ppxlcesmarvin
ppxl
authored and
cesmarvin
committed
Merge branch 'release/v1.26.1-6'
2 parents 9eb144b + f8c1b45 commit a7ba974

8 files changed

Lines changed: 165 additions & 124 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v1.26.1-6] - 2024-08-27
11+
### Changed
12+
- [#102] Redesign dogu-starting-page
13+
- Change UI language of the dogu-starting-page to german
14+
15+
1016
## [v1.26.1-5] - 2024-08-15
1117
### Changed
1218
- Include whitelabeling-styles in html, instead of js [#100]

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN wget --progress=bar:force:noscroll -O /tmp/theme.zip https://github.com/clou
6161
FROM registry.cloudogu.com/official/base:3.20.2-1
6262
LABEL maintainer="hello@cloudogu.com" \
6363
NAME="official/nginx" \
64-
VERSION="1.26.1-5"
64+
VERSION="1.26.1-6"
6565

6666
ENV CES_MAINTENANCE_MODE=false
6767

‎dogu.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Name": "official/nginx",
3-
"Version": "1.26.1-5",
3+
"Version": "1.26.1-6",
44
"DisplayName": "Nginx",
55
"Description": "Nginx WebServer.",
66
"Logo": "https://cloudogu.com/images/dogus/nginx.png",

‎resources/var/www/html/errors/css/dogu-starting-styles.css‎

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎resources/var/www/html/errors/css/dogu-starting.css‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
:root {
2+
font-family: Calibri, Gill Sans, Gill Sans MT, Liberation Sans, Carlito, -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif;
3+
4+
--ces-dogu-starting-color: var(--ces-color-brand, #00629E);
5+
--ces-dogu-starting-button-color-bg: var(--ces-dogu-starting-color, #00629E);
6+
--ces-dogu-starting-button-color-text: var(--ces-color-inverted-text, #FCFCFD);
7+
--ces-dogu-starting-button-color-hover: var(--ces-color-brand-strong, #00426B);
8+
--ces-dogu-starting-button-color-active: var(--ces-color-brand-stronger, #003250);
9+
10+
--ces-dogu-starting-logo: url("../img/dogu-starting.svg");
11+
--ces-dogu-starting-logo-width: 20rem;
12+
--ces-dogu-starting-logo-height-mobile: 12rem;
13+
14+
--ces-dogu-starting-docs-visibility: visible;
15+
16+
color: var(--ces-dogu-starting-color);
17+
}
18+
19+
body {
20+
margin: 0;
21+
}
22+
23+
.dogu-starting {
24+
margin: 2rem;
25+
height: calc(100vh - 4rem);
26+
display: flex;
27+
flex-flow: row;
28+
justify-content: center;
29+
align-items: center;
30+
gap: 2rem;
31+
}
32+
33+
.dogu-starting .logo {
34+
width: var(--ces-dogu-starting-logo-width);
35+
content: var(--ces-dogu-starting-logo);
36+
}
37+
38+
.dogu-starting h1 {
39+
font-size: 8.5rem;
40+
font-weight: 400;
41+
line-height: 9rem;
42+
margin: 0;
43+
}
44+
45+
.dogu-starting h2 {
46+
font-size: 3rem;
47+
font-weight: 400;
48+
line-height: 4rem;
49+
margin: 0;
50+
}
51+
52+
.dogu-starting .actions {
53+
margin: 1rem 0;
54+
display: flex;
55+
gap: 1rem;
56+
align-items: center;
57+
}
58+
59+
.dogu-starting .actions .docs-link{
60+
visibility: var(--ces-dogu-starting-docs-visibility);
61+
}
62+
63+
.dogu-starting button {
64+
cursor: pointer;
65+
padding: .5rem .625rem;
66+
border: 0;
67+
border-radius: 2.5rem;
68+
background-color: var(--ces-dogu-starting-button-color-bg);
69+
color: var(--ces-dogu-starting-button-color-text);
70+
font-weight: 700;
71+
line-height: 1.5rem;
72+
}
73+
74+
.dogu-starting button:hover {
75+
background-color: var(--ces-dogu-starting-button-color-hover);
76+
}
77+
78+
.dogu-starting button:active {
79+
background-color: var(--ces-dogu-starting-button-color-active);
80+
}
81+
82+
.dogu-starting button:focus-visible, a:focus-visible {
83+
outline: none;
84+
box-shadow: 0 0 0 2px var(--ces-color-default-focus-inner), 0 0 0 4px var(--ces-color-default-focus-outer);
85+
}
86+
87+
.dogu-starting button svg {
88+
margin-left: .375rem;
89+
vertical-align: text-bottom;
90+
}
91+
92+
.dogu-starting a, .dogu-starting a:visited {
93+
text-decoration-line: underline;
94+
text-decoration-style: dashed;
95+
text-decoration-thickness: 1px;
96+
text-decoration-color: var(--ces-dogu-starting-color);
97+
color: var(--ces-dogu-starting-color);
98+
font-weight: 700;
99+
}
100+
101+
.dogu-starting a:hover {
102+
text-decoration-style: solid;
103+
}
104+
105+
@media (max-width: 767px) {
106+
.dogu-starting {
107+
flex-flow: column;
108+
justify-content: flex-start;
109+
text-align: center;
110+
}
111+
112+
.dogu-starting .logo {
113+
width: unset;
114+
height: var(--ces-dogu-starting-logo-height-mobile);
115+
}
116+
117+
.dogu-starting h1 {
118+
font-size: 4.25rem;
119+
line-height: 4.5rem;
120+
}
121+
122+
.dogu-starting h2 {
123+
font-size: 1.5rem;
124+
line-height: 2rem;
125+
}
126+
127+
.dogu-starting .actions {
128+
flex-flow: column;
129+
align-items: center;
130+
}
131+
}

‎resources/var/www/html/errors/img/dogu-starting.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎resources/var/www/html/errors/starting.html‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="de">
33
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width">
6-
<meta http-equiv="refresh" content="10" />
7-
<title>Dogu is starting</title>
8-
<!--Stylesheet CES Theme-->
9-
<link rel="stylesheet" href="/errors/css/ces.css" media="screen">
10-
<link rel="stylesheet" href="/errors/css/dogu-starting-styles.css">
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1"/>
6+
<meta http-equiv="refresh" content="10" />
7+
<title>Dogu startet</title>
8+
<link rel="stylesheet" href="/errors/css/dogu-starting.css">
119
</head>
1210
<body>
13-
<div class="logo">
14-
<img src="/errors/img/logo-white-320px.png">
15-
</div>
16-
<div class="container">
17-
<div class="row">
18-
<div class="col-xs-6">
19-
<div class="imageContainer flyIn">
20-
<img class="flyingCloud " src="/errors/img/flying_cloud.svg">
21-
</div>
22-
</div>
23-
<div class="col-xs-8 col-sm-6 starting">
24-
<h1 id="doguName">Dogu is starting</h1>
25-
</div>
26-
</div>
11+
<div class="dogu-starting">
12+
<div>
13+
<img alt="" class="logo" />
14+
</div>
15+
<div>
16+
<h1>Dogu startet</h1>
17+
<h2>Bitte haben Sie Geduld.</h2>
18+
<div class="actions">
19+
<button onClick="window.location.reload();">
20+
Dogu neu laden
21+
<svg width="16" height="16" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="reload-arrow">
22+
<path d="M11 13.5H5C4.60218 13.5 4.22064 13.342 3.93934 13.0607C3.65804 12.7794 3.5 12.3978 3.5 12V6C3.5 5.60218 3.65804 5.22064 3.93934 4.93934C4.22064 4.65804 4.60218 4.5 5 4.5C5.39782 4.5 5.77936 4.65804 6.06066 4.93934C6.34196 5.22064 6.5 5.60218 6.5 6V7.7325C8.58125 5.6825 11.7863 3.5 16 3.5C21.5575 3.5 24.92 6.79875 25.0613 6.93875C25.3394 7.22032 25.4949 7.60039 25.494 7.99614C25.4932 8.3919 25.3359 8.77128 25.0566 9.05162C24.7772 9.33195 24.3984 9.49054 24.0027 9.49281C23.6069 9.49508 23.2263 9.34086 22.9438 9.06375C22.8888 9.01125 20.25 6.5 16 6.5C12.375 6.5 9.6325 8.71 8 10.5H11C11.3978 10.5 11.7794 10.658 12.0607 10.9393C12.342 11.2206 12.5 11.6022 12.5 12C12.5 12.3978 12.342 12.7794 12.0607 13.0607C11.7794 13.342 11.3978 13.5 11 13.5ZM27 18.5H21C20.6022 18.5 20.2206 18.658 19.9393 18.9393C19.658 19.2206 19.5 19.6022 19.5 20C19.5 20.3978 19.658 20.7794 19.9393 21.0607C20.2206 21.342 20.6022 21.5 21 21.5H24C22.375 23.29 19.625 25.5 16 25.5C11.75 25.5 9.11125 22.9887 9.05625 22.935C8.7737 22.6579 8.39309 22.5037 7.99733 22.5059C7.60158 22.5082 7.22276 22.6668 6.94341 22.9471C6.66406 23.2275 6.50682 23.6068 6.50595 24.0026C6.50508 24.3984 6.66064 24.7784 6.93875 25.06C7.08 25.2013 10.4425 28.5 16 28.5C20.2137 28.5 23.4188 26.3175 25.5 24.2675V26C25.5 26.3978 25.658 26.7794 25.9393 27.0607C26.2206 27.342 26.6022 27.5 27 27.5C27.3978 27.5 27.7794 27.342 28.0607 27.0607C28.342 26.7794 28.5 26.3978 28.5 26V20C28.5 19.6022 28.342 19.2206 28.0607 18.9393C27.7794 18.658 27.3978 18.5 27 18.5Z"
23+
fill="currentColor"/>
24+
</svg>
25+
</button>
26+
<a href="https://docs.cloudogu.com/" target="_blank" class="docs-link">Dokumentation</a>
27+
</div>
28+
</div>
2729
</div>
2830
</body>
2931
</html>

‎resources/var/www/html/styles/default.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
--ces-color-default-focus-inner: #FFFFFF;
3434
--ces-color-default-focus-outer: #CC14CC;
3535
--ces-color-default-text: #0D1C26;
36-
--ces-color-color-inverted-text: #FCFCFD;
36+
--ces-color-inverted-text: #FCFCFD;
3737

3838
/* The base64 encoded vector image (cloudogu logo: blib blue): https://github.com/cloudogu/ces-theme/blob/develop/dist/images/logo/blib-blue-vec.svg */
3939
--ces-logo-default: url('data:image/svg+xml;base64,PHN2ZyBpZD0iZ2VzY2hsb3NzZW5lc19FbGVtZW50IiBkYXRhLW5hbWU9Imdlc2NobG9zc2VuZXMgRWxlbWVudCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgODM4LjY3IDUxMy43NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMyNGEyZGN9PC9zdHlsZT48L2RlZnM+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNzIxLjMxIDMyOS4zNmE2MC42NiA2MC42NiAwIDAgMS0xMTcuMSAyMi4yNGwuNTMgMi41MS0xMTguMSAyMy4zN2E2Ny43MyA2Ny43MyAwIDAgMS0xMzUuNC4xN2wtMTE5LTIzLjU0YTYwLjY4IDYwLjY4IDAgMSAxIDUuMjctMjQuNzVsMTE3LjMgMjQuMTRhNjcuODMgNjcuODMgMCAwIDEgNTEuNjQtNDQuNjRoLS4wNnYtNzAuMjVhNjAuNjggNjAuNjggMCAxIDEgMjQuMjUuMTV2NzBhNjguMjEgNjguMjEgMCAwIDEgNTIuMjcgNDQuNjFsMTE2LjUzLTI0IC42IDIuODFjLS4wNS0uOTMtLjA3LTEuODctLjA3LTIuODFhNjAuNjYgNjAuNjYgMCAxIDEgMTIxLjMxIDB6Ii8+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNzQyIDE3My41MWMtNTUuMzItMjUuODgtMTA2LjUtMjMtMTQ3LjY1LTYuMTgtMi00Mi42Ny0yMC44OC04My43Ni01Ny0xMThDNDY3LjExLTE3LjE4IDM1My44Ni0xMSAyODcuNTUgNjIuNzVjLTI3LjggMzAuOTMtNDIgNjcuNDEtNDQuMiAxMDQuNTYtNDEuMTMtMTYuODQtOTIuMy0xOS42Ny0xNDcuNTkgNi4yLTcwLjI0IDMyLjg2LTEyNS42IDEzNi4xMi03NS4wNyAyMzYuMTQgMzYuODIgNzIuOSAxMjguNDkgMTA3LjU3IDE4NyAxMDEuNjRsNDIzLjU3LjEzQzY4OS44MSA1MTYuNzMgNzgwLjQ2IDQ4MiA4MTcgNDA5LjY1YzUwLjU1LTEwMC4wMi00LjgxLTIwMy4yOC03NS0yMzYuMTR6bTE0LjU5IDIwOS4yM2MtMjEuNTUgMzkuNy01OC43NSA1NC43My0xMDAuNzcgNTguNTRINTA2LjU5Yy0xOS4zOSAyNC40NS00Ny4zNCA0My41OC04Ny41NSA0My41OC0zNS44MyAwLTY2LjQyLTE1LjI1LTg3LjU1LTQzLjU4bC0xNDggLjE0Yy00Mi42Ni0zLjU4LTgwLjUyLTE4LjQ5LTEwMi4zNC01OC42OC0zMS44NC01OC42Ni02LjU4LTEyNS40NSA0OC4zNy0xNTIuMzJzMTIyLTEuODUgMTQ4IDU0LjY3YTExNC4yOCAxMTQuMjggMCAwIDEgNi4xNyAxOC4xNnM0LjIzLTUgNC45My01Ljc3YzIwLjQ2LTIxLjU3IDMzLjUzLTI5IDUzLjMyLTM5LjkyYTkxLjY5IDkxLjY5IDAgMCAxLTEzLjc4LTE2LjM2Yy0uNTctMS0xLTEuODEtMS4yMy0yLjEyLTIzLjE2LTM0LjMyLTI2LjcxLTg5LjgyIDkuMjQtMTMxLjg0QzM3NS41MiA2MS4yIDQ0Mi42OCA1Ni45MyA0OTAgOTUuNjZjMzEuODggMjYuMDggNTIuMTkgNzkuNTYgMjcuNjMgMTMxLjhsLS4wNy4xcy04LjU0IDE3LjkzLTIxLjc4IDMwYzE5Ljc5IDExIDMyLjg2IDE4LjM1IDUzLjMyIDM5LjkyLjcuNzQgNC44OCA1LjczIDQuOTMgNS43N2ExMTUuMyAxMTUuMyAwIDAgMSA2LjE3LTE4LjE2YzI1LjkyLTU2LjUyIDkzLTgxLjU0IDE0Ny45NS01NC42N3M4MC4yMyA5My42NiA0OC4zOSAxNTIuMzJ6Ii8+PC9zdmc+');

0 commit comments

Comments
 (0)