36 Commits

Author SHA1 Message Date
trianta 41c01fcf55 css: unify colors and swap bg/fg 2026-02-24 07:07:20 -06:00
trianta ea61606f68 css: visited buttons should stay same color 2026-02-24 07:02:05 -06:00
trianta e350bba979 css: match colors on buttons 2026-02-24 06:56:52 -06:00
trianta 6dc13a5c1e css: fix error in fetching font 2026-02-24 06:51:36 -06:00
trianta a20db4d400 assets: remove folder 2026-02-24 06:49:43 -06:00
trianta de6b32b21e css: source the font from nerfonts.com 2026-02-24 06:48:11 -06:00
trianta f3725f605d html: fixup icons 2026-02-24 06:36:53 -06:00
trianta 7c7cc7130e css: syntax fix 2026-02-24 06:25:09 -06:00
trianta e57719d4f6 css: how had this ever worked? 2026-02-24 06:23:46 -06:00
trianta ff6f212c83 css: potentially fixup url 2026-02-24 06:18:01 -06:00
trianta 122e341c89 css: fix font url 2026-02-24 06:14:39 -06:00
trianta 39b848b126 css: attempt to add custom font 2026-02-24 06:06:40 -06:00
trianta 0b367bba27 css: fix css syntax 2026-02-24 05:21:50 -06:00
trianta f02b11b418 css: recolor website 2026-02-24 05:20:39 -06:00
trianta d23375e28b jenkins: finally fix pipeline 2026-02-24 05:05:53 -06:00
trianta dcf2cfb35d jenkins: try with just main again 2026-02-24 04:38:15 -06:00
trianta dd0b5f63fe jenkins: theres no way this works 2026-02-24 04:35:21 -06:00
trianta eb0b249d6a jenkins: more regex attempting 2026-02-24 04:29:55 -06:00
trianta 8cbaef9afe jenkins: try regex 2026-02-24 03:58:48 -06:00
trianta 995eb69937 jenkins: try direct variable 2026-02-24 03:55:58 -06:00
trianta 193dcb2b2b jenkins: try alternative 2026-02-24 03:54:15 -06:00
trianta d42c59c317 jenkins: zzz 2026-02-24 03:46:24 -06:00
trianta 2b5b791399 jenkins: wtf 2026-02-24 03:45:05 -06:00
trianta f99105c222 jenkins: manual conditional override 2026-02-24 03:44:01 -06:00
trianta ca716de215 jenkins: losing my mind 2026-02-24 03:39:54 -06:00
trianta 7f93e1c58a jenkins: finally fix pipeline? 2026-02-24 03:35:50 -06:00
trianta 0f12fd3742 jenkins: debug prints 2026-02-24 03:33:18 -06:00
trianta 91cefa9033 jenkins: try to fix expressions 2026-02-24 03:27:16 -06:00
trianta 2f86d84e19 jenkins: change to using expressions 2026-02-24 03:25:22 -06:00
trianta dc461f6af0 jenkins: fix Jenkinsfile typo 2026-02-24 03:11:11 -06:00
trianta 8b2d332d8b jenkins: attempt to fix Jenkinsfile again 2026-02-24 03:08:29 -06:00
trianta 00804e0a30 jenkins: fixup pipeline into multibranch structure 2026-02-24 02:08:15 -06:00
trianta 4b8cac97ad jenkins: setup different pipelines for specific servers 2026-02-24 00:57:19 -06:00
trianta 8af19f442c contact: add matrix 2026-02-13 23:51:26 -06:00
trianta 62212f1c7c npm: update packages 2026-02-12 12:10:01 -06:00
trianta 8751d5aa86 css: move to new colorscheme 2026-02-02 04:20:06 -06:00
5 changed files with 71 additions and 43 deletions
Vendored
+35 -4
View File
@@ -1,22 +1,53 @@
pipeline {
agent any
agent none
stages {
stage('Checkout') {
agent { label 'agent-12' }
when { expression { return env.GIT_BRANCH == 'origin/main' } }
steps {
checkout scm
}
}
stage('Build') {
agent { label 'agent-12' }
when { expression { return env.GIT_BRANCH == 'origin/main' } }
steps {
script {
docker.build('trianta.dev:latest')
}
}
}
stage('Deploy') {
agent { label 'agent-12' }
when { expression { return env.GIT_BRANCH == 'origin/main' } }
steps {
sh 'docker stop trianta.dev && docker rm trianta.dev || exit 0'
sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name trianta.dev trianta.dev:latest'
}
}
stage('Test Checkout') {
agent { label 'agent-13' }
when { expression { return env.GIT_BRANCH != 'origin/main' } }
steps {
sh 'echo $GIT_BRANCH'
checkout scm
}
}
stage('Test Build') {
agent { label 'agent-13' }
when { expression { return env.GIT_BRANCH != 'origin/main' } }
steps {
script {
docker.build('test.trianta.dev:latest')
}
}
}
stage('Deploy') {
stage('Test Deploy') {
agent { label 'agent-13' }
when { expression { return env.GIT_BRANCH != 'origin/main' } }
steps {
sh 'docker stop test && docker rm test || exit 0'
sh 'docker run -d -p 3466:80 --name test test.trianta.dev:latest'
sh 'docker stop test.trianta.dev && docker rm test.trianta.dev || exit 0'
sh 'docker run -d -e USER=scv -e USER_UID=1001 -e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name test.trianta.dev test.trianta.dev:latest'
}
}
}
+17 -20
View File
@@ -1,14 +1,16 @@
/*
* base text: #06CDFF
* important text: #8200FF
* background: #03001C
* text / border: #8c7862
* foreground: #89bea6
* background: #61937c
*/
body {
font-family: Arial, sans-serif;
font-weight: 800;
color: #06CDFF;
background: #03001C;
font-family: "Departure Mono", sans-serif;
font-optical-sizing: auto;
font-weight: 400;
color: #8c7862;
background: #61937c;
line-height: 1.5;
margin-inline: auto;
margin: 0 auto;
@@ -18,6 +20,8 @@ body {
max-width: 60rem;
margin: 0 auto;
padding: 2rem 1.5rem;
background: #89bea6;
border: 4px solid #8c7862;
}
nav {
@@ -51,11 +55,8 @@ nav ul {
}
.trianta {
border: none !important;
color: #06CDFF !important;
font-size: 2.5rem !important;
min-width: 12rem;
margin: -1rem;
}
.canvas {
@@ -63,13 +64,12 @@ nav ul {
display: inline-block;
width: 60rem;
vertical-align: bottom;
border: solid 4px #06CDFF;
border: solid 4px #8c7862;
}
.stats {
font-size: 18px;
display: inline-block;
width: 12rem;
vertical-align: middle;
}
@@ -80,7 +80,7 @@ h1 {
}
h2 {
border: solid 2px #06CDFF;
border: solid 2px #8c7862;
margin: auto;
padding: 8px;
text-align: center;
@@ -94,14 +94,12 @@ h3 {
}
p {
margin: 0px;
margin: 1rem;
}
a {
background-color: #03001C;
border: solid 2px #06CDFF;
border: solid 2px #8c7862;
border-radius: 12px;
color: #06CDFF;
display: inline-block;
margin: 6px;
margin-top: 0px;
@@ -126,8 +124,7 @@ a.button {
}
a:visited {
border: solid 2px #8200FF;
color: #8200FF;
color: #8c7862;
}
@keyframes hover {
@@ -157,5 +154,5 @@ a:visited {
#pong {
margin: 6px;
background: #03001C;
background: #61937c;
}
+14 -15
View File
@@ -3,25 +3,24 @@
<head>
<meta charset="utf-8"/>
<title>Trianta</title>
<link rel="stylesheet" href="/default.css" />
<link rel="stylesheet" href="/default.css">
<link rel="stylesheet" href="https://www.nerdfonts.com/assets/css/webfont.css">
</head>
<body>
<div class="inside">
<div>
<a href="/" class="trianta">TRIANTA</a>
<p>Function over form by design</p>
</div>
<div style="display: flex;">
<nav class="column">
<ul>
<li><a href="https://www.github.com/trimutex">GitHub</a></li>
<li><a href="https://lab.trianta.dev/Trianta">Projects</a></li>
<li><a href="/completed">Completed</a></li>
<li><a href="/current">Current</a></li>
<li><a href="/other">Other</a></li>
<li><a href="/contact">Contact</a></li>
</ul>
</nav>
<a href="/" class="trianta">TRIANTA</a>
<div class="column">
<a href="https://www.github.com/trimutex" alt="GitHub"><i class="nf nf-dev-github"></i></a>
<a href="https://lab.trianta.dev/Trianta" alt="Personal Projects"><i class="nf nf-linux-gitea"></i></a>
<a href="/completed" alt="Completed"><i class="nf nf-dev-javascript"></i></a>
<a href="/current" alt="Current"><i class="nf nf-dev-git_branch"></i></a>
<a href="/other" alt="Other"><i class="nf nf-dev-git_merge"></i></a>
<a href="/contact" alt="Contact"><i class="nf nf-oct-feed_person"></i></a>
</div>
</div>
<p>Function over form by design</p>
<div style="display: flex;">
<div class="column gap"></div>
<div class="column content"></div>
</div>
+3 -3
View File
@@ -13,9 +13,9 @@
}
},
"node_modules/typescript": {
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
"integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
"version": "5.9.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"license": "Apache-2.0",
"bin": {
"tsc": "bin/tsc",
+2 -1
View File
@@ -25,8 +25,9 @@
<div class="column gap"></div>
<div class="column content">
<h2>Contact Methods</h2>
<p>E-mail: gregcraw2001@gmail.com</p>
<p>E-mail: gregcraw2001@gmail.com</p>
<p>Discord: trianta</p>
<p>Matrix: @trimutex:matrix.org</p>
</div>
</div>
</div>