NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-19 01:35:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev

Browse Source
This commit is contained in:
Andrew 2022-01-14 19:52:58 -05:00
commit fa3a196586
11 changed files with 266 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -117,9 +117,12 @@ win-dev-build:
--paths .venv\Lib\site-packages
--hidden-import cryptography
--hidden-import cffi
--collect-all apscheduler
--collect-all tzlocal
--collect-all tzdata
--collect-all apscheduler
--collect-all pytz
--collect-all six
artifacts:
name: "crafty-${CI_RUNNER_TAGS}-${CI_COMMIT_BRANCH}_${CI_COMMIT_SHORT_SHA}"
paths:
@ -155,9 +158,12 @@ win-prod-build:
--paths .venv\Lib\site-packages
--hidden-import cryptography
--hidden-import cffi
--collect-all apscheduler
--collect-all tzlocal
--collect-all tzdata
--collect-all apscheduler
--collect-all pytz
--collect-all six
artifacts:
name: "crafty-${CI_RUNNER_TAGS}-${CI_COMMIT_BRANCH}_${CI_COMMIT_SHORT_SHA}"
paths:

156
app/frontend/static/assets/images/logo_long.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

81
app/frontend/static/assets/images/logo_small.svg Normal file
View File

@ -0,0 +1,81 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 614 412">
<!--<rect
x="0"
y="0"
width="100%"
height="100%"
class="crafty-svg-bg"
fill="hsl(234, 24%, 17%)"
/>-->
<defs>
<mask id="mask-rect">
<rect width="100%" height="100%" fill="white"/>
<!--
307 - 200 / 2 = 207
206 - 200 / 2 = 106
-->
<rect
width="200"
height="200"
x="207"
y="106"
fill="black"
transform-origin="center"
transform="rotate(45)"
/>
<!-- <circle r="50" cx="307" cy="206" fill="black"/> -->
<circle r="55" cx="150" cy="206" fill="black"/>
</mask>
<mask id="mask-rect2">
<rect width="100%" height="100%" fill="white"/>
<!--
307 - 200 / 2 = 207
206 - 200 / 2 = 106
-->
<rect
width="200"
height="200"
x="207"
y="106"
fill="black"
transform-origin="center"
transform="rotate(45)"
/>
<!-- <circle r="50" cx="307" cy="206" fill="black"/> -->
<circle r="55" cx="464" cy="206" fill="black"/>
</mask>
</defs>
<!--
purple: hsl(266, 71%, 57%)
green: hsl(160, 59%, 45%)
blue: hsl(192, 99%, 45%)
-->
<!-- center of image: 307 206 -->
<!-- left circle offset: -157 0 -->
<!-- right circle offset: 157 0 -->
<circle r="120" cx="150" cy="206" fill="hsl(160, 59%, 45%)" mask="url(#mask-rect)" />
<circle r="120" cx="464" cy="206" fill="hsl(192, 99%, 45%)" mask="url(#mask-rect2)"/>
<!-- the purple thing in the middle -->
<g fill="hsl(266, 71%, 57%)">
<circle r="35" cx="150" cy="206"/>
<circle r="35" cx="464" cy="206"/>
<path
d="
M 307 206
m -157 -32
q 157 30 314 0
l 0 65
q -157 -30 -314 0
Z
"
/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

7
app/frontend/templates/base.html
View File

@ -27,7 +27,8 @@
<link rel="stylesheet" href="/static/assets/css/dark/style.css">
<!-- End Layout styles -->
<link rel="shortcut icon" href="/static/assets/images/favicon.png" />
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
<link rel="alternate icon" href="/static/assets/images/favicon.png" />
<link rel="stylesheet" href="/static/assets/css/crafty.css">
</head>
@ -38,9 +39,9 @@
<nav class="navbar default-layout col-lg-12 col-12 p-0 fixed-top d-flex flex-row">
<div class="text-center navbar-brand-wrapper d-flex align-items-top justify-content-center">
<a class="navbar-brand brand-logo" href="/panel/dashboard">
<img src="/static/assets/images/logo_long.jpg" alt="logo" /> </a>
<img src="/static/assets/images/logo_long.svg" alt="logo" /> </a>
<a class="navbar-brand brand-logo-mini" href="/panel/dashboard">
<img src="/static/assets/images/logo_square.jpg" alt="logo" /> </a>
<img src="/static/assets/images/logo_small.svg" alt="logo" /> </a>
</div>
<div class="navbar-menu-wrapper d-flex align-items-center">
<button class="navbar-toggler navbar-toggler align-self-center" type="button" data-toggle="minimize">

