images and overrides

app/assets/error_pages/5xx.html

@@ -92,8 +92,8 @@
 
           <h2 class="govuk-visually-hidden">Support links</h2>
           <div class="govuk-footer__meta-custom">
-            Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service"
+            Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
-              class="govuk-footer__link">Government Digital Service</a>
+              class="govuk-footer__link">Technology Transformation Service</a>
           </div>
 
           <svg role="presentation" focusable="false" class="govuk-footer__licence-logo"
@@ -108,11 +108,11 @@
               Government Licence v3.0</a>, except where otherwise stated
           </span>
         </div>
-        <div class="govuk-footer__meta-item">
+        <!-- <div class="govuk-footer__meta-item">
           <a class="govuk-footer__link govuk-footer__copyright-logo"
             href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">©
-            Crown copyright</a>
+            US copyright</a>
-        </div>
+        </div> -->
       </div>
     </div>
   </footer>

app/assets/stylesheets/components/navigation.scss

@@ -40,7 +40,9 @@
       box-shadow: 0 -3px 0 0 $grey-3;
     }
 
-    &--live, &--test, &--operator {
+    &--live,
+    &--test,
+    &--operator {
       // This uses new Design System colours to match .govuk-tag--red
       background: #F6D7D2;
       color: #942514;
@@ -171,7 +173,8 @@
       text-decoration: underline;
     }
 
-    &:focus { // override the :hover style (the focus style has its own underline)
+    &:focus {
+      // override the :hover style (the focus style has its own underline)
       text-decoration: none;
     }
 
@@ -236,8 +239,9 @@
   &__item--active {
     @include bold-16;
 
-    a:link, a:visited {
+    a:link,
+    a:visited {
       color: $text-colour;
     }
   }
-}
+}

app/assets/stylesheets/govuk-frontend/overrides.scss

@@ -58,3 +58,11 @@
 .govuk-\!-display-none {
   display: none !important;
 }
+
+.govuk-header__logotype {
+  margin-right: 0px !important;
+}
+
+.govuk-header__logotype-text {
+  margin-left: 5px !important;
+}

app/main/views/add_service.py

@@ -35,7 +35,7 @@ def _create_example_template(service_id):
     example_sms_template = service_api_client.create_service_template(
         'Example text message template',
         'sms',
-        'Hey ((name)), I’m trying out Notify. Today is ((day of week)) and my favourite colour is ((colour)).',
+        'Hi, I’m trying out US Notify. Today is ((day of week)) and my favourite colour is ((colour)).',
         service_id,
     )
     return example_sms_template

app/main/views/send.py

@@ -77,7 +77,7 @@ def get_example_csv_fields(column_headers, use_example_as_example, submitted_fie
 def get_example_csv_rows(template, use_example_as_example=True, submitted_fields=False):
     return {
         'email': ['test@example.com'] if use_example_as_example else [current_user.email_address],
-        'sms': ['07700 900321'] if use_example_as_example else [current_user.mobile_number],
+        'sms': ['12223334444'] if use_example_as_example else [current_user.mobile_number],
         'letter': [
             (submitted_fields or {}).get(
                 key, get_example_letter_address(key) if use_example_as_example else key

app/templates/admin_template.html

@@ -154,9 +154,9 @@
   ] %}
 
   {% if current_service and current_service.research_mode %}
-    {% set meta_suffix = 'Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service" class="govuk-footer__link">Government Digital Service</a><span id="research-mode" class="research-mode">research mode</span>' %}
+    {% set meta_suffix = 'Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="govuk-footer__link">Technology Transformation Service</a><span id="research-mode" class="research-mode">research mode</span>' %}
   {% else %}
-    {% set meta_suffix = 'Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service" class="govuk-footer__link">Government Digital Service</a>' %}
+    {% set meta_suffix = 'Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="govuk-footer__link">Technology Transformation Service</a>' %}
   {% endif %}
 
   {{ govukFooter({

devcontainer-admin/.devcontainer.json

@@ -29,6 +29,7 @@
         "wholroyd.jinja",
         "pmbenjamin.vscode-snyk",
         "visualstudioexptteam.vscodeintellicode",
+        "visualstudioexptteam.intellicode-api-usage-examples",
         "yzhang.markdown-all-in-one",
         "GitHub.copilot"
     ],

gulpfile.js

@@ -81,7 +81,10 @@ const copy = {
       _templates.forEach(name => {
         let _src = [
           paths.govuk_frontend + 'components/' + name + '/macro.njk',
-          paths.govuk_frontend + 'components/' + name + '/template.njk'
+          paths.govuk_frontend + 'components/' + name + '/template.njk',
+          paths.govuk_frontend + 'components/' + name + '/_' + name + '.scss',
+          paths.govuk_frontend + 'components/' + name + '/README.md',
+          paths.govuk_frontend + 'components/' + name + '/macro-options.json'
         ];
         let _dest = paths.templates + 'vendor/govuk-frontend/components/' + name;
 
@@ -92,15 +95,15 @@ const copy = {
         }
 
         src(_src)
-        .pipe(
+          .pipe(
-          dest(_dest)
+            dest(_dest)
-          .on('end', () => { // resolve promise if all copied
+              .on('end', () => { // resolve promise if all copied
-            done = done + 1;
+                done = done + 1;
-            if (done === _templates.length) {
+                if (done === _templates.length) {
-              cb();
+                  cb();
-            }
+                }
-          })
+              })
-        )
+          )
       });
     }
   },
@@ -186,10 +189,10 @@ const javascripts = () => {
     paths.src + 'javascripts/homepage.js',
     paths.src + 'javascripts/main.js',
   ])
-  .pipe(plugins.prettyerror())
+    .pipe(plugins.prettyerror())
-  .pipe(plugins.babel({
+    .pipe(plugins.babel({
-    presets: ['@babel/preset-env']
+      presets: ['@babel/preset-env']
-  }));
+    }));
 
   // return single stream of all vinyl objects piped from the end of the vendored stream, then
   // those from the end of the local stream
@@ -202,10 +205,10 @@ const javascripts = () => {
 
 const sass = () => {
   return src([
-      paths.src + '/stylesheets/main*.scss',
+    paths.src + '/stylesheets/main*.scss',
-      paths.src + '/stylesheets/map.scss',
+    paths.src + '/stylesheets/map.scss',
-      paths.src + '/stylesheets/print.scss'
+    paths.src + '/stylesheets/print.scss'
-    ])
+  ])
     .pipe(plugins.prettyerror())
     .pipe(plugins.sass.sync({
       includePaths: [
@@ -228,11 +231,12 @@ const sass = () => {
 
 const images = () => {
   return src([
-      paths.src + 'images/**/*',
+    // paths.toolkit + 'images/**/*',
-      paths.toolkit + 'images/**/*',
+    // paths.govuk_frontend + 'assets/images/**/*'
-      paths.template + 'assets/images/**/*',
+    paths.src + 'images/**/*',
-      paths.govuk_frontend + 'assets/images/**/*'
+    paths.template + 'assets/images/**/*'
-    ])
+    
+  ])
     .pipe(dest(paths.dist + 'images/'))
 };
 
@@ -260,21 +264,21 @@ const watchFiles = {
 const lint = {
   'sass': () => {
     return src([
-        paths.src + 'stylesheets/*.scss',
+      paths.src + 'stylesheets/*.scss',
-        paths.src + 'stylesheets/components/*.scss',
+      paths.src + 'stylesheets/components/*.scss',
-        paths.src + 'stylesheets/views/*.scss',
+      paths.src + 'stylesheets/views/*.scss',
-      ])
+    ])
       .pipe(plugins.sassLint({
         'options': { 'formatter': 'stylish' },
-        'rules': { 'mixins-before-declarations': [2, { 'exclude': ['media', 'govuk-media-query'] } ] }
+        'rules': { 'mixins-before-declarations': [2, { 'exclude': ['media', 'govuk-media-query'] }] }
       }))
       .pipe(plugins.sassLint.format())
       .pipe(plugins.sassLint.failOnError());
   },
   'js': (cb) => {
     return src(
-        paths.src + 'javascripts/**/*.js'
+      paths.src + 'javascripts/**/*.js'
-      )
+    )
       .pipe(plugins.jshint())
       .pipe(plugins.jshint.reporter(stylish))
       .pipe(plugins.jshint.reporter('fail'))
@@ -285,10 +289,10 @@ const lint = {
 // Default: compile everything
 const defaultTask = parallel(
   parallel(
-    copy.govuk_frontend.fonts,
+    // copy.govuk_frontend.fonts,
-    copy.govuk_frontend.templates,
+    // copy.govuk_frontend.templates,
-    images,
+    // copy.leaflet.js,
-    copy.leaflet.js
+    images
   ),
   series(
     copy.error_pages,

paas-failwhale/index.html

@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8" />
   <title>
-    Sorry, the service is unavailable – GOV.UK Notify
+    Sorry, the service is unavailable – US Notify
   </title>
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
   <meta name="theme-color" content="#0b0c0c" />
@@ -105,8 +105,8 @@
 
           <h2 class="govuk-visually-hidden">Support links</h2>
           <div class="govuk-footer__meta-custom">
-            Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service"
+            Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
-              class="govuk-footer__link">Government Digital Service</a>
+              class="govuk-footer__link">Technology Transformation Service</a>
           </div>
 
           <svg role="presentation" focusable="false" class="govuk-footer__licence-logo"
@@ -121,11 +121,11 @@
               Government Licence v3.0</a>, except where otherwise stated
           </span>
         </div>
-        <div class="govuk-footer__meta-item">
+        <!-- <div class="govuk-footer__meta-item">
           <a class="govuk-footer__link govuk-footer__copyright-logo"
             href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">©
-            Crown copyright</a>
+            US copyright</a>
-        </div>
+        </div> -->
       </div>
     </div>
   </footer>

paas-failwhale/static_503/stylesheets/main.css

@@ -2927,6 +2927,10 @@ a:focus {
     margin-right: 0px
 }
 
+.govuk-header__logotype-text {
+    margin-left: 5px
+}
+
 .govuk-header__logotype-crown {
     margin-right: 1px;
     fill: currentColor;