diff --git a/.github/dev_bug_report.md b/.github/dev_bug_report.md deleted file mode 100755 index ef93e56..0000000 --- a/.github/dev_bug_report.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -name: Dev Bug Report -about: Create a report to help us improve -title: '' -labels: stat_backlog, type_bug -assignees: '' - ---- - -# Bug Description -A clear and concise description of what the bug is. - -# How to Reproduce - -Steps to reproduce the behavior: - -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -## Minimal Code Example - -``` -// your code ... -``` - -# Expected Behavior -A clear and concise description of what you expected to happen. - -# Screenshots -If applicable, add screenshots to help explain your problem. - -# Additional Information -Add any other context about the problem here. diff --git a/.github/dev_feature_request.md b/.github/dev_feature_request.md deleted file mode 100755 index 9573c35..0000000 --- a/.github/dev_feature_request.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Dev Feature Request -about: Suggest an idea for this project -title: '' -labels: stat_backlog, type_feature -assignees: '' - ---- - -# What is the feature you request -* A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -* A clear and concise description of what you want to happen. - -# Alternatives -A clear and concise description of any alternative solutions or features you've considered. - -# Additional Information -Add any other context or screenshots about the feature request here. diff --git a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.css b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.css index 9209780..3cb3ab8 100644 --- a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.css +++ b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.css @@ -1,43 +1,43 @@ :root { - --main-background: rgb(46, 26, 90); - --main-background-highlight: rgb(158, 81, 197); - --input-border: rgba(166, 135, 232, .4); - --input-border-active: rgba(166, 135, 232, .7); - --input-color: rgb(116, 67, 161); - --input-color-active: rgb(94, 52, 133); - --input-background: rgba(255, 255, 255); - --input-background-active: rgba(255, 255, 255); - --input-icon-color: rgba(166, 135, 232, .6); - --input-icon-color-active: rgba(166, 135, 232, 1); - --button-main-background: rgba(166, 135, 232, .6); - --button-main-background-active: rgba(166, 135, 232, .8); - --button-main-color: rgba(255, 255, 255, .9); - --text-on-background-color: rgba(255, 255, 255, 0.7); - --text-on-background-color-2: rgba(255, 255, 255, 0.85); - --nav-category-background: rgb(43, 58, 101); - --nav-category-background-highlight: rgb(113, 43, 145); - --nav-category-background-hover: rgb(120, 50, 153); - --nav-sub-background: rgb(72, 39, 102); - --nav-sub-background-highlight: rgb(94, 52, 133); - --nav-sub-background-hover: rgb(116, 67, 161); - --nav-header-background: rgb(72, 39, 102); - --nav-header-background-highlight: rgb(94, 52, 133); - --nav-header-background-hover: rgb(116, 67, 161); + --main-bg: rgb(46, 26, 90); + --main-bg-hl: rgb(158, 81, 197); + --iborder: rgba(166, 135, 232, .4); + --iborder-active: rgba(166, 135, 232, .7); + --ipt-c: rgb(116, 67, 161); + --ipt-c-active: rgb(94, 52, 133); + --ipt-bg: rgba(255, 255, 255); + --ipt-bg-active: rgba(255, 255, 255); + --ipt-ico-c: rgba(166, 135, 232, .6); + --ipt-ico-c-active: rgba(166, 135, 232, 1); + --btn-main-bg: rgba(166, 135, 232, .6); + --btn-main-bg-active: rgba(166, 135, 232, .8); + --btn-main-c: rgba(255, 255, 255, .9); + --txt-on-bg-c: rgba(255, 255, 255, 0.7); + --txt-on-bg-c-2: rgba(255, 255, 255, 0.85); + --nav-cat-bg: rgb(43, 58, 101); + --nav-cat-bg-hl: rgb(113, 43, 145); + --nav-cat-bg-hover: rgb(120, 50, 153); + --nav-sub-bg: rgb(72, 39, 102); + --nav-sub-bg-hl: rgb(94, 52, 133); + --nav-sub-bg-hover: rgb(116, 67, 161); + --nav-head-bg: rgb(72, 39, 102); + --nav-head-bg-hl: rgb(94, 52, 133); + --nav-head-bg-hover: rgb(116, 67, 161); --nav-content-hover: rgb(177, 97, 218); - --font-family: 'Arial', Helvetica, sans-serif; - --button-colored-background: rgb(158, 81, 197); - --button-colored-background-hover: rgb(177, 97, 218); - --table-caption-background: rgb(255, 255, 255); - --table-head-background: rgb(236, 232, 255); - --table-row-background: rgb(255, 255, 255); - --table-row-background-alt: rgb(255, 255, 255); - --table-row-background-hover: rgb(220, 211, 255); - --link-color: rgb(72, 39, 102); - --link-hover: rgb(158, 81, 197); + --ff: 'Arial', Helvetica, sans-serif; + --btn-c-bg: rgb(158, 81, 197); + --btn-c-bg-hover: rgb(177, 97, 218); + --tcaption-bg: rgb(255, 255, 255); + --thead-bg: rgb(236, 232, 255); + --trow-bg: rgb(255, 255, 255); + --trow-bg-alt: rgb(255, 255, 255); + --trow-bg-hover: rgb(220, 211, 255); + --link-c: rgb(72, 39, 102); + --lhover: rgb(158, 81, 197); --badge-size: .55rem; - --badge-color: rgb(255, 255, 255); - --badge-background: rgb(158, 81, 197); - --box-border: rgb(218, 218, 218); } + --badge-c: rgb(255, 255, 255); + --badge-bg: rgb(158, 81, 197); + --bborder: rgb(218, 218, 218); } html, body { width: 100%; @@ -45,7 +45,7 @@ min-width: 100%; max-width: 100%; overflow: hidden; - font-family: var(--font-family); + font-family: var(--ff); color: #000; } body { @@ -53,7 +53,7 @@ header { background: #f8f8f8; - border-bottom: 1px solid var(--box-border); + border-bottom: 1px solid var(--bborder); padding: 1rem; box-sizing: border-box; display: flex; @@ -70,7 +70,7 @@ header { header input[type=text] { width: 100%; background: white; - border: 1px solid var(--input-border); + border: 1px solid var(--iborder); text-shadow: none; box-shadow: none; transition: border 500ms ease-out; @@ -96,7 +96,7 @@ header { font-size: 1.5rem; } nav .ham-trigger { - color: var(--text-on-background-color-2); + color: var(--txt-on-bg-c-2); margin: 0 0 0 5px; display: none; } @@ -120,7 +120,7 @@ header { #t-nav li { display: inline; } #t-nav li:hover { - color: var(--link-hover); } + color: var(--lhover); } main { display: flex; @@ -145,7 +145,7 @@ header { align-items: center; padding: 0 1rem 0 1rem; height: 60px; - border-bottom: 1px solid var(--input-border); + border-bottom: 1px solid var(--iborder); box-sizing: border-box; } #u-box img { width: 40px; diff --git a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.scss b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.scss index 7252f9d..71234a9 100644 --- a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.scss +++ b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording-small.scss @@ -6,7 +6,7 @@ html, body { min-width: 100%; max-width: 100%; overflow: hidden; - font-family: var(--font-family); + font-family: var(--ff); color: #000; } @@ -17,7 +17,7 @@ body { header { background: rgb(248, 248, 248); - border-bottom: 1px solid var(--box-border); + border-bottom: 1px solid var(--bborder); padding: 1rem; box-sizing: border-box; display: flex; @@ -39,7 +39,7 @@ header { input[type=text] { width: 100%; background: rgba(255, 255, 255, 1); - border: 1px solid var(--input-border); + border: 1px solid var(--iborder); text-shadow: none; box-shadow: none; transition : border 500ms ease-out; @@ -88,7 +88,7 @@ header { display: inline; &:hover { - color: var(--link-hover); + color: var(--lhover); } } } @@ -119,7 +119,7 @@ main { align-items: center; padding: 0 1rem 0 1rem; height: 60px; - border-bottom: 1px solid var(--input-border); + border-bottom: 1px solid var(--iborder); box-sizing: border-box; img { diff --git a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.css b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.css index 4cfe4bc..8e69fe6 100644 --- a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.css +++ b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.css @@ -1,24 +1,24 @@ :root { - --main-background: rgb(46, 26, 90); - --main-background-highlight: rgb(158, 81, 197); - --input-border: rgba(166, 135, 232, .4); - --input-border-active: rgba(166, 135, 232, .7); - --input-color: rgba(166, 135, 232, .6); - --input-color-active: rgba(166, 135, 232, .8); - --input-icon-color: rgba(166, 135, 232, .6); - --input-icon-color-active: rgba(166, 135, 232, 1); - --button-main-background: rgba(166, 135, 232, .6); - --button-main-background-active: rgba(166, 135, 232, .8); - --button-main-color: rgba(255, 255, 255, .9); - --text-on-background-color: rgba(255, 255, 255, 0.7); - --nav-category-background: rgb(43, 58, 101); - --nav-category-background-highlight: rgb(113, 43, 145); - --nav-category-background-hover: rgb(120, 50, 153); - --nav-sub-background: rgb(72, 39, 102); - --nav-sub-background-highlight: rgb(94, 52, 133); - --nav-sub-background-hover: rgb(116, 67, 161); - --nav-header-background: rgb(72, 39, 102); - --nav-header-background-highlight: rgb(94, 52, 133); - --nav-header-background-hover: rgb(116, 67, 161); - --font-family: 'Arial', Helvetica, sans-serif; - --box-border-color: rgb(202, 202, 202); } + --main-bg: rgb(46, 26, 90); + --main-bg-hl: rgb(158, 81, 197); + --iborder: rgba(166, 135, 232, .4); + --iborder-active: rgba(166, 135, 232, .7); + --ipt-c: rgba(166, 135, 232, .6); + --ipt-c-active: rgba(166, 135, 232, .8); + --ipt-ico-c: rgba(166, 135, 232, .6); + --ipt-ico-c-active: rgba(166, 135, 232, 1); + --btn-main-bg: rgba(166, 135, 232, .6); + --btn-main-bg-active: rgba(166, 135, 232, .8); + --btn-main-c: rgba(255, 255, 255, .9); + --txt-on-bg-c: rgba(255, 255, 255, 0.7); + --nav-cat-bg: rgb(43, 58, 101); + --nav-cat-bg-hl: rgb(113, 43, 145); + --nav-cat-bg-hover: rgb(120, 50, 153); + --nav-sub-bg: rgb(72, 39, 102); + --nav-sub-bg-hl: rgb(94, 52, 133); + --nav-sub-bg-hover: rgb(116, 67, 161); + --nav-head-bg: rgb(72, 39, 102); + --nav-head-bg-hl: rgb(94, 52, 133); + --nav-head-bg-hover: rgb(116, 67, 161); + --ff: 'Arial', Helvetica, sans-serif; + --bborder-color: rgb(202, 202, 202); } diff --git a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.scss b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.scss index bd06c47..8451c9e 100644 --- a/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.scss +++ b/Admin/Install/Application/Timerecording/Themes/Akebi/css/timerecording_vars.scss @@ -1,55 +1,55 @@ :root { - --main-background: rgb(46, 26, 90); - --main-background-highlight: rgb(158, 81, 197); + --main-bg: rgb(46, 26, 90); + --main-bg-hl: rgb(158, 81, 197); - --input-border: rgba(166, 135, 232, .4); - --input-border-active: rgba(166, 135, 232, .7); - --input-color: rgb(116, 67, 161); - --input-color-active: rgb(94, 52, 133); - --input-background: rgba(255, 255, 255); - --input-background-active: rgba(255, 255, 255); + --iborder: rgba(166, 135, 232, .4); + --iborder-active: rgba(166, 135, 232, .7); + --ipt-c: rgb(116, 67, 161); + --ipt-c-active: rgb(94, 52, 133); + --ipt-bg: rgba(255, 255, 255); + --ipt-bg-active: rgba(255, 255, 255); - --input-icon-color: rgba(166, 135, 232, .6); - --input-icon-color-active: rgba(166, 135, 232, 1); + --ipt-ico-c: rgba(166, 135, 232, .6); + --ipt-ico-c-active: rgba(166, 135, 232, 1); - --button-main-background: rgba(166, 135, 232, .6); - --button-main-background-active: rgba(166, 135, 232, .8); - --button-main-color: rgba(255, 255, 255, .9); + --btn-main-bg: rgba(166, 135, 232, .6); + --btn-main-bg-active: rgba(166, 135, 232, .8); + --btn-main-c: rgba(255, 255, 255, .9); - --text-on-background-color: rgba(255, 255, 255, 0.7); - --text-on-background-color-2: rgba(255, 255, 255, 0.85); + --txt-on-bg-c: rgba(255, 255, 255, 0.7); + --txt-on-bg-c-2: rgba(255, 255, 255, 0.85); - --nav-category-background: rgb(43, 58, 101); - --nav-category-background-highlight: rgb(113, 43, 145); - --nav-category-background-hover: rgb(120, 50, 153); + --nav-cat-bg: rgb(43, 58, 101); + --nav-cat-bg-hl: rgb(113, 43, 145); + --nav-cat-bg-hover: rgb(120, 50, 153); - --nav-sub-background: rgb(72, 39, 102); - --nav-sub-background-highlight: rgb(94, 52, 133); - --nav-sub-background-hover: rgb(116, 67, 161); + --nav-sub-bg: rgb(72, 39, 102); + --nav-sub-bg-hl: rgb(94, 52, 133); + --nav-sub-bg-hover: rgb(116, 67, 161); - --nav-header-background: rgb(72, 39, 102); - --nav-header-background-highlight: rgb(94, 52, 133); - --nav-header-background-hover: rgb(116, 67, 161); + --nav-head-bg: rgb(72, 39, 102); + --nav-head-bg-hl: rgb(94, 52, 133); + --nav-head-bg-hover: rgb(116, 67, 161); --nav-content-hover: rgb(177, 97, 218); - --font-family: 'Arial', Helvetica, sans-serif; + --ff: 'Arial', Helvetica, sans-serif; - --button-colored-background: rgb(158, 81, 197); - --button-colored-background-hover: rgb(177, 97, 218); + --btn-c-bg: rgb(158, 81, 197); + --btn-c-bg-hover: rgb(177, 97, 218); - --table-caption-background: rgb(255, 255, 255); - --table-head-background: rgb(236, 232, 255); - --table-row-background: rgb(255, 255, 255); - --table-row-background-alt: rgb(255, 255, 255); - --table-row-background-hover: rgb(220, 211, 255); + --tcaption-bg: rgb(255, 255, 255); + --thead-bg: rgb(236, 232, 255); + --trow-bg: rgb(255, 255, 255); + --trow-bg-alt: rgb(255, 255, 255); + --trow-bg-hover: rgb(220, 211, 255); - --link-color: rgb(72, 39, 102); - --link-hover: rgb(158, 81, 197); + --link-c: rgb(72, 39, 102); + --lhover: rgb(158, 81, 197); --badge-size: .55rem; - --badge-color: rgb(255, 255, 255); - --badge-background: rgb(158, 81, 197); + --badge-c: rgb(255, 255, 255); + --badge-bg: rgb(158, 81, 197); - --box-border: rgb(218, 218, 218); + --bborder: rgb(218, 218, 218); } diff --git a/Admin/Install/Application/Timerecording/login.tpl.php b/Admin/Install/Application/Timerecording/login.tpl.php index 71baff3..bc2f88c 100644 --- a/Admin/Install/Application/Timerecording/login.tpl.php +++ b/Admin/Install/Application/Timerecording/login.tpl.php @@ -44,29 +44,29 @@ $head = $this->head; renderAssets(); ?> @@ -237,25 +237,25 @@ $head = $this->head;
-