Skip to content

Commit

Permalink
added rule to hide overlapping line (#13)
Browse files Browse the repository at this point in the history
* fixed colored dot rule
* bump version
* added new rule to highlight active record
  • Loading branch information
kevinpapst committed May 3, 2020
1 parent 6d08df4 commit 81ee69f
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 4 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## 1.3

- Added rule to hide the red-lines between overlapping timesheet records
- Added rule to highlight active timesheet records
- Fixed "remove colored dot" rule for Kimai 1.9 HTML changes

Best compatibility with with Kimai 1.9

## 1.2

- Added rule for switching save & close/reset buttons order

Best compatibility with with Kimai 1.9

## 1.1

- Improved permission handling
Expand Down
2 changes: 1 addition & 1 deletion Resources/ruleset/general/remove-color-dots.css
Original file line number Diff line number Diff line change
@@ -1 +1 @@
span.dot {display:none !important;}
i.dot, span.dot {display:none !important;}
4 changes: 4 additions & 0 deletions Resources/ruleset/timesheet/hide-overlapping-records.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* this rule removes the red dotted lines between timesheet entries, which indicates overlapping records */
table.dataTable tr.overlapping {
border-top: none;
}
4 changes: 4 additions & 0 deletions Resources/ruleset/timesheet/highlight-active-records.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* highlight active timesheet records */
tr.recording {
background-color: #ffa059 !important;
}
2 changes: 1 addition & 1 deletion Resources/views/index.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
var footer = "/* END " + humanRuleName + " */";
var ruleRegexp = new RegExp(header.replace(/[*[\]]/g, '\\$&') + '[^]*?' + footer.replace(/[*[\]]/g, '\\$&'))
var customCss = $('#custom_css_customCss').val();
var newCss = header + "\n" + cssRules[ruleName] + "\n" + footer;
var newCss = header + "\n" + cssRules[ruleName].trim() + "\n" + footer;
if (ruleRegexp.test(customCss) && confirm(humanRuleName + " is already in your Custom CSS replace it? If not it will be appended.")) {
customCss = customCss.replace(ruleRegexp, newCss);
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A Kimai 2 plugin, which allows to edit custom CSS rules through an administration screen.",
"homepage": "https://www.kimai.org/store/keleo-css-custom-bundle.html",
"type": "kimai-plugin",
"version": "1.1",
"version": "1.3",
"require": {
"kimai/kimai2-composer": "*"
},
Expand All @@ -22,7 +22,7 @@
"extra": {
"kimai": {
"require": "1.4",
"version": "1.1",
"version": "1.3",
"name": "CustomCSSBundle"
}
}
Expand Down

0 comments on commit 81ee69f

Please sign in to comment.