Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/SLB-446-Align-list-styling' into…
Browse files Browse the repository at this point in the history
… dev
  • Loading branch information
Luqmaan Essop committed Jul 16, 2024
2 parents a6fe768 + 548a7be commit 63095f9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 52 deletions.
3 changes: 2 additions & 1 deletion apps/website/.lagoon.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
PROJECT_NAME=example
DRUPAL_INTERNAL_URL="http://nginx:8080"
DRUPAL_EXTERNAL_URL="https://nginx.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.io"
NETLIFY_URL="https://build.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.io"
Expand All @@ -20,7 +21,7 @@ PUBLISHER_OAUTH2_SESSION_SECRET=REPLACE_ME

# "development" or "production", production will trust first proxy
# and serve secure cookies.
PUBLISHER_OAUTH2_ENVIRONMENT_TYPE=production
PUBLISHER_OAUTH2_ENVIRONMENT_TYPE=development

# DRUPAL_EXTERNAL_URL is used by default, but can be overridden
# to match the Drupal production url, without the nginx prefix.
Expand Down
18 changes: 0 additions & 18 deletions apps/website/.lagoon.env.dev
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
PROJECT_NAME=example
DRUPAL_INTERNAL_URL="http://nginx:8080"
DRUPAL_EXTERNAL_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.cms.amazeelabs.dev"
NETLIFY_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.amazeelabs.dev"

# -----------------------------------------------
# Publisher authentication with Drupal (OAuth2).
# See main ./README.md for more information.
# -----------------------------------------------
# Set to true to fully skip authentication.
PUBLISHER_SKIP_AUTHENTICATION=false

# Secret from the Drupal Publisher Consumer.
PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME

# Client id from the Drupal Publisher Consumer.
PUBLISHER_OAUTH2_CLIENT_ID=publisher

# A random string, used to encrypt the session.
PUBLISHER_OAUTH2_SESSION_SECRET=REPLACE_ME

# "development" or "production", production will trust first proxy
# and serve secure cookies.
PUBLISHER_OAUTH2_ENVIRONMENT_TYPE=production

# DRUPAL_EXTERNAL_URL is used by default, but can be overridden
# to match the Drupal production url, without the nginx prefix.
PUBLISHER_OAUTH2_TOKEN_HOST="${DRUPAL_EXTERNAL_URL}"
14 changes: 0 additions & 14 deletions apps/website/.lagoon.env.prod
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
PROJECT_NAME=example
DRUPAL_INTERNAL_URL="http://nginx:8080"
DRUPAL_EXTERNAL_URL="https://example.cms.amazeelabs.dev"
NETLIFY_URL="https://example.amazeelabs.dev"

# -----------------------------------------------
# Publisher authentication with Drupal (OAuth2).
# See main ./README.md for more information.
# -----------------------------------------------
# Set to true to fully skip authentication.
PUBLISHER_SKIP_AUTHENTICATION=false

# Secret from the Drupal Publisher Consumer.
PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME

# Client id from the Drupal Publisher Consumer.
PUBLISHER_OAUTH2_CLIENT_ID=publisher

# A random string, used to encrypt the session.
PUBLISHER_OAUTH2_SESSION_SECRET=REPLACE_ME

# "development" or "production", production will trust first proxy
# and serve secure cookies.
PUBLISHER_OAUTH2_ENVIRONMENT_TYPE=production
Expand Down
14 changes: 0 additions & 14 deletions apps/website/.lagoon.env.stage
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
PROJECT_NAME=example
DRUPAL_INTERNAL_URL="http://nginx:8080"
DRUPAL_EXTERNAL_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.cms.amazeelabs.dev"
NETLIFY_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.amazeelabs.dev"

# -----------------------------------------------
# Publisher authentication with Drupal (OAuth2).
# See main ./README.md for more information.
# -----------------------------------------------
# Set to true to fully skip authentication.
PUBLISHER_SKIP_AUTHENTICATION=false

# Secret from the Drupal Publisher Consumer.
PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME

# Client id from the Drupal Publisher Consumer.
PUBLISHER_OAUTH2_CLIENT_ID=publisher

# A random string, used to encrypt the session.
PUBLISHER_OAUTH2_SESSION_SECRET=REPLACE_ME

# "development" or "production", production will trust first proxy
# and serve secure cookies.
PUBLISHER_OAUTH2_ENVIRONMENT_TYPE=production
Expand Down
8 changes: 3 additions & 5 deletions packages/ui/src/components/Atoms/List.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ul li {
@apply !font-medium !text-gray-900;
}

ul {
@apply !pl-4;
}
Expand All @@ -13,7 +9,6 @@ ul {
position: relative;
padding-left: 0.625rem;
margin-left: 0;
line-height: 1.25rem !important;
}

ul li::marker {
Expand All @@ -27,6 +22,7 @@ ul li.messages::marker {

.list-style--arrows li::before {
position: absolute;
top: 0.2rem;
left: -1.25rem;
line-height: 1.25rem;
height: 1.25rem;
Expand All @@ -36,6 +32,7 @@ ul li.messages::marker {

.list-style--checkmarks li::before {
position: absolute;
top: 0.2rem;
left: -1.125rem;
line-height: 1.25rem;
height: 1.25rem;
Expand All @@ -47,6 +44,7 @@ ul li.messages::marker {
.list-style--question-marks li::before {
position: absolute;
left: -1.125rem;
top: 0.2rem;
vertical-align: middle;
line-height: 1.25rem;
height: 1.25rem;
Expand Down

0 comments on commit 63095f9

Please sign in to comment.