From b4b4bebbc9fd03940cff7bca7e7f536d8e69939d Mon Sep 17 00:00:00 2001 From: Felix Fennell Date: Wed, 21 Oct 2015 18:39:06 +0100 Subject: [PATCH 01/51] Updating CDN links --- README.md | 1 + _config.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6f88be7..e550d0c 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # BAS Style Kit +Master: [![Build Status](https://semaphoreci.com/api/v1/projects/0f33c45e-b93f-4491-aa1a-eb4848653351/573094/badge.svg)](https://semaphoreci.com/antarctica/bas-style-kit) Develop: [![Build Status](https://semaphoreci.com/api/v1/projects/0f33c45e-b93f-4491-aa1a-eb4848653351/569676/badge.svg)](https://semaphoreci.com/antarctica/bas-style-kit) A collection of HTML, CSS, and JS components for developing web projects consistent with the BAS brand. diff --git a/_config.yml b/_config.yml index 61595b4..3a3404a 100755 --- a/_config.yml +++ b/_config.yml @@ -32,8 +32,8 @@ download: source: https://stash.ceh.ac.uk/plugins/servlet/archive/projects/BSK/repos/bas-style-kit?at=refs%2Ftags%2Fv0.1.0-alpha dist: https://bascdnprod.blob.core.windows.net/bas-style-kit/0.1.0-alpha/bas_style_kit_0.1.0-alpha.zip cdn: - bsk-css: https://s3-eu-west-1.amazonaws.com/bas-cdn-prod/bas-style-kit/0.1.0-alpha/dist/css/bas-style-kit.min.css - bootstrap-bsk-css: https://s3-eu-west-1.amazonaws.com/bas-cdn-prod/bas-style-kit/0.1.0-alpha/dist/css/bootstrap-bsk.min.css + bsk-css: https://cdn.bas.ac.uk/bas-style-kit/0.1.0-alpha/dist/css/bas-style-kit.min.css + bootstrap-bsk-css: https://cdn.bas.ac.uk/bas-style-kit/0.1.0-alpha/dist/css/bootstrap-bsk.min.css # Google analytics token (each environment uses a different token - dev is not tracked as it isn't a valid FQDN) analytics_token_prod: UA-64130716-27 From 8088ed2f41bdcd0286623f4f5df8457b8f55aaa4 Mon Sep 17 00:00:00 2001 From: Felix Fennell Date: Wed, 21 Oct 2015 18:40:16 +0100 Subject: [PATCH 02/51] Correcting CDN URLs --- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 3a3404a..636ca07 100755 --- a/_config.yml +++ b/_config.yml @@ -32,8 +32,8 @@ download: source: https://stash.ceh.ac.uk/plugins/servlet/archive/projects/BSK/repos/bas-style-kit?at=refs%2Ftags%2Fv0.1.0-alpha dist: https://bascdnprod.blob.core.windows.net/bas-style-kit/0.1.0-alpha/bas_style_kit_0.1.0-alpha.zip cdn: - bsk-css: https://cdn.bas.ac.uk/bas-style-kit/0.1.0-alpha/dist/css/bas-style-kit.min.css - bootstrap-bsk-css: https://cdn.bas.ac.uk/bas-style-kit/0.1.0-alpha/dist/css/bootstrap-bsk.min.css + bsk-css: https://cdn.web.bas.ac.uk/bas-style-kit/0.1.0-alpha/dist/css/bas-style-kit.min.css + bootstrap-bsk-css: https://cdn.web.bas.ac.uk/bas-style-kit/0.1.0-alpha/dist/css/bootstrap-bsk.min.css # Google analytics token (each environment uses a different token - dev is not tracked as it isn't a valid FQDN) analytics_token_prod: UA-64130716-27 From 1d42ee65d4c5fcc6d30a3dccfbf837919dcf4c13 Mon Sep 17 00:00:00 2001 From: Felix Fennell Date: Thu, 22 Oct 2015 09:43:31 +0100 Subject: [PATCH 03/51] Fixing repo URL links --- _config.yml | 2 +- documentation/end-users/_includes/footer.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 3a3404a..852aef0 100755 --- a/_config.yml +++ b/_config.yml @@ -22,7 +22,7 @@ encoding: UTF-8 version: 0.1.0-beta -repo: https://stash.ceh.ac.uk/projects/BSK/repos/bas-style-kit/browse +repo: https://stash.ceh.ac.uk/projects/BSK/repos/bas-style-kit issues: https://jira.ceh.ac.uk/browse/BSK style_guide_url: https://antarctica.hackpad.com/BAS-Style-Guide-NT1D10DRTCo feedback_attributes: data-bsk-action="open-feedback-form" diff --git a/documentation/end-users/_includes/footer.html b/documentation/end-users/_includes/footer.html index 7e86891..f961389 100755 --- a/documentation/end-users/_includes/footer.html +++ b/documentation/end-users/_includes/footer.html @@ -11,9 +11,9 @@ {% highlight html %} + + {% endhighlight %} diff --git a/documentation/end-users/_includes/css/grid.html b/documentation/end-users/_includes/css/grid.html index 3a31464..e72485c 100755 --- a/documentation/end-users/_includes/css/grid.html +++ b/documentation/end-users/_includes/css/grid.html @@ -15,7 +15,7 @@

Grid system

Introduction

Grid systems are used for creating page layouts through a series of rows and columns that house your content.
Here's how the Bootstrap grid system, used by the BAS Style Kit, works:

-