diff --git a/config/core.entity_view_display.node.speaker.default.yml b/config/core.entity_view_display.node.speaker.default.yml index 66ab4ee51..b2035205d 100644 --- a/config/core.entity_view_display.node.speaker.default.yml +++ b/config/core.entity_view_display.node.speaker.default.yml @@ -28,23 +28,16 @@ content: third_party_settings: { } region: content field_drupal_org_handle: - weight: 5 + weight: 4 label: inline settings: link_to_entity: false third_party_settings: { } type: string region: content - field_email_address: - weight: 3 - label: hidden - settings: { } - third_party_settings: { } - type: email_mailto - region: content field_organisation: weight: 2 - label: hidden + label: inline settings: link_to_entity: false third_party_settings: { } @@ -60,7 +53,7 @@ content: type: image region: content field_twitter_handle: - weight: 4 + weight: 3 label: inline settings: link_to_entity: false @@ -68,4 +61,5 @@ content: type: string region: content hidden: + field_email_address: true links: true diff --git a/config/core.entity_view_display.node.speaker.speaker_profile.yml b/config/core.entity_view_display.node.speaker.speaker_profile.yml index 6eb58b01d..0b083ae1c 100644 --- a/config/core.entity_view_display.node.speaker.speaker_profile.yml +++ b/config/core.entity_view_display.node.speaker.speaker_profile.yml @@ -38,7 +38,7 @@ content: region: content field_organisation: weight: 2 - label: hidden + label: inline settings: link_to_entity: false third_party_settings: { } diff --git a/config/pathauto.pattern.general_content.yml b/config/pathauto.pattern.general_content.yml new file mode 100644 index 000000000..6c26b994d --- /dev/null +++ b/config/pathauto.pattern.general_content.yml @@ -0,0 +1,24 @@ +uuid: e87e5b5c-f50a-43b3-b448-18a6d12d45b4 +langcode: en +status: true +dependencies: + module: + - node +id: general_content +label: 'General content' +type: 'canonical_entities:node' +pattern: '[node:content-type]/[node:title]' +selection_criteria: + ff6298b2-6b2c-4374-945f-45f55f7f3252: + id: node_type + bundles: + session: session + speaker: speaker + sponsor: sponsor + negate: false + context_mapping: + node: node + uuid: ff6298b2-6b2c-4374-945f-45f55f7f3252 +selection_logic: and +weight: -5 +relationships: { } diff --git a/config/views.view.speaker_profiles.yml b/config/views.view.speaker_profiles.yml index 2c031cf48..c7f930cbc 100644 --- a/config/views.view.speaker_profiles.yml +++ b/config/views.view.speaker_profiles.yml @@ -3,13 +3,13 @@ langcode: en status: true dependencies: config: + - core.entity_view_mode.node.speaker_profile - field.storage.node.body - field.storage.node.field_drupal_org_handle - field.storage.node.field_organisation - field.storage.node.field_profile_picture - field.storage.node.field_twitter_handle - image.style.speaker_profile_large - - image.style.speaker_profile_small - node.type.speaker module: - image @@ -63,7 +63,10 @@ display: style: type: default row: - type: fields + type: 'entity:node' + options: + relationship: none + view_mode: speaker_profile fields: title: id: title diff --git a/web/themes/dcb2017/css/style.css b/web/themes/dcb2017/css/style.css index 32b3bbc89..0ee93e618 100644 --- a/web/themes/dcb2017/css/style.css +++ b/web/themes/dcb2017/css/style.css @@ -20,7 +20,8 @@ h3 { font-size: 1.6em; } h1, h2, h3, h4 { - font-weight: 600; } + font-weight: 600; + margin-bottom: 0.4em; } h1, h2 { text-transform: uppercase; } @@ -383,4 +384,15 @@ nav.menu--main { .node--type-speaker .profile-info { padding-left: 9em; } } +.node--type-speaker.node--view-mode-speaker-profile { + margin-bottom: 2em; } + +.speaker-twitter { + background: url("../images/twitter-1.png") no-repeat left center transparent; + padding: 0 10px 0 20px; } + +.speaker-drupal { + background: url("../images/drop-1.png") no-repeat left center transparent; + padding: 0 10px 0 20px; } + /*# sourceMappingURL=style.css.map */ diff --git a/web/themes/dcb2017/css/style.css.map b/web/themes/dcb2017/css/style.css.map index 567656c66..b1b3bf3a5 100644 --- a/web/themes/dcb2017/css/style.css.map +++ b/web/themes/dcb2017/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["_global.scss","base/_variables.scss","layout/_header.scss","layout/_featured.scss","layout/_content.scss","layout/_content-top.scss","layout/_content-bottom.scss","base/_mixins.scss","layout/_footer.scss","components/_menus.scss","components/_blocks.scss","components/_forms.scss","components/_views.scss","content/_session.scss","content/_speaker.scss"],"names":[],"mappings":"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","file":"style.css","sourcesContent":["html {\n font-family: 'Poppins', sans-serif;\n font-size: 16px;\n}\n\na,\na:visited {\n color: $dcb-grey;\n\n &:hover,\n &:focus {\n color: black;\n }\n}\n\nh1 {\n font-size: 2.4em;\n}\n\nh2 {\n font-size: 2em;\n}\n\nh3 {\n font-size: 1.6em;\n}\n\nh1, h2, h3, h4 {\n font-weight: 600;\n}\n\nh1, h2 {\n text-transform: uppercase;\n}\n","// Custom variables, colours etc.\n\n$dcb-green: #0fa877;\n$dcb-blue: #b33ee9;\n$dcb-purple: #ec16a8;\n\n$dcb-grey: #666;\n",".region-header {\n margin: 0 auto;\n max-width: 72rem;\n overflow: hidden;\n}\n",".region-featured {\n position: relative;\n\n &:after {\n background-image: url('../images/dcb-bg.jpg');\n background-position: center center;\n background-size: cover;\n content: '';\n position: absolute;\n top: 0;\n left: 0;\n right: 0;\n bottom: 0;\n z-index: -1;\n }\n}\n\n.featured-footer {\n background: black;\n color: white;\n font-size: 1.2rem;\n font-weight: bold;\n padding: 1rem;\n text-align: center;\n text-transform: uppercase;\n\n a {\n color: $dcb-purple;\n text-decoration: none;\n\n &:focus,\n &:hover {\n color: $dcb-grey;\n }\n }\n}\n",".region-content {\n margin: 0 auto;\n max-width: 72rem;\n padding: 1rem;\n\n .block-views {\n margin-bottom: 5em;\n }\n}\n",".region-content-top {\n overflow: hidden;\n}\n",".region-content-bottom {\n margin: 2em 0 4em;\n text-align: center;\n\n h2 {\n font-size: 2em;\n font-weight: 700;\n\n @include media-tablet {\n font-size: 3em;\n }\n @include media-large {\n font-size: 4em;\n }\n\n span {\n color: $dcb-green;\n }\n }\n\n .block {\n margin: 2em 1em;\n }\n\n .all-sponsors-link a {\n @include button;\n background-color: $dcb-green;\n\n &:hover,\n &:focus {\n background: $dcb-purple;\n }\n }\n\n img {\n height: auto;\n max-width: 100%;\n }\n}\n","// Tablet size breakpoint 600px.\n@mixin media-tablet {\n @media screen and (min-width: 37.5rem) {\n @content;\n }\n}\n\n// Desktop size breakpoint 900px.\n@mixin media-large {\n @media screen and (min-width: 56.25rem) {\n @content;\n }\n}\n\n// Wide Desktop size breakpoint 1200px.\n@mixin media-wide {\n @media screen and (min-width: 75rem) {\n @content;\n }\n}\n\n@mixin button {\n background: $dcb-blue;\n border: 0;\n color: white;\n font-size: 1rem;\n font-weight: 600;\n padding: 0.5rem 1rem;\n text-decoration: none;\n text-transform: uppercase;\n\n &:hover,\n &:focus {\n background: $dcb-green;\n }\n}\n",".region-footer {\n margin: 0 auto;\n max-width: 72rem;\n padding: 1rem;\n}\n\n.layout-container > footer {\n background-image: url('../images/dcb-bg.jpg');\n background-position: center center;\n background-size: cover;\n}\n","ul.menu {\n margin: 0;\n padding: 0;\n text-align: center;\n\n @include media-tablet {\n text-align: left;\n }\n\n li.menu-item {\n display: inline-block;\n padding: 0.5rem 1rem;\n text-transform: uppercase;\n\n @include media-tablet {\n padding: 1rem 0.8rem;\n }\n\n a {\n color: black;\n text-decoration: none;\n\n &:hover,\n &:focus,\n &.is-active {\n color: $dcb-green;\n }\n }\n }\n}\n\nnav.menu--main {\n font-weight: bold;\n\n @include media-tablet {\n margin: 0.8rem;\n float: right;\n }\n}\n",".block-system-branding-block {\n margin: 0.5rem auto;\n width: 8rem;\n\n @include media-tablet {\n float: left;\n margin: 0.5rem 2rem;\n width: auto;\n }\n}\n\n.site-logo img {\n display: block;\n max-width: 100%;\n width: 11rem;\n}\n\n#block-homepagehero {\n font-size: 1.8rem;\n line-height: 1.2;\n margin: auto;\n max-width: 30rem;\n padding: 3rem 1rem;\n text-align: center;\n\n @include media-large {\n padding: 6rem 1rem;\n }\n\n @include media-wide {\n padding: 10rem 1rem;\n }\n\n img {\n max-width: 100%;\n }\n\n p {\n margin: 1rem 0;\n }\n\n a.tickets,\n a.submit {\n @include button;\n display: inline-block;\n font-size: 1.2rem;\n margin: 0 0.5rem 0.5rem;\n padding: 0.8rem 1.6rem;\n }\n\n a.tickets {\n background-color: $dcb-purple;\n }\n}\n\n#block-dcbschedule {\n overflow: hidden;\n position: relative;\n\n .field {\n box-sizing: border-box;\n padding: 2rem 2rem 2rem;\n position: relative;\n text-align: center;\n text-transform: uppercase;\n\n @include media-large {\n float: left;\n padding: 3rem 3rem 3rem;\n position: static;\n width: 33.333%;\n }\n\n @include media-wide {\n padding: 5rem 4rem 4rem;\n }\n\n &:before {\n bottom: 0;\n content: '';\n left: 0;\n position: absolute;\n top: 0;\n width: 100%;\n z-index: -1;\n background-position: center;\n background-size: cover;\n\n @include media-large {\n width: 33.333%;\n }\n }\n\n &.field--name-field-cxo-text:before {\n background-image: url('../images/cxo.jpg');\n\n @include media-large {\n left: 0;\n }\n }\n &.field--name-field-dev-text:before {\n background-image: url('../images/dev.jpg');\n\n @include media-large {\n left: 33.333%;\n }\n }\n &.field--name-field-sprint-text:before {\n background-image: url('../images/sprint.jpg');\n\n @include media-large {\n left: 66.666%;\n }\n }\n }\n\n p, h2 {\n margin: 0;\n }\n\n h2 {\n font-size: 5rem;\n font-weight: 700;\n line-height: 1;\n\n @include media-large {\n font-size: 3rem;\n }\n\n @include media-wide {\n font-size: 5rem;\n }\n }\n\n .schedule-day {\n font-size: 2.5rem;\n font-weight: bold;\n\n @include media-large {\n font-size: 2rem;\n }\n\n @include media-wide {\n font-size: 2.5rem;\n }\n }\n\n .schedule-location {\n font-size: 1.6rem;\n font-weight: 600;\n padding-top: 2rem;\n\n @include media-large {\n font-size: 1.2rem;\n }\n\n @include media-wide {\n font-size: 1.6rem;\n }\n }\n\n .schedule-date {\n font-size: 1.6rem;\n font-weight: 600;\n\n @include media-large {\n font-size: 1.2rem;\n }\n\n @include media-wide {\n font-size: 1.6rem;\n }\n }\n}\n",".form-item > label {\n display: block;\n font-weight: 600;\n\n &.option {\n display: inline;\n font-weight: normal;\n }\n}\n\n.form-submit {\n @include button;\n}\n\n.form-text,\n.form-email {\n max-width: 95%;\n}\n",".views-view-table {\n td {\n display: block;\n vertical-align: top;\n\n &.views-field-field-logo {\n padding: 1em 0;\n text-align: center;\n\n @include media-large {\n padding: 2em 2em 2em 0;\n }\n }\n\n @include media-large {\n display: table-cell;\n }\n }\n\n .views-field-body a {\n @include button;\n }\n}\n\n.view-silver-sponsors,\n.view-supporting-partners {\n overflow: hidden;\n text-align: center;\n\n .sponsor {\n box-sizing: border-box;\n float: left;\n padding: 1em;\n width: 100%;\n\n @include media-tablet {\n width: 50%;\n }\n\n @include media-large {\n width: 33.333%;\n }\n\n @include media-wide {\n width: 20%;\n }\n }\n\n img {\n height: auto;\n max-width: 100%;\n }\n}\n",".node--type-session {\n .field--name-field-category,\n .field--name-field-level,\n .field--name-field-length {\n padding-right: 5em;\n\n @include media-tablet {\n float: left;\n font-weight: 600;\n\n .field__label {\n display: none;\n }\n }\n }\n\n .field--name-body {\n clear: both;\n padding: 0.5em 0;\n }\n}\n",".node--type-speaker {\n .node__content {\n position: relative;\n }\n\n @include media-tablet {\n .profile-picture {\n position: absolute;\n top: 0;\n left: 0;\n }\n\n .profile-info {\n padding-left: 9em;\n }\n }\n}\n"]} \ No newline at end of file +{"version":3,"sources":["_global.scss","base/_variables.scss","layout/_header.scss","layout/_featured.scss","layout/_content.scss","layout/_content-top.scss","layout/_content-bottom.scss","base/_mixins.scss","layout/_footer.scss","components/_menus.scss","components/_blocks.scss","components/_forms.scss","components/_views.scss","content/_session.scss","content/_speaker.scss"],"names":[],"mappings":"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","file":"style.css","sourcesContent":["html {\n font-family: 'Poppins', sans-serif;\n font-size: 16px;\n}\n\na,\na:visited {\n color: $dcb-grey;\n\n &:hover,\n &:focus {\n color: black;\n }\n}\n\nh1 {\n font-size: 2.4em;\n}\n\nh2 {\n font-size: 2em;\n}\n\nh3 {\n font-size: 1.6em;\n}\n\nh1, h2, h3, h4 {\n font-weight: 600;\n margin-bottom: 0.4em\n}\n\nh1, h2 {\n text-transform: uppercase;\n}\n","// Custom variables, colours etc.\n\n$dcb-green: #0fa877;\n$dcb-blue: #b33ee9;\n$dcb-purple: #ec16a8;\n\n$dcb-grey: #666;\n",".region-header {\n margin: 0 auto;\n max-width: 72rem;\n overflow: hidden;\n}\n",".region-featured {\n position: relative;\n\n &:after {\n background-image: url('../images/dcb-bg.jpg');\n background-position: center center;\n background-size: cover;\n content: '';\n position: absolute;\n top: 0;\n left: 0;\n right: 0;\n bottom: 0;\n z-index: -1;\n }\n}\n\n.featured-footer {\n background: black;\n color: white;\n font-size: 1.2rem;\n font-weight: bold;\n padding: 1rem;\n text-align: center;\n text-transform: uppercase;\n\n a {\n color: $dcb-purple;\n text-decoration: none;\n\n &:focus,\n &:hover {\n color: $dcb-grey;\n }\n }\n}\n",".region-content {\n margin: 0 auto;\n max-width: 72rem;\n padding: 1rem;\n\n .block-views {\n margin-bottom: 5em;\n }\n}\n",".region-content-top {\n overflow: hidden;\n}\n",".region-content-bottom {\n margin: 2em 0 4em;\n text-align: center;\n\n h2 {\n font-size: 2em;\n font-weight: 700;\n\n @include media-tablet {\n font-size: 3em;\n }\n @include media-large {\n font-size: 4em;\n }\n\n span {\n color: $dcb-green;\n }\n }\n\n .block {\n margin: 2em 1em;\n }\n\n .all-sponsors-link a {\n @include button;\n background-color: $dcb-green;\n\n &:hover,\n &:focus {\n background: $dcb-purple;\n }\n }\n\n img {\n height: auto;\n max-width: 100%;\n }\n}\n","// Tablet size breakpoint 600px.\n@mixin media-tablet {\n @media screen and (min-width: 37.5rem) {\n @content;\n }\n}\n\n// Desktop size breakpoint 900px.\n@mixin media-large {\n @media screen and (min-width: 56.25rem) {\n @content;\n }\n}\n\n// Wide Desktop size breakpoint 1200px.\n@mixin media-wide {\n @media screen and (min-width: 75rem) {\n @content;\n }\n}\n\n@mixin button {\n background: $dcb-blue;\n border: 0;\n color: white;\n font-size: 1rem;\n font-weight: 600;\n padding: 0.5rem 1rem;\n text-decoration: none;\n text-transform: uppercase;\n\n &:hover,\n &:focus {\n background: $dcb-green;\n }\n}\n",".region-footer {\n margin: 0 auto;\n max-width: 72rem;\n padding: 1rem;\n}\n\n.layout-container > footer {\n background-image: url('../images/dcb-bg.jpg');\n background-position: center center;\n background-size: cover;\n}\n","ul.menu {\n margin: 0;\n padding: 0;\n text-align: center;\n\n @include media-tablet {\n text-align: left;\n }\n\n li.menu-item {\n display: inline-block;\n padding: 0.5rem 1rem;\n text-transform: uppercase;\n\n @include media-tablet {\n padding: 1rem 0.8rem;\n }\n\n a {\n color: black;\n text-decoration: none;\n\n &:hover,\n &:focus,\n &.is-active {\n color: $dcb-green;\n }\n }\n }\n}\n\nnav.menu--main {\n font-weight: bold;\n\n @include media-tablet {\n margin: 0.8rem;\n float: right;\n }\n}\n",".block-system-branding-block {\n margin: 0.5rem auto;\n width: 8rem;\n\n @include media-tablet {\n float: left;\n margin: 0.5rem 2rem;\n width: auto;\n }\n}\n\n.site-logo img {\n display: block;\n max-width: 100%;\n width: 11rem;\n}\n\n#block-homepagehero {\n font-size: 1.8rem;\n line-height: 1.2;\n margin: auto;\n max-width: 30rem;\n padding: 3rem 1rem;\n text-align: center;\n\n @include media-large {\n padding: 6rem 1rem;\n }\n\n @include media-wide {\n padding: 10rem 1rem;\n }\n\n img {\n max-width: 100%;\n }\n\n p {\n margin: 1rem 0;\n }\n\n a.tickets,\n a.submit {\n @include button;\n display: inline-block;\n font-size: 1.2rem;\n margin: 0 0.5rem 0.5rem;\n padding: 0.8rem 1.6rem;\n }\n\n a.tickets {\n background-color: $dcb-purple;\n }\n}\n\n#block-dcbschedule {\n overflow: hidden;\n position: relative;\n\n .field {\n box-sizing: border-box;\n padding: 2rem 2rem 2rem;\n position: relative;\n text-align: center;\n text-transform: uppercase;\n\n @include media-large {\n float: left;\n padding: 3rem 3rem 3rem;\n position: static;\n width: 33.333%;\n }\n\n @include media-wide {\n padding: 5rem 4rem 4rem;\n }\n\n &:before {\n bottom: 0;\n content: '';\n left: 0;\n position: absolute;\n top: 0;\n width: 100%;\n z-index: -1;\n background-position: center;\n background-size: cover;\n\n @include media-large {\n width: 33.333%;\n }\n }\n\n &.field--name-field-cxo-text:before {\n background-image: url('../images/cxo.jpg');\n\n @include media-large {\n left: 0;\n }\n }\n &.field--name-field-dev-text:before {\n background-image: url('../images/dev.jpg');\n\n @include media-large {\n left: 33.333%;\n }\n }\n &.field--name-field-sprint-text:before {\n background-image: url('../images/sprint.jpg');\n\n @include media-large {\n left: 66.666%;\n }\n }\n }\n\n p, h2 {\n margin: 0;\n }\n\n h2 {\n font-size: 5rem;\n font-weight: 700;\n line-height: 1;\n\n @include media-large {\n font-size: 3rem;\n }\n\n @include media-wide {\n font-size: 5rem;\n }\n }\n\n .schedule-day {\n font-size: 2.5rem;\n font-weight: bold;\n\n @include media-large {\n font-size: 2rem;\n }\n\n @include media-wide {\n font-size: 2.5rem;\n }\n }\n\n .schedule-location {\n font-size: 1.6rem;\n font-weight: 600;\n padding-top: 2rem;\n\n @include media-large {\n font-size: 1.2rem;\n }\n\n @include media-wide {\n font-size: 1.6rem;\n }\n }\n\n .schedule-date {\n font-size: 1.6rem;\n font-weight: 600;\n\n @include media-large {\n font-size: 1.2rem;\n }\n\n @include media-wide {\n font-size: 1.6rem;\n }\n }\n}\n",".form-item > label {\n display: block;\n font-weight: 600;\n\n &.option {\n display: inline;\n font-weight: normal;\n }\n}\n\n.form-submit {\n @include button;\n}\n\n.form-text,\n.form-email {\n max-width: 95%;\n}\n",".views-view-table {\n td {\n display: block;\n vertical-align: top;\n\n &.views-field-field-logo {\n padding: 1em 0;\n text-align: center;\n\n @include media-large {\n padding: 2em 2em 2em 0;\n }\n }\n\n @include media-large {\n display: table-cell;\n }\n }\n\n .views-field-body a {\n @include button;\n }\n}\n\n.view-silver-sponsors,\n.view-supporting-partners {\n overflow: hidden;\n text-align: center;\n\n .sponsor {\n box-sizing: border-box;\n float: left;\n padding: 1em;\n width: 100%;\n\n @include media-tablet {\n width: 50%;\n }\n\n @include media-large {\n width: 33.333%;\n }\n\n @include media-wide {\n width: 20%;\n }\n }\n\n img {\n height: auto;\n max-width: 100%;\n }\n}\n",".node--type-session {\n .field--name-field-category,\n .field--name-field-level,\n .field--name-field-length {\n padding-right: 5em;\n\n @include media-tablet {\n float: left;\n font-weight: 600;\n\n .field__label {\n display: none;\n }\n }\n }\n\n .field--name-body {\n clear: both;\n padding: 0.5em 0;\n }\n}\n",".node--type-speaker {\n .node__content {\n position: relative;\n }\n\n @include media-tablet {\n .profile-picture {\n position: absolute;\n top: 0;\n left: 0;\n }\n\n .profile-info {\n padding-left: 9em;\n }\n }\n\n &.node--view-mode-speaker-profile {\n margin-bottom: 2em;\n }\n}\n\n.speaker-twitter {\n background: url('../images/twitter-1.png') no-repeat left center transparent;\n padding: 0 10px 0 20px;\n}\n\n.speaker-drupal {\n background: url('../images/drop-1.png') no-repeat left center transparent;\n padding: 0 10px 0 20px;\n}\n"]} \ No newline at end of file diff --git a/web/themes/dcb2017/images/drop-1.png b/web/themes/dcb2017/images/drop-1.png new file mode 100644 index 000000000..6f628d101 Binary files /dev/null and b/web/themes/dcb2017/images/drop-1.png differ diff --git a/web/themes/dcb2017/images/twitter-1.png b/web/themes/dcb2017/images/twitter-1.png new file mode 100644 index 000000000..9d65a77e2 Binary files /dev/null and b/web/themes/dcb2017/images/twitter-1.png differ diff --git a/web/themes/dcb2017/sass/_global.scss b/web/themes/dcb2017/sass/_global.scss index 81026c44a..ae2b0e3e1 100644 --- a/web/themes/dcb2017/sass/_global.scss +++ b/web/themes/dcb2017/sass/_global.scss @@ -27,6 +27,7 @@ h3 { h1, h2, h3, h4 { font-weight: 600; + margin-bottom: 0.4em } h1, h2 { diff --git a/web/themes/dcb2017/sass/content/_speaker.scss b/web/themes/dcb2017/sass/content/_speaker.scss index 41d86da59..6305b1e7c 100644 --- a/web/themes/dcb2017/sass/content/_speaker.scss +++ b/web/themes/dcb2017/sass/content/_speaker.scss @@ -14,4 +14,18 @@ padding-left: 9em; } } + + &.node--view-mode-speaker-profile { + margin-bottom: 2em; + } +} + +.speaker-twitter { + background: url('../images/twitter-1.png') no-repeat left center transparent; + padding: 0 10px 0 20px; +} + +.speaker-drupal { + background: url('../images/drop-1.png') no-repeat left center transparent; + padding: 0 10px 0 20px; } diff --git a/web/themes/dcb2017/templates/content/node--speaker.html.twig b/web/themes/dcb2017/templates/content/node--speaker.html.twig index 7c4818037..d96a96f14 100644 --- a/web/themes/dcb2017/templates/content/node--speaker.html.twig +++ b/web/themes/dcb2017/templates/content/node--speaker.html.twig @@ -104,6 +104,7 @@ {{ node.field_drupal_org_handle.value }} {% endif %} + {{ content.field_organisation }} {{ content.body }}