fix(main style): fix all elements styles

ringecosystem · Sep 19, 2024 · a8299de · a8299de
1 parent 5388b34
commit a8299de
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "eslint": "^8.57.0",
     "eslint-config-next": "14.1.4",
     "eslint-config-prettier": "^9.1.0",
-    "husky": "^9.0.11",
+    "husky": "^9.1.6",
     "lint-staged": "^15.2.2",
     "postcss": "^8.4.38",
     "prettier": "^3.2.5",

diff --git a/pages/globals.css b/pages/globals.css
@@ -66,3 +66,14 @@ label div p.leading-tight {
   }
 }
 */
+
+
+/* Overrides for aragon ods */
+.text-neutral-800 , .text-neutral-900 {
+  color: #fff !important;
+}
+
+.border-primary-300 {
+  border-color: #ff0083 !important;
+}
+
diff --git a/plugins/delegateAnnouncer/components/UserDelegateCard.tsx b/plugins/delegateAnnouncer/components/UserDelegateCard.tsx
@@ -76,7 +76,9 @@ export const SelfDelegationProfileCard = ({
           alt="profile pic"
         />
         <div className="flex flex-col justify-center">
-          <Link className="!font-xl !text-xl">{result.data ? result.data : formatHexString(address)}</Link>
+          <Link className="!font-xl !text-xl !text-[#ff0083]">
+            {result.data ? result.data : formatHexString(address)}
+          </Link>
           <p className="text-md text-neutral-300">{votingPower ? formatUnits(votingPower!, 18)! : 0} Voting Power</p>
         </div>
       </div>
@@ -101,14 +103,20 @@ export const SelfDelegationProfileCard = ({
       <div className="flex flex-row gap-2">
         <If condition={delegates !== address}>
           <div className="mt-1">
-            <Button variant="secondary" size="sm" onClick={() => delegateTo()}>
+            <Button
+              variant="secondary"
+              size="sm"
+              onClick={() => delegateTo()}
+              className="!border-[#000] !bg-transparent !text-[#000] hover:!border-none hover:!bg-[#000] hover:!text-[#fff]"
+            >
               Delegate
             </Button>
           </div>
         </If>
         <If not={message}>
           <div className="mt-1">
             <Button
+              className="!border-none !bg-[#000] !text-[#fff] disabled:opacity-50"
               variant="primary"
               size="sm"
               disabled={inputDescription === "<p></p>" || !inputDescription}

diff --git a/plugins/tokenVoting/pages/new.tsx b/plugins/tokenVoting/pages/new.tsx
@@ -140,7 +140,7 @@ export default function Create() {
         <h1 className="mb-10 text-3xl font-semibold text-[#fff]">Create Proposal</h1>
         <div className="mb-6">
           <InputText
-            className="text-[#000]"
+            className="!text-[#000]"
             label="Title"
             maxLength={100}
             placeholder="A short title that describes the main purpose"
@@ -253,7 +253,7 @@ export default function Create() {
                 </Else>
               </If>
               <Button
-                className="mt-3 border-[1px] border-[#fff] bg-transparent duration-300 hover:bg-[#fff] hover:text-[#000]"
+                className="mt-3 border-[1px] border-[#fff] bg-transparent duration-300 hover:bg-[#fff] hover:text-[#000] disabled:!border-[#fff] disabled:!bg-transparent disabled:!text-[#fff] disabled:opacity-50"
                 size="lg"
                 variant="primary"
                 disabled={!actions.length}

diff --git a/plugins/tokenVoting/pages/proposal-list.tsx b/plugins/tokenVoting/pages/proposal-list.tsx
@@ -97,10 +97,11 @@ export default function Proposals() {
                   body: "VOTING",
                   expression: "SMILE",
                   hairs: "CURLY",
+                  color: "ff0083",
                 }}
                 primaryButton={{
                   className:
-                    "!bg-[#000000] !text-[#fff] hover:!bg-[#afafaf] hover:!text-[#000000] border-none duration-300 ",
+                    "!bg-transparent !text-[#000] !border-[#000] !border-[2px] !border-solid hover:!bg-[#000] hover:!text-[#fff] hover:!border-none duration-300 ",
                   label: "Submit the first one",
                   iconLeft: IconType.PLUS,
                   onClick: () => push("#/new"),

diff --git a/yarn.lock b/yarn.lock
@@ -4185,10 +4185,10 @@ human-signals@^5.0.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
   integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
-husky@^9.0.11:
-  version "9.1.5"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.5.tgz#2b6edede53ee1adbbd3a3da490628a23f5243b83"
-  integrity sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==
+husky@^9.1.6:
+  version "9.1.6"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.6.tgz#e23aa996b6203ab33534bdc82306b0cf2cb07d6c"
+  integrity sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==
 
 [email protected]:
   version "7.1.0"