diff --git a/gitea-blurple.sh b/gitea-blurple.sh index 89cf641..31e0935 100644 --- a/gitea-blurple.sh +++ b/gitea-blurple.sh @@ -1,8 +1,19 @@ #!/bin/bash git clone https://git.oldgate.org/OGS/Gitea-Blurple.git +sudo systemctl stop gitea +rm -rf /var/lib/gitea/custom/public cp -r Gitea-Blurple/public/ /var/lib/gitea/custom/ sudo chown -R git:git /var/lib/gitea/custom sudo chmod -R 750 /var/lib/gitea/custom +if grep -Fxq "[ui]" /etc/gitea/app.ini +then +continue +else +cp /etc/gitea/app.ini /etc/gitea/app.ini.bak +cat Gitea-Blurple/templates/app.ini >> /etc/gitea/app.ini +sudo chown root:git /etc/gitea +sudo chmod 770 /etc/gitea +fi rm -rf Gitea-Blurple sudo systemctl restart gitea echo -e "==================================================================" diff --git a/public/css/fonts/OpenDyslexicAlta-Bold.otf b/public/css/fonts/OpenDyslexicAlta-Bold.otf new file mode 100644 index 0000000..37f6d5e Binary files /dev/null and b/public/css/fonts/OpenDyslexicAlta-Bold.otf differ diff --git a/public/css/fonts/OpenDyslexicAlta-Italic.otf b/public/css/fonts/OpenDyslexicAlta-Italic.otf new file mode 100644 index 0000000..5233fe0 Binary files /dev/null and b/public/css/fonts/OpenDyslexicAlta-Italic.otf differ diff --git a/public/css/fonts/OpenDyslexicAlta-Regular.otf b/public/css/fonts/OpenDyslexicAlta-Regular.otf new file mode 100644 index 0000000..6eb4a3e Binary files /dev/null and b/public/css/fonts/OpenDyslexicAlta-Regular.otf differ diff --git a/public/css/index.css b/public/css/index.css index 8c1818d..2bfb82c 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -20213,6 +20213,10 @@ details.toggleable-item[open] summary:after { filter: opacity(.5)!important } +.ui .field .dropzone .dz-preview .dz-progress { + top: 7em +} + #git-graph-container { overflow-x: auto; width: 100%; @@ -22111,7 +22115,7 @@ details.toggleable-item[open] summary:after { margin-top: 24px; margin-bottom: 16px; font-weight: var(--font-weight-semibold); - line-height: 1.25; + line-height: 1.25 } .markup h1 tt,.markup h1 code,.markup h2 tt,.markup h2 code,.markup h3 tt,.markup h3 code,.markup h4 tt,.markup h4 code,.markup h5 tt,.markup h5 code,.markup h6 tt,.markup h6 code { @@ -22121,7 +22125,7 @@ details.toggleable-item[open] summary:after { .markup h1 { padding-bottom: .3em; font-size: 2em; - border-bottom: 1px solid var(--color-secondary); + border-bottom: 1px solid var(--color-secondary) } .markup h2 { @@ -23090,7 +23094,7 @@ details.toggleable-item[open] summary:after { --fonts-proportional: -apple-system, "Segoe UI", system-ui, Roboto, "Helvetica Neue", Arial; --fonts-monospace: ui-monospace, SFMono-Regular,"SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace, var(--fonts-emoji); --fonts-emoji: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Twemoji Mozilla"; - /* --font-weight-light: 300; */ + --font-weight-light: 300; --font-weight-normal: 400; --font-weight-medium: 500; --font-weight-semibold: 600; @@ -24212,7 +24216,7 @@ img.ui.avatar,.ui.avatar img,.ui.avatar svg { } .ui .text.truncate { - overflow: hidden; + overflow-x: hidden; text-overflow: ellipsis; white-space: nowrap; display: inline-block @@ -29730,7 +29734,7 @@ text-expander .suggestions img { } #readme_profile { - padding: 10px; + padding: 1em 2em; border-radius: .28571429rem; background: var(--color-card); border: 1px solid var(--color-secondary) diff --git a/public/css/theme-blurple-dyslexia.css b/public/css/theme-blurple-dyslexia.css new file mode 100644 index 0000000..b09d169 --- /dev/null +++ b/public/css/theme-blurple-dyslexia.css @@ -0,0 +1,572 @@ +@font-face {font-family: 'OpenDyslexic2';src: url('./fonts/OpenDyslexicAlta-Regular.otf');font-weight: normal;font-style: normal;font-display: block;}@font-face {font-family: 'OpenDyslexic2';src: url('./fonts/OpenDyslexicAlta-Bold.otf');font-weight: bold;font-style: bold;font-display: block;}@font-face {font-family: 'OpenDyslexic2';src: url('./fonts/OpenDyslexicAlta-Italic.otf');font-weight: italic;font-style: italic;font-display: block;} + +@media (prefers-color-scheme: dark) { + .chroma { + background-color:var(--color-code-bg) + } + + .chroma .lntd { + vertical-align: top; + padding: 0; + margin: 0; + border: 0 + } + + .chroma .lntable { + border-spacing: 0; + padding: 0; + margin: 0; + border: 0; + width: auto; + overflow: auto; + display: block + } + + .chroma .hl { + display: block; + width: 100% + } + + .chroma .lnt,.chroma .ln { + margin-right: .4em; + padding: 0 .4em + } + + .chroma .gs { + font-weight: var(--font-weight-semibold) + } + + .chroma .gl { + text-decoration: underline + } +} + +@media (prefers-color-scheme: dark) { + .chroma .bp { + color:#fabd2f + } + + .chroma .c,.chroma .c1,.chroma .ch,.chroma .cm { + color: #777e94 + } + + .chroma .cp { + color: #8ec07c + } + + .chroma .cpf { + color: #649bc4 + } + + .chroma .cs { + color: #9075cd + } + + .chroma .dl { + color: #649bc4 + } + + .chroma .gd { + color: #fff; + background-color: #5f3737 + } + + .chroma .ge { + color: #ddee30 + } + + .chroma .gh { + color: #ffaa10 + } + + .chroma .gi { + color: #fff; + background-color: #3a523a + } + + .chroma .go { + color: #777e94 + } + + .chroma .gp { + color: #ebdbb2 + } + + .chroma .gr { + color: #f43 + } + + .chroma .gs { + color: #ebdbb2 + } + + .chroma .gt { + color: #ff7540 + } + + .chroma .gu { + color: #b8bb26 + } + + .chroma .il { + color: #649bc4 + } + + .chroma .k { + color: #ff7540 + } + + .chroma .kc { + color: #649bc4 + } + + .chroma .kd { + color: #ff7540 + } + + .chroma .kn { + color: #ffaa10 + } + + .chroma .kp { + color: #5f8700 + } + + .chroma .kr { + color: #ff7540 + } + + .chroma .kt { + color: #ff7b72 + } + + .chroma .m,.chroma .mb,.chroma .mf,.chroma .mh,.chroma .mi,.chroma .mo { + color: #649bc4 + } + + .chroma .n { + color: #c9d1d9 + } + + .chroma .na { + color: #b8bb26 + } + + .chroma .nb { + color: #fabd2f + } + + .chroma .nc { + color: #ffaa10 + } + + .chroma .nd { + color: #8ec07c + } + + .chroma .ne { + color: #ff7540 + } + + .chroma .nf,.chroma .ni { + color: #fabd2f + } + + .chroma .nl { + color: #ff7540 + } + + .chroma .nn { + color: #c9d1d9 + } + + .chroma .no { + color: #649bc4 + } + + .chroma .nt { + color: #ff7540 + } + + .chroma .nv { + color: #ebdbb2 + } + + .chroma .nx { + color: #b6bac5 + } + + .chroma .o { + color: #ff7540 + } + + .chroma .ow { + color: #5f8700 + } + + .chroma .p { + color: #d2d4db + } + + .chroma .s,.chroma .s1,.chroma .s2 { + color: #b8bb26 + } + + .chroma .sa { + color: #649bc4 + } + + .chroma .sb { + color: #b8bb26 + } + + .chroma .sc { + color: #649bc4 + } + + .chroma .sd { + color: #777e94 + } + + .chroma .se { + color: #ff7540 + } + + .chroma .sh { + color: #649bc4 + } + + .chroma .si { + color: #ffaa10 + } + + .chroma .sr { + color: #9075cd + } + + .chroma .ss { + color: #ff7540 + } + + .chroma .sx { + color: #ffaa10 + } + + .chroma .vc { + color: #ff7540 + } + + .chroma .vg,.chroma .vi { + color: #ffaa10 + } + + .chroma .w { + color: #7f8699 + } +} + +@media (prefers-color-scheme: dark) { + .CodeMirror.cm-s-default .cm-property,.CodeMirror.cm-s-paper .cm-property { + color:#a0cc75 + } + + .CodeMirror.cm-s-default .cm-header,.CodeMirror.cm-s-paper .cm-header { + color: #9daccc + } + + .CodeMirror.cm-s-default .cm-quote,.CodeMirror.cm-s-paper .cm-quote { + color: #090 + } + + .CodeMirror.cm-s-default .cm-keyword,.CodeMirror.cm-s-paper .cm-keyword { + color: #cc8a61 + } + + .CodeMirror.cm-s-default .cm-atom,.CodeMirror.cm-s-paper .cm-atom { + color: #ef5e77 + } + + .CodeMirror.cm-s-default .cm-number,.CodeMirror.cm-s-paper .cm-number { + color: #ff5656 + } + + .CodeMirror.cm-s-default .cm-def,.CodeMirror.cm-s-paper .cm-def { + color: #e4e4e4 + } + + .CodeMirror.cm-s-default .cm-variable-2,.CodeMirror.cm-s-paper .cm-variable-2 { + color: #00bdbf + } + + .CodeMirror.cm-s-default .cm-variable-3,.CodeMirror.cm-s-paper .cm-variable-3 { + color: #085 + } + + .CodeMirror.cm-s-default .cm-comment,.CodeMirror.cm-s-paper .cm-comment { + color: #8e9ab3 + } + + .CodeMirror.cm-s-default .cm-string,.CodeMirror.cm-s-paper .cm-string { + color: #a77272 + } + + .CodeMirror.cm-s-default .cm-string-2,.CodeMirror.cm-s-paper .cm-string-2 { + color: #f50 + } + + .CodeMirror.cm-s-default .cm-meta,.CodeMirror.cm-s-paper .cm-meta,.CodeMirror.cm-s-default .cm-qualifier,.CodeMirror.cm-s-paper .cm-qualifier { + color: #ffb176 + } + + .CodeMirror.cm-s-default .cm-builtin,.CodeMirror.cm-s-paper .cm-builtin { + color: #b7c951 + } + + .CodeMirror.cm-s-default .cm-bracket,.CodeMirror.cm-s-paper .cm-bracket { + color: #997 + } + + .CodeMirror.cm-s-default .cm-tag,.CodeMirror.cm-s-paper .cm-tag { + color: #f1d273 + } + + .CodeMirror.cm-s-default .cm-attribute,.CodeMirror.cm-s-paper .cm-attribute { + color: #bfcc70 + } + + .CodeMirror.cm-s-default .cm-hr,.CodeMirror.cm-s-paper .cm-hr { + color: #999 + } + + .CodeMirror.cm-s-default .cm-url,.CodeMirror.cm-s-paper .cm-url { + color: #c5cfd0 + } + + .CodeMirror.cm-s-default .cm-link,.CodeMirror.cm-s-paper .cm-link { + color: #d8c792 + } + + .CodeMirror.cm-s-default .cm-error,.CodeMirror.cm-s-paper .cm-error { + color: #dbdbeb + } +} + +@media (prefers-color-scheme: dark) { + :root { + --fonts-proportional: OpenDyslexic2!important; + --is-dark-theme: true; + --color-primary: #7289DA; + --color-primary-contrast: #ffffff; + --color-primary-dark-1: #4E5D94; + --color-primary-dark-2: #4E5D94; + --color-primary-dark-3: #4E5D94; + --color-primary-dark-4: #405193; + --color-primary-dark-5: #cfddc1; + --color-primary-dark-6: #e7eee0; + --color-primary-dark-7: #f8faf6; + --color-primary-light-1: #4E5D94; + --color-primary-light-2: #8997c9; + --color-primary-light-3: #4E5D94; + --color-primary-light-4: #939bb7; + --color-primary-light-5: #4E5D94; + --color-primary-light-6: #1b2313; + --color-primary-light-7: #080b06; + --color-primary-alpha-10: #7289DA19; + --color-primary-alpha-20: #7289DA33; + --color-primary-alpha-30: #7289DA4b; + --color-primary-alpha-40: #7289DA66; + --color-primary-alpha-50: #7289DA80; + --color-primary-alpha-60: #7289DA99; + --color-primary-alpha-70: #7289DAb3; + --color-primary-alpha-80: #7289DAcc; + --color-primary-alpha-90: #7289DAe1; + --color-primary-hover: var(--color-primary-light-1); + --color-primary-active: var(--color-primary-light-2); + --color-secondary: #454a57; + --color-secondary-dark-1: #505665; + --color-secondary-dark-2: #5b6273; + --color-secondary-dark-3: #71798e; + --color-secondary-dark-4: #7f8699; + --color-secondary-dark-5: #8c93a4; + --color-secondary-dark-6: #9aa0af; + --color-secondary-dark-7: #a8adba; + --color-secondary-dark-8: #b6bac5; + --color-secondary-dark-9: #c4c7d0; + --color-secondary-dark-10: #d2d4db; + --color-secondary-dark-11: #dfe1e6; + --color-secondary-dark-12: #edeef1; + --color-secondary-dark-13: #fbfbfc; + --color-secondary-light-1: #373b46; + --color-secondary-light-2: #292c34; + --color-secondary-light-3: #1c1e23; + --color-secondary-light-4: #0e0f11; + --color-secondary-alpha-10: #454a5719; + --color-secondary-alpha-20: #454a5733; + --color-secondary-alpha-30: #454a574b; + --color-secondary-alpha-40: #454a5766; + --color-secondary-alpha-50: #454a5780; + --color-secondary-alpha-60: #454a5799; + --color-secondary-alpha-70: #454a57b3; + --color-secondary-alpha-80: #454a57cc; + --color-secondary-alpha-90: #454a57e1; + --color-secondary-button: var(--color-secondary-dark-4); + --color-secondary-hover: var(--color-secondary-dark-3); + --color-secondary-active: var(--color-secondary-dark-2); + --color-console-fg: #eeeff2; + --color-console-fg-subtle: #959cab; + --color-console-bg: #262936; + --color-console-border: #383c47; + --color-console-hover-bg: #ffffff16; + --color-console-active-bg: #454a57; + --color-console-menu-bg: #383c47; + --color-console-menu-border: #5c6374; + --color-red: #cc4848; + --color-orange: #cc580c; + --color-yellow: #cc9903; + --color-olive: #91a313; + --color-blurple: #7289DA; + --color-teal: #00918a; + --color-blue: #3a8ac6; + --color-violet: #906ae1; + --color-purple: #b259d0; + --color-pink: #d22e8b; + --color-brown: #a47252; + --color-black: #1e222e; + --color-red-light: #c23636; + --color-orange-light: #b84f0b; + --color-yellow-light: #b88a03; + --color-olive-light: #839311; + --color-blurple-light: #4E5D94; + --color-teal-light: #00837c; + --color-blue-light: #347cb3; + --color-violet-light: #7b4edb; + --color-purple-light: #a742c9; + --color-pink-light: #be297d; + --color-brown-light: #94674a; + --color-black-light: #1b1f29; + --color-red-dark-1: #c23636; + --color-orange-dark-1: #f38236; + --color-yellow-dark-1: #b88a03; + --color-olive-dark-1: #839311; + --color-blurple-dark-1: #4E5D94; + --color-teal-dark-1: #00837c; + --color-blue-dark-1: #347cb3; + --color-violet-dark-1: #7b4edb; + --color-purple-dark-1: #a742c9; + --color-pink-dark-1: #be297d; + --color-brown-dark-1: #94674a; + --color-black-dark-1: #292d38; + --color-red-dark-2: #ad3030; + --color-orange-dark-2: #f16e17; + --color-yellow-dark-2: #a37a02; + --color-olive-dark-2: #74820f; + --color-blurple-dark-2: #4E5D94; + --color-teal-dark-2: #00746e; + --color-blue-dark-2: #2e6e9f; + --color-violet-dark-2: #6733d6; + --color-purple-dark-2: #9834b9; + --color-pink-dark-2: #a9246f; + --color-brown-dark-2: #835b42; + --color-black-dark-2: #252832; + --color-grey: #505665; + --color-grey-light: #8d919b; + --color-gold: #b1983b; + --color-white: #ffffff; + --color-diff-removed-word-bg: #6f3333; + --color-diff-added-word-bg: #3c653c; + --color-diff-removed-row-bg: #3c2626; + --color-diff-moved-row-bg: #818044; + --color-diff-added-row-bg: #283e2d; + --color-diff-removed-row-border: #634343; + --color-diff-moved-row-border: #bcca6f; + --color-diff-added-row-border: #314a37; + --color-diff-inactive: #353846; + --color-error-border: #a04141; + --color-error-bg: #522; + --color-error-bg-active: #744; + --color-error-bg-hover: #633; + --color-error-text: #f9cbcb; + --color-success-border: #458a57; + --color-success-bg: #284034; + --color-success-text: #6cc664; + --color-warning-border: #bb9d00; + --color-warning-bg: #3a3a30; + --color-warning-text: #fbbd08; + --color-info-border: #306090; + --color-info-bg: #26354c; + --color-info-text: #38a8e8; + --color-red-badge: #db2828; + --color-red-badge-bg: #db28281a; + --color-red-badge-hover-bg: #db28284d; + --color-blurple-badge: #7289DA; + --color-green-badge-bg: #21ba451a; + --color-blurple-badge-hover-bg: #4E5D94; + --color-yellow-badge: #fbbd08; + --color-yellow-badge-bg: #fbbd081a; + --color-yellow-badge-hover-bg: #fbbd084d; + --color-orange-badge: #f2711c; + --color-orange-badge-bg: #f2711c1a; + --color-orange-badge-hover-bg: #f2711c4d; + --color-git: #f05133; + --color-body: #383c4a; + --color-box-header: #404652; + --color-box-body: #2a2e3a; + --color-box-body-highlight: #353945; + --color-text-dark: #dbe0ea; + --color-text: #bbc0ca; + --color-text-light: #a6aab5; + --color-text-light-1: #979ba6; + --color-text-light-2: #8a8e99; + --color-text-light-3: #707687; + --color-footer: #2e323e; + --color-timeline: #4c525e; + --color-input-text: #d5dbe6; + --color-input-background: #232933; + --color-input-toggle-background: #454a57; + --color-input-border: #454a57; + --color-input-border-hover: #505667; + --color-header-wrapper: #2a2e3a; + --color-header-wrapper-transparent: #2a2e3a00; + --color-light: #00000028; + --color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled))); + --color-light-border: #ffffff28; + --color-hover: #ffffff10; + --color-active: #ffffff16; + --color-menu: #2e323e; + --color-card: #2e323e; + --color-markup-table-row: #ffffff06; + --color-markup-code-block: #ffffff0d; + --color-button: #353846; + --color-code-bg: #2a2e3a; + --color-code-sidebar-bg: #2e323e; + --color-shadow: #00000060; + --color-secondary-bg: #2a2e3a; + --color-text-focus: #fff; + --color-expand-button: #3c404d; + --color-placeholder-text: #6a737d; + --color-editor-line-highlight: var(--color-primary-light-5); + --color-project-board-bg: var(--color-secondary-light-2); + --color-caret: var(--color-text); + --color-reaction-bg: #ffffff12; + --color-reaction-hover-bg: var(--color-primary-light-4); + --color-reaction-active-bg: var(--color-primary-alpha-40); + --color-tooltip-text: #ffffff; + --color-tooltip-bg: #000000f0; + --color-nav-bg: #232834; + --color-nav-hover-bg: #383c47; + --color-label-text: #dfe3ec; + --color-label-active-bg: #4c525e; + --color-label-hover-bg: #7c8497a0; + --color-label-active-bg: #7c8497ff; + --color-accent: var(--color-primary-light-1); + --color-small-accent: var(--color-primary-light-5); + --color-active-line: #534d1b; + accent-color: var(--color-accent); + --color-label-bg: #2A2E3A; + color-scheme: dark + } + + .emoji[aria-label="check mark"],.emoji[aria-label="currency exchange"],.emoji[aria-label="TOP arrow"],.emoji[aria-label="END arrow"],.emoji[aria-label="ON! arrow"],.emoji[aria-label="SOON arrow"],.emoji[aria-label="heavy dollar sign"],.emoji[aria-label=copyright],.emoji[aria-label=registered],.emoji[aria-label="trade mark"],.emoji[aria-label=multiply],.emoji[aria-label=plus],.emoji[aria-label=minus],.emoji[aria-label=divide],.emoji[aria-label="curly loop"],.emoji[aria-label="double curly loop"],.emoji[aria-label="wavy dash"],.emoji[aria-label="paw prints"],.emoji[aria-label="musical note"],.emoji[aria-label="musical notes"] { + filter: invert(100%) hue-rotate(180deg) + } +} diff --git a/public/css/theme-auto.css b/public/css/theme-blurple.css similarity index 98% rename from public/css/theme-auto.css rename to public/css/theme-blurple.css index 3d3b8ae..5ba6d59 100644 --- a/public/css/theme-auto.css +++ b/public/css/theme-blurple.css @@ -175,7 +175,7 @@ } .chroma .nn { - color: #ffaa10 + color: #c9d1d9 } .chroma .no { @@ -421,7 +421,7 @@ --color-orange: #cc580c; --color-yellow: #cc9903; --color-olive: #91a313; - --color-green: #7289DA; + --color-blurple: #7289DA; --color-teal: #00918a; --color-blue: #3a8ac6; --color-violet: #906ae1; @@ -433,7 +433,7 @@ --color-orange-light: #b84f0b; --color-yellow-light: #b88a03; --color-olive-light: #839311; - --color-green-light: #4E5D94; + --color-blurple-light: #4E5D94; --color-teal-light: #00837c; --color-blue-light: #347cb3; --color-violet-light: #7b4edb; @@ -445,7 +445,7 @@ --color-orange-dark-1: #f38236; --color-yellow-dark-1: #b88a03; --color-olive-dark-1: #839311; - --color-green-dark-1: #4E5D94; + --color-blurple-dark-1: #4E5D94; --color-teal-dark-1: #00837c; --color-blue-dark-1: #347cb3; --color-violet-dark-1: #7b4edb; @@ -457,7 +457,7 @@ --color-orange-dark-2: #f16e17; --color-yellow-dark-2: #a37a02; --color-olive-dark-2: #74820f; - --color-green-dark-2: #4E5D94; + --color-blurple-dark-2: #4E5D94; --color-teal-dark-2: #00746e; --color-blue-dark-2: #2e6e9f; --color-violet-dark-2: #6733d6; @@ -495,9 +495,9 @@ --color-red-badge: #db2828; --color-red-badge-bg: #db28281a; --color-red-badge-hover-bg: #db28284d; - --color-green-badge: #7289DA; + --color-blurple-badge: #7289DA; --color-green-badge-bg: #21ba451a; - --color-green-badge-hover-bg: #4E5D94; + --color-blurple-badge-hover-bg: #4E5D94; --color-yellow-badge: #fbbd08; --color-yellow-badge-bg: #fbbd081a; --color-yellow-badge-hover-bg: #fbbd084d; diff --git a/templates/app.ini b/templates/app.ini new file mode 100644 index 0000000..cb1079a --- /dev/null +++ b/templates/app.ini @@ -0,0 +1,3 @@ +[ui] +DEFAULT_THEME = blurple +THEMES = blurple,blurple-dyslexia,gitea,arc-green \ No newline at end of file