Skip to content

Commit 77a6fa4

Browse files
committed
FAXE-381 merged
2 parents e73b3c9 + 6b8d95c commit 77a6fa4

File tree

19 files changed

+959
-21
lines changed

19 files changed

+959
-21
lines changed

.docksal/docksal.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ services:
1414
- PMA_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}
1515
labels:
1616
- io.docksal.virtual-host=pma.${VIRTUAL_HOST}
17+
solr:
18+
image: docksal/solr:7.5-edge
19+
volumes:
20+
- ${PROJECT_ROOT}/.docksal/etc/solr/conf:/var/lib/solr/conf:ro
21+
extends:
22+
file: ${HOME}/.docksal/stacks/services.yml
23+
service: solr
24+
labels:
25+
- 'io.docksal.virtual-host=solr.${VIRTUAL_HOST}'
26+
1727

1828
# blackfire:
1929
# extends:

web/sites/default/dev.settings.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,5 @@
161161
'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
162162
'driver' => 'mysql',
163163
);
164+
165+
$settings['file_private_path'] = 'private';

web/themes/custom/fds_faxe_theme/dist/stylesheets/stylesheet.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.

web/themes/custom/fds_faxe_theme/src/styles/theme/components/_box.scss

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
padding: 20px 20px;
3030
color: $color-black;
3131
background-color: #fff;
32+
3233
.field--name-field-os2web-icon {
3334
img {
3435
width: 65px;
@@ -123,6 +124,87 @@
123124

124125
}
125126

127+
.sidebar__box {
128+
background-color: white;
129+
130+
.sidebar__box-heading {
131+
padding: 40px;
132+
position: relative;
133+
134+
&:after {
135+
display: block;
136+
position: absolute;
137+
content: "";
138+
height: 2px;
139+
width: 140px;
140+
left: 0;
141+
bottom: 19px;
142+
background-color: #e2dddb;
143+
}
144+
h2 {
145+
font-size: 2.4rem;
146+
color: #00789e;
147+
font-weight: normal;
148+
}
149+
}
150+
.sidebar__box-body {
151+
padding: 0 40px 40px 40px;
152+
}
153+
}
154+
155+
156+
#block-indholdfield-ext-links {
157+
h2 {
158+
font-size: 2.4rem;
159+
color: #00789e;
160+
font-weight: normal;
161+
position: relative;
162+
padding: 40px;
163+
164+
&:after {
165+
display: block;
166+
position: absolute;
167+
content: "";
168+
height: 2px;
169+
width: 140px;
170+
left: 0;
171+
bottom: 19px;
172+
background-color: #e2dddb;
173+
}
174+
}
175+
176+
.field--name-field-selfbetjening-ref {
177+
padding: 0 40px 40px 40px;
178+
179+
.field__item {
180+
a {
181+
padding-left: 35px;
182+
text-decoration: none;
183+
position: relative;
184+
color: black;
185+
186+
&:hover {
187+
text-decoration: underline;
188+
}
189+
190+
&:before {
191+
top: -1px;
192+
left: 0;
193+
position: absolute;
194+
font-size: 2.4rem;
195+
font-family: "Material Icons";
196+
content: "keyboard_backspace";
197+
198+
color: $color__bullets;
199+
200+
transform: rotate(180deg);
201+
}
202+
}
203+
}
204+
}
205+
}
206+
207+
126208

127209
// --------------------------------------------------
128210
// Responsive

web/themes/custom/fds_faxe_theme/templates/block/block--os2web-contact--sidebar-second.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{%
22
set classes = [
3-
'box',
3+
'sidebar__box',
44
'block',
55
'block-' ~ configuration.provider|clean_class,
66
'block-' ~ plugin_id|clean_class,
@@ -9,7 +9,7 @@
99
<div{{ attributes.addClass(classes) }}>
1010
{{ title_prefix }}
1111
{% if label %}
12-
<div class="box__heading">
12+
<div class="sidebar__box-heading">
1313
<h2{{ title_attributes.addClass('h4') }}>{{ label }}</h2>
1414
</div>
1515
{% endif %}

web/themes/custom/fds_faxe_theme/templates/block/related-links/block--os2web-pagebuilder-related-links--sidebar-second.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{%
22
set classes = [
3-
'box',
3+
'sidebar__box',
44
'block',
55
'block-' ~ configuration.provider|clean_class,
66
'block-' ~ plugin_id|clean_class,
@@ -9,13 +9,13 @@
99
<div{{ attributes.addClass(classes) }}>
1010
{{ title_prefix }}
1111
{% if label %}
12-
<div class="box__heading">
12+
<div class="sidebar__box-heading">
1313
<h2{{ title_attributes.addClass('h4') }}>{{ label }}</h2>
1414
</div>
1515
{% endif %}
1616
{{ title_suffix }}
1717
{% block content %}
18-
<div class="box__body">
18+
<div class="sidebar__box-body">
1919
{{ content }}
2020
</div>
2121
{% endblock %}

web/themes/custom/fds_faxe_theme/templates/entities/contact/os2web-contact.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% set modalId = 'modal-' ~ random() %}
22

33
<div{{ attributes.addClass('os2web_contact os2web-contact') }}>
4-
<div class="box__heading">
4+
<div class="sidebar__box-heading">
55
{{ content.field_os2web_contact_heading }}
66
</div>
7-
<div class="box__body">
7+
<div class="sidebar__box-body">
88
{{ content.field_os2web_contact_body }}
99
{{ content.field_os2web_contact_phone }}
1010
{{ content.field_os2web_contact_email }}

0 commit comments

Comments
 (0)