purpleraft/PurpleMine2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'issue-5'

Browse Source
This commit is contained in:
mrliptontea
2015-04-15 12:10:20 +02:00
parent 8a44905739 d220db112a
commit 13b11dcbca
6 changed files with 137 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/redmine_backlogs/master_backlog.css
View File

File diff suppressed because one or more lines are too long

53
src/sass/_variables.scss
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

83
src/sass/components/_list.scss
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 {

28
src/sass/mixins/_issues.scss
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,36 +121,15 @@
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;
right: 5px;
bottom: 0;
left: 5px;
height: calc(50% - 2px/2);
border-top: 2px solid rgba($color, .95);
content: "";
@include rotate(-4deg);
@include transition(border-color .1s);
border-top-color: rgba($color, .95);
}
&:hover:after {
@@ -161,12 +139,8 @@
}
tr#{$parent} .id > a {
display: block;
padding: $tracker-list-padding;
&:before {
color: mix($color, $background, 50%);
content: "#";
}
}

36
src/sass/plugins/redmine_backlogs/master_backlog.scss
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)
);
}
}
}

2
stylesheets/application.css
View File

File diff suppressed because one or more lines are too long