Skip to content

Commit 8482935

Browse files
authored
Merge pull request #2021 from UlrichB22/bg_and_logo
Theme topside: Replace white_clouds with gray background ...
2 parents 8d2b57c + a03abde commit 8482935

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/moin/static/css/variables.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,7 @@
9292
--bg-cal-today: #CCFFCC; /* todays background */
9393
--bg-cal-invalidday: #FCFCFC; /* invalid days background */
9494

95+
/* theme topside specific */
96+
--bg_topside: #F3F3F1;
97+
--border_topside: #E8E8E6;
9598
}

src/moin/templates/snippets.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
{# Logo in the theme header #}
99
{% macro logo() -%}
10-
<img src="{{ url_for('static', filename='logos/moinmoin.png') }}" id="moin-img-logo" alt="Logo">
10+
<img src="{{ url_for('static', filename='logos/moinmoin.svg') }}" width=64 id="moin-img-logo" alt="Logo">
1111
{%- endmacro %}
1212

1313
{# link to favicon inside <head> #}

src/moin/themes/topside/static/css/theme.css

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ ul.moin-breadcrumb li ul.moin-alias li { display: block; padding: 2px 10px; }
4949

5050
/* styling for topbar */
5151
@media (max-width: 1024px) {
52-
#moin-header { background-image: url("../../../static/img/white-clouds.jpg");
53-
text-align: left; min-height: 74px; overflow: hidden; border-bottom: 1px solid #D7E9FD;
54-
font-size: 1em; }
52+
#moin-header { background-color: var(--bg_topside); text-align: left; min-height: 74px; overflow: hidden;
53+
border-bottom: 1px solid var(--border_topside); font-size: 1em; }
5554
/* logo size of 64x64 px determines min-height of 74px above */
5655

5756
#moin-logo { float: left; padding: 5px 10px 10px 5px; }
@@ -76,9 +75,8 @@ ul.moin-breadcrumb li ul.moin-alias li { display: block; padding: 2px 10px; }
7675
.moin-edit-actions { display: none; }
7776
#moin-content { margin: 0 5%; width: auto; padding-bottom: 9em; }
7877

79-
#moin-footer { background-image: url("../../../static/img/white-clouds.jpg");
80-
background-position-y: bottom;
81-
border-top: 1px solid #D7E9FD; padding: 8pt 5% 10pt 5%; width: 100vw; }
78+
#moin-footer { background-color: var(--bg_topside); background-position-y: bottom;
79+
border-top: 1px solid var(--border_topside); padding: 8pt 5% 10pt 5%; width: 100vw; }
8280

8381
#moin-pageinfo,
8482
#moin-wiki-license,
@@ -129,9 +127,9 @@ ul.moin-breadcrumb li ul.moin-alias li { display: block; padding: 2px 10px; }
129127

130128
@media (min-width: 1025px) {
131129
/* styling for left sidebar */
132-
#moin-header { background-image: url("../../../static/img/white-clouds-r.jpg"); text-align: center;
130+
#moin-header { background-color: var(--bg_topside); text-align: center;
133131
position: fixed; top: 0; left: 0; width: 250px; height: 100%; overflow-y: auto; overflow-x: hidden;
134-
border-right: 1px solid #D7E9FD; font-size: .92em; z-index: 10; }
132+
border-right: 1px solid var(--border_topside); font-size: .92em; z-index: 10; }
135133
#moin-logo { padding: 10px 0; }
136134
.moin-sitename { font-size: 1.5rem; display: block; }
137135

0 commit comments

Comments
 (0)