3
app/frontend/templates/blank_base.html
View File

@ -19,7 +19,8 @@
<!-- Layout styles -->
<link rel="stylesheet" href="/static/assets/css/dark/style.css">
<!-- End Layout styles -->
<link rel="shortcut icon" href="/static/assets/images/favicon.png" />
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
<link rel="alternate icon" href="/static/assets/images/favicon.png" />
</head>
<body class="dark-theme">
<div class="container-scroller">

5
app/frontend/templates/panel/denied.html
View File

@ -17,7 +17,8 @@
<!-- Layout styles -->
<link rel="stylesheet" href="/static/assets/css/dark/style.css">
<!-- End Layout styles -->
<link rel="shortcut icon" href="/static/assets/images/favicon.png" />
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
<link rel="alternate icon" href="/static/assets/images/favicon.png" />
</head>
<body class="dark-theme">
<div class="container-scroller">
@ -28,7 +29,7 @@
<div class="auto-form-wrapper">
<div class="text-center">
<img src="/static/assets/images/logo_long.jpg"><br /><br />
<img src="/static/assets/images/logo_long.svg"><br /><br />
<div class="col-sm-12 grid-margin stretch-card">
<div class="card card-statistics social-card google-card card-colored">
<div class="card-body">

5
app/frontend/templates/public/404.html
View File

@ -17,7 +17,8 @@
<!-- Layout styles -->
<link rel="stylesheet" href="/static/assets/css/dark/style.css">
<!-- End Layout styles -->
<link rel="shortcut icon" href="/static/assets/images/favicon.png" />
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
<link rel="alternate icon" href="/static/assets/images/favicon.png" />
</head>
<body class="dark-theme">
<div class="container-scroller">
@ -28,7 +29,7 @@
<div class="auto-form-wrapper">
<div class="text-center">
<img src="/static/assets/images/logo_long.jpg"><br /><br />
<img src="/static/assets/images/logo_long.svg"><br /><br />
<div class="col-sm-12 grid-margin stretch-card">
<div class="card card-statistics social-card facebook-card card-colored">
<div class="card-body">

5
app/frontend/templates/public/error.html
View File

@ -17,7 +17,8 @@
<!-- Layout styles -->
<link rel="stylesheet" href="/static/assets/css/dark/style.css">
<!-- End Layout styles -->
<link rel="shortcut icon" href="/static/assets/images/favicon.png" />
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
<link rel="alternate icon" href="/static/assets/images/favicon.png" />
</head>
<body class="dark-theme">
<div class="container-scroller">
@ -28,7 +29,7 @@
<div class="auto-form-wrapper">
<div class="text-center">
<img src="/static/assets/images/logo_long.jpg"><br /><br />
<img src="/static/assets/images/logo_long.svg"><br /><br />
<div class="col-sm-12 grid-margin stretch-card">
<div class="card card-statistics social-card google-card card-colored">
<div class="card-body">

5
app/frontend/templates/public/login.html
View File

@ -17,7 +17,8 @@
<!-- Layout styles -->
<link rel="stylesheet" href="/static/assets/css/dark/style.css">
<!-- End Layout styles -->
<link rel="shortcut icon" href="/static/assets/images/favicon.png" />
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
<link rel="alternate icon" href="/static/assets/images/favicon.png" />
</head>
<body class="dark-theme">
<div class="container-scroller">
@ -28,7 +29,7 @@
<div class="auto-form-wrapper login-modal">
<div class="text-center">
<img src="/static/assets/images/logo_long.jpg">
<img src="/static/assets/images/logo_long.svg">
</div>
<style>
.login-modal {

3
app/frontend/templates/public_base.html
View File

@ -19,7 +19,8 @@
<!-- Layout styles -->
<link rel="stylesheet" href="/static/assets/css/dark/style.css">
<!-- End Layout styles -->
<link rel="shortcut icon" href="/static/assets/images/favicon.png" />
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
<link rel="alternate icon" href="/static/assets/images/favicon.png" />
</head>
<body class="dark-theme">
<div class="container-scroller">

2
app/frontend/templates/setup/setup1.html
View File

@ -6,7 +6,7 @@
<div class="auto-form-wrapper">
<div class="text-center">
<!-- <img src="/static/assets/images/logo_long.jpg">-->
<!-- <img src="/static/assets/images/logo_long.svg">-->
{{ _('Configure Your Existing Server') }}<br /><br />
</div>
<form action="/public/login" method="post">