Skip to content

Commit c45e0fc

Browse files
xwolfdexwolfde
authored
Merge pull request #78 from RRZE-Webteam/dev
1.12.14
2 parents 9cad8fe + e781de2 commit c45e0fc

19 files changed

+204
-288
lines changed

‎css/admin.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/editor-style.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/gutenberg.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/sass/_printer.scss‎

Lines changed: 101 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -2,102 +2,93 @@
22
// Anpassungen für Media Print
33
//-----------------------------------------------------------------------------------*/
44
@media print {
5-
@page {
6-
size:landscape;
7-
margin: 1cm;
5+
@page {
6+
size:landscape;
7+
margin: 1cm;
88
}
99

10-
11-
1210
abbr[title]:after {
13-
content: " (" attr(title) ")";
11+
content: " (" attr(title) ")";
1412
}
1513

1614
/* Defining all page breaks */
1715
a {
18-
page-break-inside:avoid
16+
page-break-inside:avoid
1917
}
2018
blockquote {
21-
page-break-inside: avoid;
19+
page-break-inside: avoid;
2220
}
2321
h1, h2, h3, h4, h5, h6 {
24-
page-break-after:avoid;
25-
page-break-inside:avoid;
22+
page-break-after:avoid;
23+
page-break-inside:avoid;
2624
}
2725
img {
28-
page-break-inside:avoid;
29-
page-break-after:avoid;
26+
page-break-inside:avoid;
27+
page-break-after:avoid;
3028
}
3129
table, pre {
32-
page-break-inside:avoid;
33-
border: none;
30+
page-break-inside:avoid;
31+
border: none;
3432
}
3533
ul, ol, dl {
36-
page-break-before:avoid;
34+
page-break-before:avoid;
3735
}
3836
.topevent-description,
3937
.widget,
4038
#content .startpage-sidebar .widget p,
4139
ul, li, td, tr, th, p, span, div {
42-
@include px2rem($font-size-print-base);
40+
@include px2rem($font-size-print-base);
4341
}
4442

4543
main {
46-
position: relative;
47-
display: block;
48-
49-
50-
51-
thead {
52-
display: table-header-group;
53-
}
54-
}
55-
main {
56-
th,
57-
td,
58-
li,
59-
.social,
60-
p {
61-
62-
a[href]::after {
63-
content: " (" attr(href) ")";
64-
color: $colorPrintMain;
65-
background-color: inherit;
66-
font-style: italic;
67-
font-size: 80%;
68-
}
69-
a[href^="#"]:after {
70-
display: none;
44+
position: relative;
45+
display: block;
46+
max-width: 97%;
47+
thead {
48+
display: table-header-group;
7149
}
72-
73-
a {
74-
text-transform: inherit;
75-
word-wrap: break-word;
76-
color: $colorPrintMainLinks;
50+
th,
51+
td,
52+
li,
53+
.social,
54+
p {
55+
a[href]::after {
56+
content: " (" attr(href) ")";
57+
color: $colorPrintMain;
58+
background-color: inherit;
59+
font-style: italic;
60+
font-size: 80%;
61+
}
62+
a[href^="#"]:after {
63+
display: none;
64+
}
65+
a {
66+
text-transform: inherit;
67+
word-wrap: break-word;
68+
color: $colorPrintMainLinks;
69+
}
70+
.meta-footer,
71+
.person-info,
72+
.event-time,
73+
article {
74+
a[href^="#"]:after {
75+
content: "";
76+
}
77+
}
7778
}
78-
.meta-footer,
79-
.person-info,
80-
.event-time,
81-
article {
82-
a[href^="#"]:after {
83-
content: "";
84-
}
85-
}
86-
87-
}
8879
}
8980
/**
9081
* Making intergated videos disappear, and removing the iframes' whitespace to zero.
9182
*/
9283
.rrze-video,
9384
.entry iframe,
9485
ins {
95-
display: none;
96-
width: 0 !important;
97-
height: 0 !important;
98-
overflow: hidden !important;
99-
line-height: 0pt !important;
100-
white-space: nowrap;
86+
display: none;
87+
width: 0 !important;
88+
height: 0 !important;
89+
overflow: hidden !important;
90+
line-height: 0pt !important;
91+
white-space: nowrap;
10192
}
10293
.embed-youtube, .embed-responsive {
10394
position: absolute;
@@ -108,45 +99,39 @@
10899

109100

110101
#social {
111-
112-
.col-xs-3,
113-
.col-xs-9 {
114-
width: 100%;
115-
}
116-
117-
ul.social li {
118-
max-width: none;
119-
120-
}
121-
102+
.col-xs-3,
103+
.col-xs-9 {
104+
width: 100%;
105+
}
106+
ul.social li {
107+
max-width: none;
108+
}
122109
}
123110

124111
.sidebar-subnav {
125-
display: none;
112+
display: none;
126113
}
127114
.entry-content {
128-
width: 100%;
115+
width: 100%;
129116
}
130117

131118
#hero {
132-
display: none;
133-
134-
&.hero-small {
135-
margin:0;
136-
position: relative;
137-
display: block;
138-
139-
.col-xs-12,
140-
.col-sm-8 {
141-
width: 100%;
142-
}
143-
144-
}
145-
.hero-meta-portal,
146-
.breadcrumbs {
147-
display: none;
119+
display: none;
120+
&.hero-small {
121+
margin:0;
122+
position: relative;
123+
display: block;
124+
.col-xs-12,
125+
.col-sm-8 {
126+
width: 100%;
127+
}
128+
129+
}
130+
.hero-meta-portal,
131+
.breadcrumbs {
132+
display: none;
133+
}
148134
}
149-
}
150135

151136

152137
#wpadminbar,
@@ -166,17 +151,17 @@
166151
#footer-nav,
167152
#header .row .header-menu,
168153
.fau-werbung {
169-
display: none;
154+
display: none;
170155
}
171156
.admin-bar #header,
172157
#header {
173-
position: relative;
174-
top: 0;
158+
position: relative;
159+
top: 0;
175160
}
176161

177162
hr {
178-
height: 20px;
179-
box-shadow: none;
163+
height: 20px;
164+
box-shadow: none;
180165
}
181166

182167

@@ -199,29 +184,28 @@
199184

200185

201186
footer {
202-
margin-top: 70px;
203-
204-
.footer-logo {
205-
margin-top: 10px;
206-
}
207-
208-
.socialmedia {
209-
display: none;
210-
}
187+
margin-top: 70px;
188+
position: relative;
189+
.footer-logo {
190+
margin-top: 10px;
191+
}
192+
.socialmedia {
193+
display: none;
194+
}
211195
}
212196
footer:before {
213-
content: 'Hinweis: Interaktive Teile der Webseite sind im Druck nicht sichbar. Bitte schonen Sie die Umwelt und vermeiden unnötige Ausdrücke.';
214-
color: #777;
215-
white-space: pre;
216-
display: block;
217-
margin-top: -40px;
218-
text-align: right;
219-
right: 0;
220-
position: absolute;
221-
font-style: italic;
222-
@include px2rem($font-size-print-base-small);
197+
content: 'Hinweis: Interaktive Teile der Webseite sind im Druck nicht sichbar. Bitte schonen Sie die Umwelt und vermeiden unnötige Ausdrucke.';
198+
color: #777;
199+
white-space: pre;
200+
display: block;
201+
margin-top: -40px;
202+
text-align: right;
203+
right: 0;
204+
position: absolute;
205+
font-style: italic;
206+
@include px2rem($font-size-print-base-small);
223207
}
224208
:lang(en) footer:before {
225-
content: 'Notice: Dynamic parts of the websites are hidden in print. Please consider the environment before printing.';
209+
content: 'Notice: Dynamic parts of the websites are hidden in print. Please consider the environment before printing.';
226210
}
227211
}

‎css/sass/elements/_general-classes.scss‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,15 @@ div.aligncenter {
170170
.textcol-default {
171171
color: $colorDefault !important;
172172
}
173+
.textcol-white {
174+
color: white !important;
175+
}
176+
173177

174178
.bgcol-phil {
175179
background-color: $colorPhilFak !important;
176180
}
181+
.bgcol-alert,
177182
.bgcol-rw {
178183
background-color: $colorRwFak !important;
179184
}
@@ -195,6 +200,11 @@ div.aligncenter {
195200
.bgcol-grau {
196201
background-color: $colorStandardHellgrau;
197202
}
203+
.bgcol-white {
204+
background-color: white;
205+
}
206+
207+
198208

199209

200210
/* Rahmen */

‎css/sass/elements/_headlines.scss‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,7 @@ h3 {
121121
padding: 0 0 22px 0;
122122
}
123123

124-
125-
126-
.person & {
127-
@include px2rem($font-size-h3-small);
128-
}
129-
124+
130125
.subpages-menu & {
131126
font-weight: normal;
132127
}
@@ -174,7 +169,7 @@ h4 {
174169
@include px2rem($font-size-h4-sidebar);
175170
}
176171
table & {
177-
@include px2rem($font-size-h4-table);
172+
@include px2rem($font-size-h4-table);
178173
}
179174

180175
}

‎css/sass/elements/_paragraphs.scss‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ p {
5757
}
5858

5959
}
60-
60+
address {
61+
#content .startpage-sidebar .widget &,
62+
#content .sidebar-inline .widget & {
63+
@include px2rem($font-size-sidebar);
64+
}
65+
}
6166

6267
p.presentationtitle {
6368
font-weight: bold;

0 commit comments

Comments
 (0)