Compare commits

...

7 Commits

Author SHA1 Message Date
mrliptontea
3fd21ebb9c release v1.5.0 2015-04-15 12:25:54 +02:00
mrliptontea
5975ab9b5d update changelog 2015-04-15 12:16:53 +02:00
mrliptontea
13b11dcbca Merge branch 'issue-5' 2015-04-15 12:10:20 +02:00
mrliptontea
8a44905739 add default padding for tables, fixes #6 2015-04-15 12:09:51 +02:00
mrliptontea
2f4b08ba19 update instructions on customizing PurpleMine
update .gitignore file to file structure introduced in 581ea78
2015-04-15 12:05:43 +02:00
mrliptontea
d220db112a Add default color and styles for colored trackers links, fixes #5
- introduce $tracker-default-bg and $tracker-default-text variables
- move default colors to map
- introduce $tracker-custom-colors-map to make adding new colors and
  overriding default ones easy
- remove styles for issue links from mixin to avoid repetition
- update styles for backlogs plugin
2015-04-15 11:28:43 +02:00
mrliptontea
fbae203298 more appreciable strike through line on closed tasks 2015-04-14 11:46:45 +02:00
9 changed files with 166 additions and 67 deletions

2
.gitignore vendored
View File

@@ -1,4 +1,4 @@
/.sass-cache
/node_modules
/sass/_custom-variables.scss
/src/sass/_custom-variables.scss
/.sublime-grunt.cache

View File

@@ -48,10 +48,25 @@ Now all the dependencies should be ready to use. Run one more command:
And now the grunt is watching for changes in files placed in `src/` folder. Just change what you need, and it'll run SASS preprocessor automatically.
Regrettably, optional file include is not possible in SASS, so I would recommend creating a new file, e.g. `_my_variables.scss` and importing it a the beginning of the `application.scss` file. That way all the variables with the `!default` flag could be overridden.
Regrettably, optional file include is not possible in SASS, so I would recommend creating a new file, e.g. `src/sass/_custom-variables.scss` and importing it a the beginning of the `application.scss` file. That way all the variables with the `!default` flag could be overridden.
The path `src/sass/_custom-variables.scss` is added to `.gitignore` so it should make upgrading PurpleMine with keeping your changes rather painless, given that the only thing you changed in PurpleMine's source was adding this one line with `@import "custom-variables";`.
If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remember to include your `_custom-variables.scss` in `src/sass/plugins/redmine_backlogs/_common.scss`.
## Changelog
v1.5.0 (2015-04-15):
* Fixed #5: Added default style for colored issue links.
* Introduced `$tracker-colors-map` and removed `$tracker-X-bg` variables.
See d220db1 comments for more details.
* Fixed #6: Added default padding for table cells.
v1.4.1 (2015-04-14):
* Fixed #3: Closed tasks will be more appreciable.
v1.4.0 (2015-04-10):
+ Introduced option `$wiki-page-more-vertical-space` (by default `true`) to improve wiki pages' readability even more

File diff suppressed because one or more lines are too long

View File

@@ -181,26 +181,41 @@ $priority-highest-link: #a03 !default;
$tracker-inline-padding: 1px 5px !default;
$tracker-list-padding: 0 6px !default;
$tracker-1-bg: $brand-danger !default;
$tracker-1-text: $brand-text !default;
$tracker-default-bg: #668 !default;
$tracker-default-text: $brand-text !default;
$tracker-2-bg: $brand-info !default;
$tracker-2-text: $brand-text !default;
$tracker-3-bg: $brand-success !default;
$tracker-3-text: $brand-text !default;
$tracker-4-bg: $brand-primary !default;
$tracker-4-text: $brand-text !default;
$tracker-5-bg: $brand-warning !default;
$tracker-5-text: $brand-text !default;
$tracker-6-bg: mix($brand-success, $brand-info, 50%) !default;
$tracker-6-text: $brand-text !default;
$tracker-7-bg: mix($brand-primary, $brand-warning, 50%) !default;
$tracker-7-text: $brand-text !default;
$tracker-default-colors-map: (
1: (
background: $brand-danger,
color: $brand-text
),
2: (
background: $brand-info,
color: $brand-text
),
3: (
background: $brand-success,
color: $brand-text
),
4: (
background: $brand-primary,
color: $brand-text
),
5: (
background: $brand-warning,
color: $brand-text
),
6: (
background: mix($brand-success, $brand-info, 50%),
color: $brand-text
),
7: (
background: mix($brand-primary, $brand-warning, 50%),
color: $brand-text
)
) !default;
$tracker-custom-colors-map: () !default;
$tracker-colors-map: map-merge($tracker-default-colors-map, $tracker-custom-colors-map);
//== Diffs

View File

