From f1a608c2990d0476dd25d26de6c93e698ad94574 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:15:01 -0600
Subject: [PATCH] feat: update core-styles from v2.11 to v2.22 - misc bugs
 (#753)

* fix: cms button styles not applied to form buttons

* fix: limit most button styles to main content

* fix: core-styles v2.22.0 to v2.22.1

* fix: core-styles django cms form button class name

* chore: core-styles v2.22.1 to v2.22.2
---
 package-lock.json                             | 13 +++++-----
 package.json                                  |  2 +-
 .../css/src/_imports/components/c-button.css  | 24 +++++++++++--------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f79aff686..77dcc33ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@frctl/fractal": "^1.5.14",
         "@frctl/mandelbrot": "^1.10.1",
-        "@tacc/core-styles": "github:TACC/Core-Styles#9315ebbd",
+        "@tacc/core-styles": "^2.22.2",
         "minimist": "^1.2.6"
       },
       "engines": {
@@ -481,9 +481,9 @@
       }
     },
     "node_modules/@tacc/core-styles": {
-      "version": "2.22.0",
-      "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#9315ebbd28aa84e45432c253c4a10a0fe966ade9",
-      "license": "MIT",
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.22.2.tgz",
+      "integrity": "sha512-r2QTrZOcUZIjSIcOLktluGhPzGxvYNTEOKF7h6gYmQn8tgiFcesw4xzoIDCVynA5WpaPMZ2jkV3wM+M7SoBd9Q==",
       "bin": {
         "core-styles": "src/cli.js"
       },
@@ -8728,8 +8728,9 @@
       }
     },
     "@tacc/core-styles": {
-      "version": "git+ssh://git@github.com/TACC/Core-Styles.git#9315ebbd28aa84e45432c253c4a10a0fe966ade9",
-      "from": "@tacc/core-styles@github:TACC/Core-Styles#9315ebbd",
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-2.22.2.tgz",
+      "integrity": "sha512-r2QTrZOcUZIjSIcOLktluGhPzGxvYNTEOKF7h6gYmQn8tgiFcesw4xzoIDCVynA5WpaPMZ2jkV3wM+M7SoBd9Q==",
       "requires": {}
     },
     "@trysound/sax": {
diff --git a/package.json b/package.json
index 447d4b03b..afa5cb06a 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@frctl/fractal": "^1.5.14",
     "@frctl/mandelbrot": "^1.10.1",
-    "@tacc/core-styles": "github:TACC/Core-Styles#9315ebbd",
+    "@tacc/core-styles": "^2.22.2",
     "minimist": "^1.2.6"
   },
   "repository": "git@github.com:TACC/Core-CMS.git",
diff --git a/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css b/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css
index 8b4349c16..94a831dc8 100644
--- a/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css
+++ b/taccsite_cms/static/site_cms/css/src/_imports/components/c-button.css
@@ -1,16 +1,20 @@
 @import url("@tacc/core-styles/src/lib/_imports/components/c-button.selectors.css");
+@import url("@tacc/core-styles/src/lib/_imports/tools/selectors.form.css");
 
-:--c-button--primary,
-:--c-button--secondary,
-:--c-button--tertiary,
-:--c-button--is-active {
-  padding: 10px 20px;
 
-  font-size: var(--global-font-size--small);
-  text-transform: uppercase;
+:--main-content {
+  & :--c-button,
+  & :--form__button {
+    padding: 10px 20px;
+
+    font-size: var(--global-font-size--small);
+
+    font-weight: var(--bold);
+    letter-spacing: 0.05em;
+  }
 }
 
-:--c-button {
-  font-weight: var(--bold);
-  letter-spacing: 0.05em;
+:--c-button,
+:--form__button {
+  text-transform: uppercase;
 }