mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-01 02:03:22 +00:00
Remove dependence on darkswarm variables
There were all sorts of dependencies hiding in there, and it was overwriting some of the admin variables. Better to keep things separate and simple. I discovered that there was one legitimate reason for importing them though: for styling the trix editor. I can't think of a good way to safely import them without affecting the other variables, so I just hardcoded the colours for now.
This commit is contained in:
@@ -16,7 +16,7 @@ nav {
|
||||
|
||||
&.inactive {
|
||||
cursor: default;
|
||||
color: $disabled-dark;
|
||||
color: $dark-grey;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ nav {
|
||||
}
|
||||
|
||||
.pagination-gap {
|
||||
color: $disabled-dark;
|
||||
color: $dark-grey;
|
||||
}
|
||||
|
||||
.pagination-page {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.search-input {
|
||||
border: 1px solid $disabled-light;
|
||||
border: 1px solid $light-grey;
|
||||
height: 3em;
|
||||
display: flex;
|
||||
line-height: 3em;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
position: relative;
|
||||
|
||||
.selector-main {
|
||||
border: 1px solid $disabled-light;
|
||||
border: 1px solid $light-grey;
|
||||
height: 3em;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
@@ -30,7 +30,7 @@
|
||||
height: 0;
|
||||
border-left: 5px solid transparent;
|
||||
border-right: 5px solid transparent;
|
||||
border-top: 5px solid $disabled-light;
|
||||
border-top: 5px solid $light-grey;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,7 @@
|
||||
z-index: 1;
|
||||
background-color: white;
|
||||
margin-top: -1px;
|
||||
border: 1px solid $disabled-light;
|
||||
border: 1px solid $light-grey;
|
||||
|
||||
.selector-items {
|
||||
overflow-y: auto;
|
||||
@@ -51,7 +51,7 @@
|
||||
.selector-item {
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
border-bottom: 1px solid $disabled-light;
|
||||
border-bottom: 1px solid $light-grey;
|
||||
position: relative;
|
||||
height: 3em;
|
||||
line-height: 3em;
|
||||
|
||||
@@ -37,11 +37,11 @@
|
||||
|
||||
.selector-wrapper {
|
||||
.super-selector-search {
|
||||
border-bottom: 1px solid $disabled-light;
|
||||
border-bottom: 1px solid $light-grey;
|
||||
padding: 10px 5px;
|
||||
|
||||
input {
|
||||
border: 1px solid $disabled-light;
|
||||
border: 1px solid $light-grey;
|
||||
box-sizing: border-box;
|
||||
border-radius: 4px;
|
||||
width: 100%;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
@import "../darkswarm/branding";
|
||||
@import "../darkswarm/mixins";
|
||||
|
||||
#change_type {
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
@import "../../darkswarm/branding";
|
||||
|
||||
.container {
|
||||
input {
|
||||
&[readonly] {
|
||||
background-color: $disabled-light;
|
||||
background-color: $light-grey;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
color: $spree-blue;
|
||||
|
||||
&.error {
|
||||
color: $red-500;
|
||||
color: $color-error;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,3 +5,7 @@ $color-3: #5498DA !default; // Light Blue
|
||||
$color-4: #6788A2 !default; // Dark Blue
|
||||
$color-5: #C60F13 !default; // Red
|
||||
$color-6: #FF9300 !default; // Yellow
|
||||
|
||||
$dark-grey: #333;
|
||||
$light-grey: #ddd;
|
||||
$near-black: #222;
|
||||
|
||||
@@ -19,6 +19,13 @@
|
||||
padding: 4px;
|
||||
border-collapse: separate; // This is needed for the outer padding. Also should be helpful to give more flexibility of borders between rows.
|
||||
|
||||
tr:hover {
|
||||
th,
|
||||
td {
|
||||
background-color: $light-grey;
|
||||
}
|
||||
}
|
||||
|
||||
th,
|
||||
td {
|
||||
padding: $padding-tbl-cell;
|
||||
|
||||
@@ -2,9 +2,9 @@ trix-toolbar [data-trix-button-group="file-tools"] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
// Match the rendering into the shopfront
|
||||
// Match the rendering into the shopfront (see ../darkswarm/)
|
||||
trix-editor {
|
||||
color: $darker-grey;
|
||||
color: #222;
|
||||
|
||||
ol,
|
||||
ul {
|
||||
@@ -12,7 +12,7 @@ trix-editor {
|
||||
}
|
||||
|
||||
a {
|
||||
color: $ofn-brand;
|
||||
color: #f27052;
|
||||
}
|
||||
|
||||
// Copy/pasted from _type.scss
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
@import "../admin/globals/functions";
|
||||
@import "globals/palette"; // admin_v3
|
||||
@import "globals/variables"; // admin_v3
|
||||
@import "variables"; //admin_v3
|
||||
@import "../admin/variables";
|
||||
@import "../admin/globals/mixins";
|
||||
@import "mixins"; // admin_v3
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ $red: #c85136 !default; // Red/Orange (Mojo)
|
||||
$yellow: #ff9300 !default; // Yellow
|
||||
$mystic: #d9e8eb !default; // Mystic
|
||||
$lighter-grey: #f8f9fa !default; // Lighter grey
|
||||
$light-grey: #eff1f2 !default; // Light grey
|
||||
$light-grey: #eff1f2 !default; // Light grey (Porcelain)
|
||||
$near-black: #191c1d !default; // Near-black
|
||||
$dark-grey: #2e3132 !default; // Dark Grey
|
||||
$fair-pink: #ffefeb !default; // Fair Pink
|
||||
|
||||
@@ -9,7 +9,6 @@ $warning-orange: $color-5;
|
||||
$bright-orange: #ffa92e;
|
||||
$medium-grey: #919191;
|
||||
$pale-blue: #cee1f4;
|
||||
$light-grey: #ccc;
|
||||
|
||||
$admin-table-border: $pale-blue;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user