Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

Commit

Permalink
Merge pull request #650 from comicrelief/1.19.0
Browse files Browse the repository at this point in the history
1.19.0
  • Loading branch information
pvhee committed Nov 23, 2016
2 parents 91d5831 + 3102fdb commit 2aed955
Show file tree
Hide file tree
Showing 64 changed files with 19,220 additions and 297 deletions.
8 changes: 8 additions & 0 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,11 @@ to export all config in one go.
We use [KSS](https://github.com/kss-node/kss/blob/spec/SPEC.md) to build our styleguide.

When you create a new sass component please follow the same pattern from existem files for `grunt watch` to auto generate and update the styleguide with the new component.

### IE9 CSS Issue

IE 9 CSS limitation by preventing more than 4095 selectors in a CSS file.

To fix this issue we have used [Bless](http://blesscss.com/) to split our styles.css into files with less than 4095 selectors and committed them. We have created a condition in our html twig template to add those files only if lte IE9.

Currently our IE9 traffic is less than 1% . This is temporary fix and eventually at some point we will stop supporting IE9 and remove those conditions and files.
1 change: 1 addition & 0 deletions profiles/cr/cr.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ config_devel:
- image.style.story_739_x_561_crop_sm
- image.style.cw_quote_lg
- image.style.cw_quote_sm
- image.style.cr_1400_x_658

# Retina image styles
- image.style.bg_rich_text_narrow_2x
Expand Down
2 changes: 1 addition & 1 deletion profiles/cr/drupal-org.make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,5 +192,5 @@ libraries:
modernizr:
download:
type: "get"
url: https://raw.githubusercontent.com/bimsonz/modernizr-custom/cec9a0ef2c8ef41260b371f2ec6519da766af4fa/modernizr-custom.js
url: https://raw.githubusercontent.com/comicrelief/campaign-modernizr/master/modernizr-custom.js
destination: "themes/custom/campaign_base/libraries"
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ settings:
visibility:
request_path:
id: request_path
pages: /whats-going-on
pages: "/whats-going-on\r\n/news-tv-and-events/news"
negate: false
context_mapping: { }
'entity_bundle:node':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@ langcode: en
status: true
dependencies:
module:
- ctools
- node
id: article
label: Article
type: 'canonical_entities:node'
pattern: 'whats-going-on/[node:title]'
pattern: '/news-tv-and-events/news/[node:title]'
selection_criteria:
9fe72180-c75e-41b1-a200-adea6cb7bdfc:
id: 'entity_bundle:node'
f77697e3-10a4-48a8-936e-35bcc8c22d09:
id: node_type
bundles:
article: article
negate: false
context_mapping:
node: node
uuid: 9fe72180-c75e-41b1-a200-adea6cb7bdfc
uuid: f77697e3-10a4-48a8-936e-35bcc8c22d09
selection_logic: and
weight: -5
relationships: { }
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- field.field.block_content.teaser.field_teaser_link_title
- field.field.block_content.teaser.field_teaser_title
- field.field.block_content.teaser.field_teaser_you_tube_link
- responsive_image.styles.cw_landscape_image
- responsive_image.styles.cw_medium_image_blocks
module:
- ds
- options
Expand Down Expand Up @@ -88,7 +88,7 @@ content:
weight: 2
label: hidden
settings:
responsive_image_style: cw_landscape_image
responsive_image_style: cw_medium_image_blocks
image_link: ''
third_party_settings: { }
type: responsive_image
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: cr_1400_x_658
label: 'CR 1400 x 658'
effects:
53232449-a763-456d-837d-59828052e6c0:
uuid: 53232449-a763-456d-837d-59828052e6c0
id: focal_point_scale_and_crop
weight: 1
data:
width: '1400'
height: '658'
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
langcode: en
status: true
dependencies:
module:
- focal_point
name: cr_1400_x_658_2x
label: 'CR 1400 x 658 2x'
effects:
712c34b1-d50e-466d-9493-88d10d792a02:
uuid: 712c34b1-d50e-466d-9493-88d10d792a02
id: focal_point_scale_and_crop
weight: 1
data:
width: '2800'
height: '1316'
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ image_style_mappings:
image_mapping_type: image_style
image_mapping: cw_16_9_lg_800x450_2x_
-
breakpoint_id: campaign_base.tablet
breakpoint_id: campaign_base.medium
multiplier: 1x
image_mapping_type: image_style
image_mapping: cw_large_780x440
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@ langcode: en
status: true
dependencies:
config:
- image.style.cw_16_9_lg_800x450_2x_
- image.style.cw_large_780x440
id: cw_landscape_image
label: 'CW Standard image blocks'
- image.style.cr_1400_x_658
- image.style.cr_1400_x_658_2x
id: cw_medium_image_blocks
label: 'CW Medium image blocks'
image_style_mappings:
-
breakpoint_id: campaign_base.large
multiplier: 1x
image_mapping_type: image_style
image_mapping: cw_large_780x440
image_mapping: cr_1400_x_658
-
breakpoint_id: campaign_base.large
multiplier: 2x
image_mapping_type: image_style
image_mapping: cw_16_9_lg_800x450_2x_
image_mapping: cr_1400_x_658_2x
-
breakpoint_id: campaign_base.tablet
breakpoint_id: campaign_base.medium
multiplier: 1x
image_mapping_type: image_style
image_mapping: cw_large_780x440
image_mapping: cr_1400_x_658
-
breakpoint_id: campaign_base.medium
multiplier: 2x
image_mapping_type: image_style
image_mapping: cw_16_9_lg_800x450_2x_
image_mapping: cr_1400_x_658_2x
-
breakpoint_id: campaign_base.small
multiplier: 1x
image_mapping_type: image_style
image_mapping: cw_large_780x440
image_mapping: cr_1400_x_658
-
breakpoint_id: campaign_base.small
multiplier: 2x
image_mapping_type: image_style
image_mapping: cw_16_9_lg_800x450_2x_
image_mapping: cr_1400_x_658_2x
breakpoint_group: campaign_base
fallback_image_style: cw_large_780x440
fallback_image_style: cr_1400_x_658
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ config_devel:
- image.style.cr_md_740_x_450
- image.style.cr_md_740_x_450_2x
- image.style.cw_16_9_lg_800x450_2x_
- image.style.cr_1400_x_658_2x
- image.style.cr_1400_x_658
# Responsive image styles
- responsive_image.styles.cw_bg_image_blocks
- responsive_image.styles.cw_landscape_image
- responsive_image.styles.cw_medium_image_blocks

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
],
"uri": [
{
"value": "public:\/\/2016-04\/SR16_small_centre_promo_whats-going-on_desktop_2_1_0_1_10_12_19_0.jpg"
"value": "public:\/\/2016-04\/SR16_small_centre_promo_whats-going-on_desktop_2_1_0_1_10_12_19_0_7_0.jpg"
}
],
"filemime": [
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 2aed955

Please sign in to comment.