@@ -80,6 +80,13 @@ small {
font-size: $font-size-small;
}
table {
th,
td {
padding: $table-condensed-cell-padding $table-cell-padding;
}
}
ul,
ol {
margin-top: 0;

View File

@@ -280,13 +280,82 @@ tr.entry {
}
@if $color-trackers {
@include tracker(".tracker-1", $tracker-1-bg, $tracker-1-text);
@include tracker(".tracker-2", $tracker-2-bg, $tracker-2-text);
@include tracker(".tracker-3", $tracker-3-bg, $tracker-3-text);
@include tracker(".tracker-4", $tracker-4-bg, $tracker-4-text);
@include tracker(".tracker-5", $tracker-5-bg, $tracker-5-text);
@include tracker(".tracker-6", $tracker-6-bg, $tracker-6-text);
@include tracker(".tracker-7", $tracker-7-bg, $tracker-7-text);
tr.issue .id > a,
a.issue,
.relations > span > a.issue,
.parent > a.issue {
border-radius: $border-radius-small ($border-radius-small * 3) ($border-radius-small * 3) $border-radius-small;
background-color: $tracker-default-bg;
color: $tracker-default-text;
&:hover {
background-color: darken($tracker-default-bg, 10%);
color: $tracker-default-text;
text-decoration: none;
}
&:focus,
&:active {
text-decoration: none;
}
}
a.issue {
margin-right: 1px;
padding: $tracker-inline-padding;
font-weight: normal;
&.closed {
position: relative;
color: mix($tracker-default-text, $tracker-default-bg, 75%);
text-decoration: none;
&:after {
display: block;
position: absolute;
right: 5px;
bottom: 0;
left: 5px;
height: calc(50% - 2px/2);
border-top: 2px solid rgba($tracker-default-text, .95);
content: "";
@include rotate(-4deg);
@include transition(border-color .1s);
}
&:hover:after {
border-top-color: rgba($tracker-default-text, .25);
}
}
}
tr.issue .id > a {
display: block;
padding: $tracker-list-padding;
&:before {
color: mix($tracker-default-text, $tracker-default-bg, 50%);
content: "#";
}
}
@if $colored-issue {
.issue.details a.issue,
.issue.details .wiki a.issue {
&,
&:hover {
color: $tracker-default-text;
}
}
}
@each $tracker-id, $tracker-colors in $tracker-colors-map {
@include tracker(
".tracker-#{$tracker-id}",
map-get($tracker-colors, background),
map-get($tracker-colors, color)
);
}
}
.odd {

View File

@@ -111,7 +111,6 @@
a#{$parent},
.relations > span > a#{$parent},
.parent > a#{$parent} {
border-radius: $border-radius-small ($border-radius-small * 3) ($border-radius-small * 3) $border-radius-small;
background-color: $background;
color: $color;
@@ -122,44 +121,26 @@
background-color: darken($background, 10%);
}
color: $color;
text-decoration: none;
}
&:focus,
&:active {
text-decoration: none;
}
}
a#{$parent} {
margin-right: 1px;
padding: $tracker-inline-padding;
font-weight: normal;
&.closed {
position: relative;
color: mix($color, $background, 75%);
text-decoration: none;
&:after {
display: block;
position: absolute;
top: 50%;
right: 5px;
left: 5px;
border-top: 1px solid rgba($color, .35);
content: "";
border-top-color: rgba($color, .95);
}
&:hover:after {
border-top-color: rgba($color, .25);
}
}
}
tr#{$parent} .id > a {
display: block;
padding: $tracker-list-padding;
&:before {
color: mix($color, $background, 50%);
content: "#";
}
}

View File

@@ -32,7 +32,6 @@ $story-sp-input-width: 50px;
} @else {
background-color: darken($background, 10%);
}
text-decoration: none;
}
}
}
@@ -491,20 +490,33 @@ $story-sp-input-width: 50px;
display: block;
padding: $tracker-list-padding;
border-radius: $border-radius-small ($border-radius-small * 3) ($border-radius-small * 3) $border-radius-small;
background-color: darken($gray-lightest, 3%);
color: $gray-dark;
@if $color-trackers {
background-color: $tracker-default-bg;
color: $tracker-default-text;
} @else {
background-color: darken($gray-lightest, 3%);
color: $gray-dark;
}
font-weight: bold;
text-align: right;
&:before {
margin-left: -1em;
color: $gray-light;
@if $color-trackers {
color: mix($tracker-default-text, $tracker-default-bg, 50%);
} @else {
color: $gray-light;
}
font-weight: normal;
content: "#";
}
&:hover {
background-color: $gray-lighter;
@if $color-trackers {
background-color: darken($tracker-default-bg, 10%);
} @else {
background-color: $gray-lighter;
}
text-decoration: none;
}
}
@@ -684,13 +696,13 @@ $story-sp-input-width: 50px;
}
@if $color-trackers {
@include rb-tracker('.tracker1', $tracker-1-bg, $tracker-1-text);
@include rb-tracker('.tracker2', $tracker-2-bg, $tracker-2-text);
@include rb-tracker('.tracker3', $tracker-3-bg, $tracker-3-text);
@include rb-tracker('.tracker4', $tracker-4-bg, $tracker-4-text);
@include rb-tracker('.tracker5', $tracker-5-bg, $tracker-5-text);
@include rb-tracker('.tracker6', $tracker-6-bg, $tracker-6-text);
@include rb-tracker('.tracker7', $tracker-7-bg, $tracker-7-text);
@each $tracker-id, $tracker-colors in $tracker-colors-map {
@include rb-tracker(
".tracker#{$tracker-id}",
map-get($tracker-colors, background),
map-get($tracker-colors, color)
);
}
}
}

File diff suppressed because one or more lines are too long