Merge pull request #2 from gavboulton/add-govuk-toolkit

Add govuk frontend toolkit, update colour variables using toolkit

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "govuk_toolkit"]
+	path = govuk_toolkit
+	url = https://github.com/alphagov/govuk_frontend_toolkit.git

README.md

@@ -1,19 +1,32 @@
-BootGov v.0.4
+BootGov v.0.5
 -------------------
 A [Boostrap 3](http://getbootstrap.com/) theme using the [design principles](https://www.gov.uk/service-manual) and [style guide](https://www.gov.uk/service-manual/designers) from [GOV.UK](https://www.GOV.UK/).
 
-Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development, created and maintained by [Somme Sakounthong](mailto:[email protected])
+Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development, created and maintained by [Somme Sakounthong](mailto:[email protected]).
+
+This uses the [gov.uk frontend toolkit](https://github.com/alphagov/govuk_frontend_toolkit) as a git submodule. After first cloning the BootGov repo you will need to initialise the submodule with the following command:
+
+```
+$ git submodule init
+```
+
+To update the toolkit to the latest version you can use:
+
+```
+$ git submodule update
+```
 
 NOTE: This theme was developed and provided free of charge. Feel free to contribute on [GitHub](https://github.com/somme/BootGov).
 
 -----------
 
 ## Change log
 
- * v.0.4 - Added example: prettyCheckable,js
- * v.0.3 - Added example: Typeahead.js
- * v.0.2 - Added example: Responsive form with inline validation
- * v.0.1 - Initial commmit
+ * v.0.5 — Added NTA fonts and govuk fronend toolkit 
+ * v.0.4 — Added example: prettyCheckable,js
+ * v.0.3 — Added example: Typeahead.js
+ * v.0.2 — Added example: Responsive form with inline validation
+ * v.0.1 — Initial commmit
 
 
 

dist/css/bootstrap.css

@@ -362,7 +362,7 @@ textarea {
 }
 
 a {
-  color: #2e3191;
+  color: #005ea5;
   text-decoration: none;
 }
 a:hover, a:focus {
@@ -2511,7 +2511,7 @@ fieldset#data_pretection {
 }
 
 .btn-link {
-  color: #2e3191;
+  color: #005ea5;
   font-weight: normal;
   cursor: pointer;
   border-radius: 0;
@@ -4829,7 +4829,7 @@ form .input-group .has-error {
 }
 .nav .open > a, .nav .open > a:hover, .nav .open > a:focus {
   background-color: #eeeeee;
-  border-color: #2e3191;
+  border-color: #005ea5;
 }
 .nav .nav-divider {
   height: 1px;
@@ -4956,8 +4956,8 @@ form .input-group .has-error {
 }
 
 .nav .caret {
-  border-top-color: #2e3191;
-  border-bottom-color: #2e3191;
+  border-top-color: #005ea5;
+  border-bottom-color: #005ea5;
 }
 
 .nav a:hover .caret {
@@ -5670,7 +5670,7 @@ a.badge:hover, a.badge:focus {
 
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-  color: #2e3191;
+  color: #005ea5;
   background-color: white;
 }
 
@@ -5723,7 +5723,7 @@ a.list-group-item.active > .badge,
 
 a.thumbnail:hover,
 a.thumbnail:focus {
-  border-color: #2e3191;
+  border-color: #005ea5;
 }
 
 .thumbnail > img {

sass/_branding.scss

@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 html{
-  background-color: #dee0e2;
+  background-color: $grey-3;
 }
 
 .top-bar {

sass/_footer-gov.scss

@@ -3,7 +3,7 @@
 // ---------------------------------------------------
 
 .gov-footer{
-	background-color: #dee0e2 !important;
+	background-color: $grey-3 !important;
 	border-top: 1px solid #a1acb2;
 	color: $footer-link-color;
 }
@@ -87,7 +87,7 @@ footer .copyright {
 			a:visited,
 			div p a:visited,
 			li a{
-				color: #454a4c !important;
+				color: $footer-link-color !important;
 			}
 			li a:hover,
 			div p a:hover{
@@ -104,7 +104,7 @@ footer .copyright {
 	}
 	.copyright a,
 	div p a:visited{
-		color: #454a4c !important;
+		color: $footer-link-color !important;
 	}
 	.copyright a:hover{
 		color: $footer-hover-color;

sass/_phases.scss

@@ -22,7 +22,7 @@
 	line-height: 1.42857;
 	font-weight: 400;
 	text-transform: none;
-	background: #006435;
+	background: $green;
 	text-align: center;
 	text-decoration: none;
 	text-transform: uppercase;

sass/_scaffolding.scss

@@ -25,8 +25,6 @@ body {
   line-height: $line-height-base;
   color: $text-color;
   background-color: $body-bg;
- // src: $nta-source;
-  //font-weight: normal;
   font-weight: 400;
   -webkit-font-smoothing: antialiased;
 }

sass/_variables.scss

@@ -20,13 +20,13 @@ $almost-white:           #f7f7f7 !default;
 // -------------------------
 
 //$brand-primary:         #005ea5 !default;
-$brand-primary:			#9325b2 !default; //HO PURPLE	
-$brand-secondary:       #dee0e2 !default;
+$brand-primary:			$home-office !default; //HO PURPLE	
+$brand-secondary:       $grey-3 !default;
 $brand-success:         #2cc52c !default;
-$brand-warning:         #df3034 !default;
-$brand-danger:          #df3034 !default;
+$brand-warning:         $mellow-red !default;
+$brand-danger:          $mellow-red !default;
 $brand-info:            #5bc0de !default;
-$ho-button:				#006435 !default;
+$ho-button:				$green !default;
 
 // Scaffolding
 // -------------------------
@@ -37,8 +37,8 @@ $text-color:            $gray-dark !default;
 // Links
 // -------------------------
 
-$link-color:            #2e3191 !default;
-$link-hover-color:      #2e8aca !default;
+$link-color:            $link-colour !default;
+$link-hover-color:      $link-hover-colour !default;
 
 // Footer Links
 // -------------------------
@@ -49,7 +49,6 @@ $footer-hover-color:	darken($footer-link-color, 30%) !important;
 // Typography
 // -------------------------
 
-$nta-source:			  url(https://assets.digital.cabinet-office.gov.uk/static/NTA-Light-20130221.eot#) format("embedded-opentype");
 $font-family-nta:		  "nta", Arial, sans-serif !default;
 $font-family-sans-serif:  "Helvetica Neue", Helvetica-, Arial, sans-serif !default;
 $font-family-serif:       Georgia, "Times New Roman-", Times, serif !default;

sass/bootstrap.scss

@@ -16,6 +16,9 @@
 // Import fonts
 @import "alphagov/font-face";
 
+// Import govuk_toolkit parts
+@import "../govuk_toolkit/stylesheets/colours";
+
 // Core variables and mixins
 @import "variables";
 @import "mixins";