From 8268b4dcea7a3c4af782f81cf21331cbae4461a2 Mon Sep 17 00:00:00 2001 From: Daniel Petersen Date: Sun, 20 Oct 2024 10:46:56 -0700 Subject: [PATCH 1/3] colors updated to new branding colors --- src/assets/style/components/merkle_graph.scss | 4 ++-- src/assets/style/components/navbar.scss | 3 ++- src/assets/style/components/program_input.scss | 12 ++++++------ src/assets/style/components/tab_content.scss | 4 ++-- src/assets/style/style.scss | 14 +++++++++----- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/assets/style/components/merkle_graph.scss b/src/assets/style/components/merkle_graph.scss index db22323..e82053b 100644 --- a/src/assets/style/components/merkle_graph.scss +++ b/src/assets/style/components/merkle_graph.scss @@ -50,7 +50,7 @@ .graph-button { width: 30px; height: 30px; - border: 1px solid #5134E0; + border: 1px solid #b26e0f; padding: 5px; border-radius: 4px; background: #191C21; @@ -60,7 +60,7 @@ fill: #B5BDC2; &:hover { - background: #5134E0; + background: #b26e0f; } } .graph-button-holder { diff --git a/src/assets/style/components/navbar.scss b/src/assets/style/components/navbar.scss index 7737fd3..08ddf18 100644 --- a/src/assets/style/components/navbar.scss +++ b/src/assets/style/components/navbar.scss @@ -30,7 +30,7 @@ } .run-button{ - background: #5134E0; + background: #b26e0f; margin-right: 2px; } @@ -85,6 +85,7 @@ } .beta-tag{ + color: #ea9606; position: absolute; right:40px; top: 20px; diff --git a/src/assets/style/components/program_input.scss b/src/assets/style/components/program_input.scss index e81f8f1..d4c21fb 100644 --- a/src/assets/style/components/program_input.scss +++ b/src/assets/style/components/program_input.scss @@ -85,7 +85,7 @@ align-items: center; gap: 8px; color: #fff; - background: #5134E0; + background: #b26e0f; border: none; font-family: 'rigid-square'; font-size: 16px; @@ -95,7 +95,7 @@ max-width: 100%; cursor: pointer; &:hover { - // background: #7973f4; + // background: #ea9606; } } } @@ -151,7 +151,7 @@ background-color: $background-dark; border-radius: 7.5px; border: 1px solid rgba(255, 255, 255, 0.10); - color: #c2c2ff; + color: #fdc667; font-family: 'Roboto Mono'; font-size: 12px; resize: none; @@ -192,7 +192,7 @@ gap: 4px; .copy-button{ - border: 1px solid #5134E0; + border: 1px solid #b26e0f; padding: 4px; border-radius: 4px; height: 34px; @@ -203,7 +203,7 @@ background: #191C21; &:hover { - background: #5134e0; + background: #b26e0f; } } #copy-button-success{ @@ -212,7 +212,7 @@ background: #191C21; padding: 6px 10px; - border: 1px solid #5134e0; + border: 1px solid #b26e0f; border-radius: 4px; } .copy-show{ diff --git a/src/assets/style/components/tab_content.scss b/src/assets/style/components/tab_content.scss index 23b49bb..dead1c1 100644 --- a/src/assets/style/components/tab_content.scss +++ b/src/assets/style/components/tab_content.scss @@ -59,7 +59,7 @@ } .signed-data-content{ - border: 1px solid #5134e0; + border: 1px solid #b26e0f; border-radius: 8px; padding-top: 20px; } @@ -88,6 +88,6 @@ margin-bottom: 20px; a { - color: #7973f4; + color: #ea9606; } } \ No newline at end of file diff --git a/src/assets/style/style.scss b/src/assets/style/style.scss index ae861b7..6ce77bd 100644 --- a/src/assets/style/style.scss +++ b/src/assets/style/style.scss @@ -30,7 +30,7 @@ h1, h2, h3, h4, h5, h6{ } a { - color: #7973F4; + color: #ea9606; &:hover { color: white; @@ -114,8 +114,8 @@ p { padding: 14px 16px; cursor: pointer; border: none; - background: #5134E0; - border: 1px solid #5134E0; + background: #b26e0f; + border: 1px solid #b26e0f; border-radius: 4px; margin-right: 4px; @@ -129,7 +129,7 @@ p { } .submit-button, .push-button, .pop-button, .copy-button { - border: 1px solid #5134E0; + border: 1px solid #b26e0f; padding: 4px; border-radius: 4px; display: flex; @@ -139,7 +139,7 @@ p { background: #191C21; &:hover { - background: #5134e0; + background: #b26e0f; } } @@ -147,6 +147,10 @@ input:invalid { background-color: lightpink; } +input[type="radio"]{ + accent-color: #ea9606; +} + .input{ background: #191c21; border: 1px solid rgba(255, 255, 255, 0.10); From a2cd1c87230798475014cd91f8c990a92f6c8bce Mon Sep 17 00:00:00 2001 From: Daniel Petersen Date: Sun, 20 Oct 2024 10:49:22 -0700 Subject: [PATCH 2/3] new favicon added for new branding --- favicon.png | Bin 9078 -> 1923 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/favicon.png b/favicon.png index 784ea5ff8823dbd39649f44473fd3ff63bb2b267..6facee942172f5a8675bf28f2cb797eaad35cade 100644 GIT binary patch literal 1923 zcmV-}2YmR6P)iqT=wg3PI=}AOERCod1mD$#tFbsqZ z#tYc&y#KQnviu1F5+lhAotvKa#KvD|Mq>0Tq}EFD9hFMxTxK4=N&0>*c3=O=qEjW2 z+Ts0gBqA?jKY6Vp7bQQhQp?yce`QDk0A7Z~Pga&A2%a2q{g8r_sMN9gk>w=~!c9@^ zC^RL)&5k@Y0#S}WQx&k}eh}^$fevb( zJ4r7oPiBO&;UO<(1hm1I8JP}@!0D%L5n?E9B`7y|@F+b+7^w(Rda5Mae1WIZr$~yC z#i_$f0?$yys>2&ac72Aq-r4mTkQ90B*Aq}A!+@ZWv0qL=kw_m<6p1m+6#oGOVCzNS z(|ghrkC`kOZ}8vEp+T>ewR}% z5-!AD>hfV)q^};Pn~D%&>W4#-Kq$Xq8rrF@eyE;WEQ|IRreSOQjgqs+cAVAh;< zCU_WP5ftJJgaF^#*XIxxbv>LydT4c9fz*OOsOVeW!5FG)0#oD%3=(=_4P}^{0sUr4 zYy^ST~ar?UcRM2&~&$gBYF2#aT^s)5Q1;IeKg zAfQ%A8Y2iAu?W}-@d2S>*Put!T_eznVhvHkZrMvyQ+MWA_3jZMgr=CU{a(P$4|Q~T zDk*BcGn?vP47(J-`LwEb2E3z%FwBwK9D{D{_iE?BJErqt+P4DQY@VUh#5b>L<|j_A z{i1f7f3hhzbW^--ZD^WyA?&Y1mJ&js)3gWSP|<-9f}_*41L4%rmJmWBH{BkD)4=Zu zA)a|EI2lCkcCMy_c_eo%e7RI0*9zQN@6en0-AjtqsH& z0YamO6CXDam5lRuXKOALvFu-y^F z4>cnt2WrCd!8AaMs;b*WAbJC};${aG1`dKx2rCvhXhMbBb#p0DR?H$X0}0U^ECt1i zM?&z?m>Neh#fO-!z*6A7z(OomU@6eOKtn86U@7|85c7aqgqyU{A$V)hX4vQuw^}S1 za5tLx5KjuzfjMk^h)1GkikYKsnkP#0RDJ*B7y`E}n4o~*!(^OPA9;m?&?FEqGaNt~ z>O7G_@csnG7Gg{TV#cr&n4&{LNIHl`wjEt4XiGs2aZ~@&`kx2eP6t*XKBrjb0pdGh zOAo<9L(Cd!AvB}eb|=;T4-mYggpiDK#=5JegeVxxV?bC+2*y|eKRvXcaz052F%Kuq zc!Gz55<)Bx>f#XdaKbb@4TyO-VVa!=#KM4Rb`lV`UNcr+8sb(7#>Ax|Zk0fk0uDjA zvF{A;aLQX*;{?Y`_ldUT%86d=8n!tJL4HZKJgm_C6bUyW_A%f^e7{pte zz=t7v29z-^=PH7U~Q`qUBcEIS7`=e(_eNd#RsFZbShX7!$Ey{UHfpNR1)~F{DKSWk`tv z&X5iTh9MD(6337P1!%Ue6@BXwFw7KXR0fq1Ffdlcq!2U=jAbesgC;^)q~jozl8}Kh z86#3eb$F==A1TTxMT!*3WQ}ZwrjF9fj8M%`w2h8oM(Lvs?+P%cgr7F7@bnI#NMmhX|h|Vh$D4gcS#Lk&8qK9vrzi zYlzY^i~a0f5OryQKgnFHZ=NWjWl9nHqC!fowR+e5cj@WB{~rT}6X@~8M-~78002ov JPDHLkV1o2aMQ8v3 literal 9078 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 Pfua17V4qsAZwmhoQbpf> From b3b456a0fe8fb4d411e144348f91de15d2796b98 Mon Sep 17 00:00:00 2001 From: Daniel Petersen Date: Sun, 20 Oct 2024 11:00:09 -0700 Subject: [PATCH 3/3] buttons made smaller --- src/assets/style/style.scss | 14 ++++++++++++++ src/components/run_window/hash_store_tab.rs | 4 ++-- src/components/run_window/key_store_tab.rs | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/assets/style/style.scss b/src/assets/style/style.scss index 6ce77bd..8567c57 100644 --- a/src/assets/style/style.scss +++ b/src/assets/style/style.scss @@ -102,6 +102,12 @@ p { .button-row { display: flex; + + &.is-small{ + button{ + padding: 8px 12px; + } + } } .button-col { @@ -126,6 +132,10 @@ p { &.bordered{ background: #191c21; } + + &.is-small{ + padding: 8px 12px; + } } .submit-button, .push-button, .pop-button, .copy-button { @@ -141,6 +151,10 @@ p { &:hover { background: #b26e0f; } + + &.is-small{ + padding: 8px 12px; + } } input:invalid { diff --git a/src/components/run_window/hash_store_tab.rs b/src/components/run_window/hash_store_tab.rs index 0d85a05..57de5c9 100644 --- a/src/components/run_window/hash_store_tab.rs +++ b/src/components/run_window/hash_store_tab.rs @@ -92,7 +92,7 @@ fn CopyHashesToClipboard() -> impl IntoView {

Hashes

-
+
impl IntoView {

Preimages

-
+
impl IntoView {

Public Keys

-
+
impl IntoView {

Signatures

-
+