Skip to content

Commit

Permalink
change color fedired default
Browse files Browse the repository at this point in the history
  • Loading branch information
Javier Caceres authored and Javier Caceres committed Dec 28, 2024
1 parent f8dcafd commit 724808d
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion packages/backend-rs/src/federation/nodeinfo/generate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ async fn generate_nodeinfo_2_1() -> Result<Nodeinfo21, DbErr> {
("proxyAccountName".to_owned(), json!(meta.proxy_account_id)),
(
"themeColor".to_owned(),
json!(meta.theme_color.unwrap_or_else(|| "#31748f".to_owned())),
json!(meta.theme_color.unwrap_or_else(|| "#858AFA".to_owned())),
),
]);
metadata.shrink_to_fit();
Expand Down
2 changes: 1 addition & 1 deletion packages/backend-rs/src/federation/nodeinfo/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ mod unit_test {

#[test]
fn parse_nodeinfo_2_1() {
let json_str_1 = r##"{"version":"2.1","software":{"name":"catodon","version":"24.04-dev.2","repository":"https://codeberg.org/catodon/catodon","homepage":"https://codeberg.org/catodon/catodon"},"protocols":["activitypub"],"services":{"inbound":[],"outbound":["atom1.0","rss2.0"]},"openRegistrations":true,"usage":{"users":{"total":294,"activeHalfyear":292,"activeMonth":139},"localPosts":22616,"localComments":0},"metadata":{"nodeName":"Catodon Social","nodeDescription":"🌎 Home of Catodon, a new platform for fedi communities, initially based on Iceshrimp/Fedired/Misskey. Be aware that our first release is not out yet, so things are still experimental.","maintainer":{"name":"admin","email":"[email protected]"},"langs":[],"tosUrl":"https://example.com/redacted","repositoryUrl":"https://codeberg.org/catodon/catodon","feedbackUrl":"https://codeberg.org/catodon/catodon/issues","disableRegistration":false,"disableLocalTimeline":false,"disableRecommendedTimeline":true,"disableGlobalTimeline":false,"emailRequiredForSignup":true,"postEditing":true,"postImports":false,"enableHcaptcha":true,"enableRecaptcha":false,"maxNoteTextLength":8000,"maxCaptionTextLength":1500,"enableGithubIntegration":false,"enableDiscordIntegration":false,"enableEmail":true,"themeColor":"#31748f"}}"##;
let json_str_1 = r##"{"version":"2.1","software":{"name":"catodon","version":"24.04-dev.2","repository":"https://codeberg.org/catodon/catodon","homepage":"https://codeberg.org/catodon/catodon"},"protocols":["activitypub"],"services":{"inbound":[],"outbound":["atom1.0","rss2.0"]},"openRegistrations":true,"usage":{"users":{"total":294,"activeHalfyear":292,"activeMonth":139},"localPosts":22616,"localComments":0},"metadata":{"nodeName":"Catodon Social","nodeDescription":"🌎 Home of Catodon, a new platform for fedi communities, initially based on Iceshrimp/Fedired/Misskey. Be aware that our first release is not out yet, so things are still experimental.","maintainer":{"name":"admin","email":"[email protected]"},"langs":[],"tosUrl":"https://example.com/redacted","repositoryUrl":"https://codeberg.org/catodon/catodon","feedbackUrl":"https://codeberg.org/catodon/catodon/issues","disableRegistration":false,"disableLocalTimeline":false,"disableRecommendedTimeline":true,"disableGlobalTimeline":false,"emailRequiredForSignup":true,"postEditing":true,"postImports":false,"enableHcaptcha":true,"enableRecaptcha":false,"maxNoteTextLength":8000,"maxCaptionTextLength":1500,"enableGithubIntegration":false,"enableDiscordIntegration":false,"enableEmail":true,"themeColor":"#858AFA"}}"##;
let parsed_1: Nodeinfo21 = serde_json::from_str(json_str_1).unwrap();
let serialized_1 = serde_json::to_string(&parsed_1).unwrap();
let reparsed_1: Nodeinfo21 = serde_json::from_str(&serialized_1).unwrap();
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/server/web/cli.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ button {
border:none;
cursor:pointer;
margin-block-end:12px;
background:linear-gradient(var(--gradient-to-inline-end),#9ccfd8,#31748f);
background:linear-gradient(var(--gradient-to-inline-end),#9ccfd8,#858AFA);
line-height:50px;
color:#191724;
font-weight:700;
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/server/web/views/base.pug
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ html
meta(name='application-name' content='Fedired')
meta(name='referrer' content='origin')
meta(name='darkreader-lock' content='')
meta(name='theme-color' content= themeColor || '#31748f')
meta(name='theme-color-orig' content= themeColor || '#31748f')
meta(name='theme-color' content= themeColor || '#858AFA')
meta(name='theme-color-orig' content= themeColor || '#858AFA')
meta(property='twitter:card' content='summary')
meta(property='og:site_name' content= instanceName || 'Fedired')
meta(name='viewport' content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no')
Expand Down
2 changes: 1 addition & 1 deletion packages/client/assets/label.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/client/src/components/MkChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const alpha = (hex, a) => {
};
const colors = {
blue: "#31748f",
blue: "#858AFA",
green: "#9ccfd8",
yellow: "#f6c177",
red: "#eb6f92",
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/components/MkNotification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ useTooltip(reactionRef, (showing) => {
&.quote {
padding: 3px;
background: #31748f;
background: #858AFA;
pointer-events: none;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/pages/admin/overview.queue-chart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ onMounted(() => {
tension: 0.3,
borderWidth: 2,
borderJoinStyle: "round",
borderColor: "#31748f",
backgroundColor: alpha("#31748f", 0.1),
borderColor: "#858AFA",
backgroundColor: alpha("#858AFA", 0.1),
data: [],
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/pages/admin/overview.queue.chart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const color =
props.type === "process"
? "#c4a7e7"
: props.type === "active"
? "#31748f"
? "#858AFA"
: props.type === "delayed"
? "#eb6f92"
: props.type === "waiting"
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/pages/admin/overview.stats.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ onMounted(async () => {
&.notes {
> .icon {
background: #28698322;
color: #31748f;
color: #858AFA;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/pages/admin/queue.chart.chart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const color =
props.type === "process"
? "#9ccfd8"
: props.type === "active"
? "#31748f"
? "#858AFA"
: props.type === "delayed"
? "#eb6f92"
: props.type === "waiting"
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/pages/mfm-cheat-sheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ const preview_scale = ref(
"$[scale.x=1.3 🍮]\n$[scale.x=1.5,y=3 🍮]\n$[scale.y=0.3 🍮]",
);
const preview_fg = ref("$[fg.color=eb6f92 Text color]");
const preview_bg = ref("$[bg.color=31748f Background color]");
const preview_bg = ref("$[bg.color=858AFA Background color]");
const preview_plain = ref(
"<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>",
);
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/pages/page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ function getBgImg(): string {
if (page.value.eyeCatchingImage != null) {
return `url(${page.value.eyeCatchingImage.url})`;
} else {
return "linear-gradient(to bottom right, #31748f, #9ccfd8)";
return "linear-gradient(to bottom right, #858AFA, #9ccfd8)";
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/themes/d-rosepine.json5
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
header: ':alpha<0.7<@panel',
infoBg: '#253142',
infoFg: '#fff',
renote: '#31748f',
renote: '#858AFA',
shadow: 'rgba(0, 0, 0, 0.3)',
divider: 'rgba(255, 255, 255, 0.1)',
hashtag: '#ebbcba',
Expand Down
2 changes: 1 addition & 1 deletion packages/sw/src/sw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function offlineContentHTML(): string {
*{font-family:BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif}
body,html{background-color:#191724;color:#e0def4;justify-content:center;margin:auto;padding:10px;text-align:center}
button{border-radius:999px;padding:0 12px;border:none;cursor:pointer;margin-bottom:12px}.button-big{background:linear-gradient(90deg,#c4a7e7,#ebbcba);line-height:50px}
.button-big:hover{background:#31748f}.button-label-big{color:#191724;font-weight:700;font-size:20px;padding:12px}
.button-big:hover{background:#858AFA}.button-label-big{color:#191724;font-weight:700;font-size:20px;padding:12px}
p{font-size:16px}#msg,.dont-worry{font-size:18px}.icon-warning{color:#f6c177;height:4rem;padding-top:2rem}
h1{font-size:32px}code{font-family:Fira,FiraCode,monospace}@media screen and (max-width:500px){details{width:50%}}
</style>
Expand Down

0 comments on commit 724808d

Please sign in to comment.