update colours

opennem · Sep 9, 2024 · 19a64c2 · 19a64c2
1 parent 9aa9474
commit 19a64c2
Show file tree

Hide file tree

Showing 44 changed files with 397 additions and 155 deletions.
diff --git a/assets/scss/buttons.scss b/assets/scss/buttons.scss
@@ -13,7 +13,7 @@ $button-hover-background: hsla(0, 0%, 100%, 0.9);
   border: none;
   background-color: $button-background;
   font-weight: 400;
-  color: $opennem-link-color;
+  color: black;
   min-width: 62px;
 
   &.is-primary.is-inverted {
@@ -27,12 +27,12 @@ $button-hover-background: hsla(0, 0%, 100%, 0.9);
 
   &:hover {
     background-color: $button-hover-background;
-    color: $opennem-link-color;
+    color: black;
   }
 
   &.is-selected {
-    border-color: $opennem-link-color;
-    background-color: $opennem-link-color;
+    border-color: black;
+    background-color: black;
     color: #fff;
   }
 }
diff --git a/assets/scss/drop-down.scss b/assets/scss/drop-down.scss
@@ -29,15 +29,15 @@
     }
 
     &:hover strong {
-      color: $opennem-link-color;
+      color: black;
     }
   }
 
   .dropdown-item {
     font-size: 1.2rem;
 
     &.nuxt-link-active {
-      background-color: $opennem-link-color;
+      background-color: black;
       color: #fff;
     }
   }

diff --git a/assets/scss/range-interval.scss b/assets/scss/range-interval.scss
@@ -94,7 +94,7 @@
       }
 
       &.is-selected {
-        background: $opennem-link-color;
+        background: black;
         color: #fff;
       }
     }

diff --git a/assets/scss/variables.scss b/assets/scss/variables.scss
@@ -2,7 +2,7 @@
 $beige-light: #d0d1cd;
 $beige-lighter: rgb(250, 249, 246);
 $opennem-primary: #e34a33;
-$opennem-link-color: #c74523;
+$opennem-link-color: black;
 $opennem-link-color-dark: #963f29;
 $opennem-primary-rgb: rgb(199, 69, 35);
 
@@ -16,8 +16,8 @@ $header-font-family: $font-stack-2;
 
 // $grey-dark: $brown;
 // $grey-light: $beige-light;
-$primary: $opennem-link-color;
-$link: $opennem-link-color;
+$primary: black;
+$link: black;
 $widescreen-enabled: false;
 $fullhd-enabled: false;
 $body-size: 14px;

