Merge pull request #203 from SkillsFundingAgency/FC-689-cookie-banner

Fc 689 cookie banner
SkillsFundingAgency · Aug 14, 2019 · a2a0442 · a2a0442
2 parents 2492d78 + 090106a
commit a2a0442
Show file tree

Hide file tree

Showing 18 changed files with 2,139 additions and 475 deletions.
diff --git a/src/Web/Sfa.Das.Sas.Web/App_Start/RouteConfig.cs b/src/Web/Sfa.Das.Sas.Web/App_Start/RouteConfig.cs
@@ -14,6 +14,11 @@ public static void RegisterRoutes(RouteCollection routes)
                 url: "cookies",
                 defaults: new { controller = "Start", action = "Cookies", id = UrlParameter.Optional });
 
+            routes.MapRoute(
+                name: "CookieDetails",
+                url: "cookie-details",
+                defaults: new { controller = "Start", action = "CookieDetails", id = UrlParameter.Optional });
+
             routes.MapRoute(
                 name: "Stats",
                 url: "stats",

diff --git a/src/Web/Sfa.Das.Sas.Web/Content/dist/css/screen.min.css b/src/Web/Sfa.Das.Sas.Web/Content/dist/css/screen.min.css
diff --git a/src/Web/Sfa.Das.Sas.Web/Content/src/styles/_elements.scss b/src/Web/Sfa.Das.Sas.Web/Content/src/styles/_elements.scss
@@ -377,4 +377,10 @@ only screen and (min-resolution: 2dppx) {
 
 .result .error-summary.warning {
     margin: 15px 0;
+}
+
+@for $i from 1 through 14 {
+    .cell-width-#{$i * 5} {
+        width: $i * 5%;
+    }
 }
diff --git a/src/Web/Sfa.Das.Sas.Web/Content/src/styles/custom-elements/_data-list.scss b/src/Web/Sfa.Das.Sas.Web/Content/src/styles/custom-elements/_data-list.scss
@@ -102,17 +102,19 @@ $module: 'data-list';
     margin-bottom: $gutter;
 
     ul {
-        //TODO: apply '.list-bullet' directly to desired lists in case numbered list may be required interchangably
-        @extend .list-bullet;
-        margin-bottom: 0; 
+        list-style-type: disc;
+        margin-bottom: 0;
+        padding-left: 20px;
     }
 }
 
 .data-list--provider {
     @include data-list(35);
+
     ul {
-        @extend .list-bullet;
+        list-style-type: disc;
         margin-bottom: 0;
+        padding-left: 20px;
     }
 }
 

diff --git a/src/Web/Sfa.Das.Sas.Web/Content/src/styles/custom-elements/_notification.scss b/src/Web/Sfa.Das.Sas.Web/Content/src/styles/custom-elements/_notification.scss
@@ -0,0 +1,11 @@
+.notification {
+    border-width: 5px;
+    border-style: solid;
+    margin-top: 30px;
+    margin-bottom: 30px;
+    padding: 20px 15px 15px;
+    border-color: #28a197;
+    .heading-medium {
+        margin: 0
+    }
+}
diff --git a/src/Web/Sfa.Das.Sas.Web/Content/src/styles/elements/_lists.scss b/src/Web/Sfa.Das.Sas.Web/Content/src/styles/elements/_lists.scss
@@ -19,7 +19,7 @@ ol {
 // Bulleted lists
 .list-bullet {
   list-style-type: disc;
-  padding-left: 20px;
+  padding-left: 40px;
 }
 
 // Numbered lists