Skip to content

Commit 391fc0d

Browse files
cassandrecassandre
authored
Merge pull request #263 from RRZE-Webteam/dev
v1.25.3
2 parents 07aa136 + 600ac2a commit 391fc0d

22 files changed

+629
-54
lines changed

‎assets/css/_columns.scss

+3
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@
139139
.entry-content {
140140
min-width: 0;
141141
}
142+
.limit-width {
143+
min-width: 0;
144+
}
142145
}
143146

144147
@media (min-width: 480px) {

‎assets/css/_cta.scss

+128-10
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
margin: 2em 0;
44
color: #fff;
55
background-color: var(--color-zentral-primary, #04316a);
6-
$backgrounds: '1', '2';
6+
$backgrounds: '1', 'rrze';
77
@each $background in $backgrounds {
88
&.bg-#{$background} {
9-
background-image: url("../svg/cta/FAU-Sinuskurven-0#{$background}.svg");
9+
background-image: url("../svg/cta/background-#{$background}.svg");
1010
background-position: bottom 50% left;
1111
background-size: 100%;
1212
background-repeat: no-repeat;
@@ -21,8 +21,14 @@
2121
justify-content: space-between;
2222
flex-wrap: wrap;
2323
}
24+
.rrze-2019 & {
25+
background-color: #005CAE;
26+
}
2427
.cta-content {
2528
padding: 10px;
29+
.rrze-2019 & {
30+
text-shadow: 0 0 5px #005CAE;
31+
}
2632
@media screen and (min-width: 992px) {
2733
flex-basis: 60%;
2834
flex-grow: 1;
@@ -48,15 +54,16 @@
4854
}
4955
}
5056
}
51-
.cta-button-container {
57+
.cta-button-container,
58+
.cta-search-container {
5259
padding: 10px 1em 1em 10px;
5360
display: flex;
5461
justify-content: flex-end;
5562
@media screen and (min-width: 992px) {
5663
position: absolute;
5764
bottom: 0;
5865
width: 100%;
59-
padding-bottom: 2em;
66+
padding: 10px 6.5em 2em 6.5em;
6067
}
6168
}
6269
.cta-button {
@@ -66,13 +73,20 @@
6673
//margin: 1em 0;
6774
box-shadow: none;
6875
text-decoration: none;
69-
color: var(--color-Text);
76+
color: var(--color-Text, #222222);
7077
font-weight: bold;
7178
border-radius: 0;
7279
&:hover, &:focus, &:active {
7380
box-shadow: none;
7481
background-color: var(--color-button-bg, #1f4c7a);
7582
text-decoration: none;
83+
.rrze-2019 & {
84+
background-color: #00458C;
85+
color: #ffffff;
86+
}
87+
}
88+
.rrze-2019 & {
89+
color: #393944;
7690
}
7791
.rrze-elements-icon {
7892
margin-left: 1em;
@@ -83,13 +97,66 @@
8397
border-radius: 0 !important;
8498
}
8599
@media screen and (min-width: 992px) {
86-
position: relative;
87-
right: 15%;
88-
max-width: 80%;
100+
max-width: 100%;
89101
font-size: 1.25em;
90102
padding: 0.65em 1.5em 0.65em 2.5em;
91103
}
92104
}
105+
.cta-search {
106+
width: 100%;
107+
display: flex;
108+
justify-content: flex-end;
109+
@media screen and (min-width: 992px) {
110+
//position: relative;
111+
//right: 15%;
112+
max-width: 100%;
113+
//font-size: 1.25em;
114+
//padding: 0.65em 1.5em 0.65em 2.5em;
115+
}
116+
label {
117+
@include hideout();
118+
}
119+
input[type="text"] {
120+
margin: 0;
121+
width: clamp(20ch,50ch,100%);
122+
}
123+
input[type="text"],
124+
input[type="submit"],
125+
button[type="submit"] {
126+
border-radius: 0;
127+
border: none;
128+
font-size: 1rem;
129+
height: 3em;
130+
margin: 0;
131+
}
132+
input[type="text"] {
133+
background-color: #fff;
134+
}
135+
input[type="submit"],
136+
button[type="submit"] {
137+
position: relative;
138+
padding-left: 1em;
139+
padding-right: 1em;
140+
background-color: #fff;
141+
color: var(--color-Text, #222222);
142+
.rrze-2019 & {
143+
color: #393944;
144+
}
145+
svg {
146+
top: 0;
147+
}
148+
&:hover, &:focus, &.active {
149+
background-color: var(--color-button-bg, #004a9f);
150+
color: #fff;
151+
svg {
152+
fill: #fff !important;
153+
}
154+
.rrze-2019 & {
155+
background-color: #00458c;
156+
}
157+
}
158+
}
159+
}
93160
.cta-image {
94161
display: none;
95162
img {
@@ -104,6 +171,44 @@
104171
}
105172

106173
}
174+
&.style-small {
175+
background-size: cover;
176+
.cta-content {
177+
@media screen and (min-width: 992px) {
178+
padding: min(5%,2em) min(5%,2em) 120px;
179+
}
180+
}
181+
.cta-image {
182+
min-width: 0;
183+
}
184+
.cta-button-container,
185+
.cta-search-container {
186+
padding: 10px;
187+
@media screen and (min-width: 992px) {
188+
padding: 0 min(5%, 2em) min(5%, 2em);
189+
}
190+
}
191+
.cta-button {
192+
@media screen and (min-width: 992px) {
193+
position: static;
194+
max-width: 100%;
195+
padding: .5em 1em;
196+
}
197+
.rrze-elements-icon {
198+
margin-left: .25em;
199+
}
200+
}
201+
&.no-image {
202+
.cta-content {
203+
@media screen and (min-width: 992px) {
204+
padding: min(5%, 2em) min(5%, 2em) 120px;
205+
}
206+
@media screen and (min-width: 1200px) {
207+
min-height: auto;
208+
}
209+
}
210+
}
211+
}
107212
&.no-image {
108213
.cta-button {
109214
@media screen and (min-width: 992px) {
@@ -119,7 +224,8 @@
119224
min-height: 360px;
120225
}
121226
}
122-
.cta-button-container {
227+
.cta-button-container,
228+
.cta-search-container {
123229
@media screen and (min-width: 992px) {
124230
padding-right: 4em;
125231
padding-left: 4em;
@@ -130,6 +236,18 @@
130236
background-position: left bottom;
131237
}
132238
}
239+
&.bg-rrze {
240+
background-size: cover;
241+
background-position: center center;
242+
}
243+
&.style-small {
244+
.cta-button-container,
245+
.cta-search-container {
246+
@media screen and (min-width: 992px) {
247+
padding-right: min(5%,2em);
248+
padding-left: min(5%,2em);
249+
}
250+
}
251+
}
133252
}
134-
135253
}

‎assets/css/_icons.scss

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ svg.rrze-elements-icon {
1212
a:hover > &, a:focus > &, a:active > & {
1313
background-color: var(--color-button-bg, #1f4c7a);
1414
color: var(--color-button-text, #ffffff);
15+
.rrze-2019 & {
16+
background-color: #00458C;
17+
}
1518
}
1619
}
1720

‎assets/css/_limit-width.scss

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.limit-width {
2+
min-width: 260px;
3+
}

‎assets/css/_mixins.scss

+9
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ Functions and Mixins
3838
background-clip: padding-box;
3939
}
4040

41+
@mixin hideout() {
42+
position: absolute;
43+
left: -10000px;
44+
top: auto;
45+
width: 1px;
46+
height: 1px;
47+
overflow: hidden;
48+
}
49+
4150
@mixin svg-content($svg, $subset: 'solid') {
4251
content: url("../svg/#{$subset}/#{$svg}.svg");
4352
display: inline-block;

‎assets/css/rrze-elements.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/rrze-elements.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/rrze-elements.scss

+3
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,8 @@
6464
//Table Sort/Filter
6565
@import "tables";
6666

67+
// Limit-Width
68+
@import "limit-width";
69+
6770
//CTA
6871
@import "cta";

‎assets/svg/cta/FAU-Sinuskurven-01.svg ‎assets/svg/cta/background-1.svg

File renamed without changes.

0 commit comments

Comments
 (0)