diff --git a/components/Energy/Export/ImageFooter.vue b/components/Energy/Export/ImageFooter.vue
@@ -117,7 +117,7 @@ export default {
   }
 }
 strong {
-  color: $opennem-link-color;
+  color: black;
   display: inline;
 
   &[contenteditable] {
@@ -140,7 +140,7 @@ strong {
   .licence {
     text-align: right;
     font-size: 1.2rem;
-    color: $opennem-link-color;
+    color: black;
   }
 }
 </style>
diff --git a/components/Energy/Export/ImageHeader.vue b/components/Energy/Export/ImageHeader.vue
@@ -101,7 +101,7 @@ export default {
       const id = this.regionId
       const find = this.regions.find((region) => region.id === id)
       if (id === 'nem') {
-        return 'OpenNEM'
+        return 'Open Electricity'
       }
       if (find) {
         return find.label
@@ -158,7 +158,7 @@ export default {
 h3 {
   font-weight: bold;
   font-size: 1.3rem;
-  color: $opennem-link-color;
+  color: black;
 }
 h5 {
   color: #000;

diff --git a/components/Facility/Filters.vue b/components/Facility/Filters.vue
@@ -527,7 +527,7 @@ export default {
     padding: 3px 6px 2px;
     width: 20px;
     height: 20px;
-    color: $opennem-link-color;
+    color: black;
     min-width: 0;
   }
 
@@ -536,7 +536,7 @@ export default {
     padding: 2px 6px;
     width: 28px;
     height: 28px;
-    color: $opennem-link-color;
+    color: black;
     min-width: 0;
   }
 

diff --git a/components/Facility/FiltersPanel.vue b/components/Facility/FiltersPanel.vue
@@ -516,7 +516,7 @@ export default {
     padding: 3px 6px 2px;
     width: 20px;
     height: 20px;
-    color: $opennem-link-color;
+    color:black;
     min-width: 0;
   }
 
@@ -525,7 +525,7 @@ export default {
     padding: 2px 6px;
     width: 28px;
     height: 28px;
-    color: $opennem-link-color;
+    color:black;
     min-width: 0;
   }
 

diff --git a/components/Facility/List.vue b/components/Facility/List.vue
@@ -632,7 +632,7 @@ export default {
 @import '~/assets/scss/variables.scss';
 
 .card-wrapper {
-  margin-bottom: 2rem;
+  margin-bottom: 4rem;
   position: relative;
   padding: 0 10px;
 
@@ -666,11 +666,11 @@ export default {
   }
 
   &.is-selected {
-    box-shadow: 0 0 5px rgba(100, 100, 100, 0.2);
+    // box-shadow: 0 0 5px rgba(100, 100, 100, 0.2);
     opacity: 1;
-    transform: scale(1.02);
+    // transform: scale(1.02);
     z-index: 10;
-    border: 1px solid $opennem-link-color;
+    border: 1px solid black;
 
     .facility-info-link {
       visibility: visible;

diff --git a/components/Facility/Totals.vue b/components/Facility/Totals.vue
@@ -49,7 +49,7 @@ export default {
   left: 0;
   right: 0;
   z-index: 89;
-  background-color: #c74523;
+  background-color: #353535;
   color: #fff;
   padding: 3px 6px;
   font-size: 10px;

diff --git a/components/FeatureToggle/index.vue b/components/FeatureToggle/index.vue
@@ -83,6 +83,6 @@ export default {
   }
 }
 .button.is-primary {
-  border: 1px solid $opennem-link-color;
+  border: 1px solid black;
 }
 </style>
diff --git a/components/Toolbar/Energy/Narrow.vue b/components/Toolbar/Energy/Narrow.vue
@@ -255,7 +255,7 @@ export default {
         date = d3TimeFormat('%Y%m%d')(this.energyExportData[0].date)
       }
       if (this.regionId === 'nem') {
-        region = 'OpenNEM'
+        region = 'Open Electricity'
       }
       return `${date} ${region}`
     },

diff --git a/components/Toolbar/Energy/Wide.vue b/components/Toolbar/Energy/Wide.vue
@@ -224,7 +224,7 @@ export default {
         date = d3TimeFormat('%Y%m%d')(this.energyExportData[0].date)
       }
       if (this.regionId === 'nem') {
-        region = 'OpenNEM'
+        region = 'Open Electricity'
       }
       return `${date} ${region}`
     },

diff --git a/components/Vis/IconDiscreteTime.vue b/components/Vis/IconDiscreteTime.vue
@@ -43,7 +43,7 @@ export default {
       return this.selected ? '#AF7C7C' : '#c3c3c3'
     },
     highlightColour() {
-      return this.selected ? '#8D2B11' : '#8D2B11'
+      return this.selected ? '#000' : '#000'
     }
   }
 }

diff --git a/components/Vis/IconTimeOfDay.vue b/components/Vis/IconTimeOfDay.vue
@@ -45,7 +45,7 @@ export default {
       return this.selected ? '#eee' : '#000'
     },
     averageColour() {
-      return this.selected ? '#fff' : '#C74523'
+      return this.selected ? '#fff' : '#000'
     }
   }
 }

diff --git a/components/layout/AppFacilityHeader.vue b/components/layout/AppFacilityHeader.vue
@@ -5,7 +5,6 @@
       class="back-link" 
       @click.prevent="backToFacilities">
       <i class="fal fa-chevron-left" />
-      <AppLogo class="logo" />
       <h1>Facilities</h1>
     </a>
 
@@ -230,7 +229,7 @@ header {
 
   &:hover {
     i {
-      color: $opennem-link-color;
+      color: black;
     }
     background-color: rgba(255, 255, 255, 0.55);
   }

diff --git a/components/layout/AppFooter.vue b/components/layout/AppFooter.vue
@@ -10,7 +10,7 @@
 
       <div class="version">
         <a 
-          v-tooltip="'OpenNEM status page'" 
+          v-tooltip="'Open Electricity status page'" 
           rel="external" 
           class="icon-link" 
           target="_blank"
@@ -113,7 +113,7 @@
       </a>
       <nuxt-link 
         to="/about/" 
-        class="about-link">About OpenNEM</nuxt-link>
+        class="about-link">About Open Electricity</nuxt-link>
     </div>
   </footer>
 </template>
@@ -196,7 +196,7 @@ footer {
   justify-content: space-between;
   font-size: 11px;
   display: none;
-  background-color: $opennem-link-color-dark;
+  background-color: black;
   color: #fff;
 
   strong {

diff --git a/components/layout/AppHeader.vue b/components/layout/AppHeader.vue
@@ -329,7 +329,7 @@ export default {
         date = d3TimeFormat('%Y%m%d')(this.energyExportData[0].date)
       }
       if (this.regionId === 'nem') {
-        region = 'OpenNEM'
+        region = 'Open Electricity'
       }
       return `${date} ${region}`
     },

diff --git a/components/layout/Drawer.vue b/components/layout/Drawer.vue
@@ -258,7 +258,7 @@ $menu-border-colour-hover: #999;
   .close-button {
     padding: 0.7rem 1.5rem;
     font-size: 1.5rem;
-    color: $opennem-link-color;
+    color: black;
   }
 
   &.open {
@@ -336,8 +336,8 @@ $menu-border-colour-hover: #999;
 
     &.nuxt-link-active {
       font-weight: 600;
-      border-right: 6px solid $opennem-link-color;
-      color: $opennem-link-color;
+      border-right: 6px solid black;
+      color: black;
 
       .icon {
         display: none;
@@ -374,7 +374,7 @@ $menu-border-colour-hover: #999;
     }
 
     &.nuxt-link-active::after {
-      border-color: $opennem-link-color;
+      border-color: black;
     }
 
     &:hover::before,

diff --git a/components/ui/DropdownSelection.vue b/components/ui/DropdownSelection.vue
@@ -181,7 +181,7 @@ export default {
     font-size: 12px;
 
     &.is-selected {
-      background-color: $opennem-link-color;
+      background-color: black;
       color: white;
     }
   }

diff --git a/components/ui/Loader.vue b/components/ui/Loader.vue
@@ -7,7 +7,7 @@
       <path
         class="sine-wave"
         fill="none"
-        stroke="#C74523"
+        stroke="black"
         stroke-width="4"
         stroke-linecap="square"
       />

diff --git a/components/ui/SummaryColumnSelector.vue b/components/ui/SummaryColumnSelector.vue
@@ -186,7 +186,7 @@ export default {
     text-align: right;
     padding-right: 1rem;
     &.is-selected {
-      background-color: $opennem-link-color;
+      background-color: black;
       color: #fff;
     }
   }

diff --git a/constants/energy-fuel-techs/index.js b/constants/energy-fuel-techs/index.js
@@ -19,7 +19,7 @@ export const GROUP_DEFAULT = GROUP_DETAILED // default group is detailed
 
 export const Groups = {}
 Groups[GROUP_DETAILED] = DetailedGroup // default group is just the root power/energy
-Groups[GROUP_OLD_DETAILED] = OldDetailedGroup // default group is just the root power/energy
+// Groups[GROUP_OLD_DETAILED] = OldDetailedGroup // default group is just the root power/energy
 Groups[GROUP_SIMPLIFIED] = SimplifiedGroup
 Groups[GROUP_COAL_GAS_RENEWABLES] = CoalGasRenewablesGroup
 Groups[GROUP_FLEXIBILITY] = FlexibilityGroup