Compare commits

...

27 Commits
v2.0 ... v2.2.0

Author SHA1 Message Date
mrliptontea
2ababdc027 Release v2.2.0 2019-04-09 22:37:10 +01:00
Grzegorz Rajchman
f60eac82e3 Merge pull request #104 from mrliptontea/resolve-tooltip-positioning-issues
Resolve tooltip positioning issues
2019-04-09 22:36:07 +01:00
mrliptontea
e68f8a1aa3 Remove margin from paragraphs in tables
That's what Redmine's default theme does.
2019-04-09 22:27:47 +01:00
mrliptontea
0bb9a27140 Fix tooltip positioning on gantt chart and agile board
Resolves #101, #102
2019-04-09 22:18:05 +01:00
mrliptontea
15368c666e Version 2.1.1 2019-03-23 00:00:32 +00:00
Grzegorz Rajchman
9f1a1bf3eb Merge pull request #99 from mrliptontea/fix-sidebar-toggler-in-fixed-layout
Fix sidebar toggler in fixed layout
2019-03-22 23:58:38 +00:00
mrliptontea
97502b8372 Fix contextual dropdown padding in mobile view 2019-03-22 23:54:37 +00:00
mrliptontea
aa985c34c6 Merge branch 'v1.x' into fix-sidebar-toggler-in-fixed-layout 2019-03-22 23:48:16 +00:00
mrliptontea
c4f2ccff3f Fix sidebar toggle style with fixed layout enabled 2019-03-22 23:36:10 +00:00
Grzegorz Rajchman
0a44774774 Merge pull request #98 from mrliptontea/backport-v2-fixes-to-v1.x
Backport v2 fixes to v1.x
2019-03-22 23:27:35 +00:00
mrliptontea
ba9ef9be21 Version 1.11.0 2019-03-22 23:23:29 +00:00
mrliptontea
f1df7d1e29 Backport fixes from v2
- Fix #89: RM+ custom menu breaking the layout
- Fix #90: regression in some sidebar layouts
- Fix #93: Agile chart expanding indefinitely when Additional "Go to top" link is enabled
- Fix #94: subtasks indentation
- Fix styling of some flash messages
- Fix horizontal scrollbar appearing when sidebar is on the right
- Fix footer being mispositioned in Agile charts
- Fix positioning of admin menu icons for some plugins
- Improve support for Redmine Tags plugin
- Add separator line between news on the news list
- Improve Redmine 4.0 compatibility
- Update Font Awesome icons to 4.7.0
2019-03-22 23:22:36 +00:00
mrliptontea
a9160256cf Release v2.1.0 2019-03-22 21:23:53 +00:00
Grzegorz Rajchman
672c1b45a2 Merge pull request #97 from mrliptontea/improvements
Add a few improvements
2019-03-22 21:23:05 +00:00
mrliptontea
e3e194bb95 Add a few improvements
- Improve progress bar styling
- Improve avatar positioning
- Improve WYSIWYG button styling
- Make wiki preview font sizes consistent with presentation
2019-03-22 21:17:40 +00:00
Grzegorz Rajchman
91eb640575 Merge pull request #95 from mrliptontea/issue-94-subtasks-formatting-is-off
Improve hierarchy list indentation
2019-03-22 19:16:37 +00:00
mrliptontea
06df2c2740 Merge branch 'master' into issue-94-subtasks-formatting-is-off 2019-03-22 19:13:32 +00:00
Grzegorz Rajchman
64c6f7707d Merge pull request #96 from mrliptontea/issue-93-agile-chart-endlessly-expanding
Add a hack to stop Agile chart from expanding forever
2019-03-22 19:12:30 +00:00
mrliptontea
ccdb344082 Add a hack to stop Agile chart from expanding forever
Page layout on Agile charts is broken, and with "Go to top" link
from https://github.com/alphanodes/additionals plugin enabled
the chart expands and resize event is triggered indefinitely.

Fixes #93
2019-03-21 22:36:55 +00:00
mrliptontea
3d8aeb0e7d Improve hierarchy list indentation
Fixes #94
2019-03-21 21:01:10 +00:00
mrliptontea
b8a1dcc913 Improvements
- Add CSS grid layout support (off by default because of IE support)
- Fix styling of some flash messages
- Fix horizontal scrollbar appearing when sidebar is on the right
- Fix footer being mispositioned in Agile charts
- Improve support for [Redmine Tags](https://www.redmineup.com/pages/plugins/tags) plugin
- Fix positioning of admin menu icons for some plugins
- Add separator line between news on the news list
2019-03-21 00:09:38 +00:00
mrliptontea
5cf3d1f645 Release v2.0.2 2019-03-20 20:25:40 +00:00
Grzegorz Rajchman
8bdf41aa9a Merge pull request #92 from mrliptontea/issue-89-custom-menu-plugin-breaks-layout
Fix top menu layout with custom_menu plugin
2019-03-20 20:25:08 +00:00
mrliptontea
97b68972f7 Fix top menu layout with custom_menu plugin
Fixes #89
2019-03-19 23:59:11 +00:00
Grzegorz Rajchman
d429f35dfc Merge pull request #91 from mrliptontea/issue-90-misaligned-delete-icon-in-watchers-list
Resolve regression in sidebar layouts
2019-03-18 22:20:05 +00:00
mrliptontea
8dab6dc92b Remove reduntant abbr style 2019-03-18 22:13:37 +00:00
mrliptontea
25ba736e7d Resolve regression in sidebar layouts
Fixes #90
2019-03-17 22:40:26 +00:00
24 changed files with 455 additions and 186 deletions

View File

@@ -56,6 +56,53 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe
## Changelog ## Changelog
v2.2.0 (2019-04-09):
* Fixed #101, #102: tooltip positioning
v2.1.1 (2019-03-23):
* Fixed sidebar toggler style when fixed layout is enabled
* Fixed contextual dropdown padding in mobile view
v1.11.0 (2019-03-22):
* Backported fixes from v2:
* Fixed #89: [RM+ custom menu](http://rmplus.pro/en/redmine/plugins/custom_menu) breaking the layout
* Fixed #90: regression in some sidebar layouts
* Fixed #93: Agile chart expanding indefinitely when Additional "Go to top" link is enabled
* Fixed #94: subtasks indentation
* Fixed styling of some flash messages
* Fixed horizontal scrollbar appearing when sidebar is on the right
* Fixed footer being mispositioned in Agile charts
* Fixed positioning of admin menu icons for some plugins
* Improved support for [Redmine Tags](https://www.redmineup.com/pages/plugins/tags) plugin
* Added separator line between news on the news list
* Improved Redmine 4.0 compatibility
* Updated Font Awesome icons to 4.7.0
v2.1.0 (2019-03-22):
* Added CSS grid layout support (off by default because of IE support)
* Fixed styling of some flash messages
* Fixed horizontal scrollbar appearing when sidebar is on the right
* Fixed footer being mispositioned in Agile charts
* Improved support for [Redmine Tags](https://www.redmineup.com/pages/plugins/tags) plugin
* Fixed positioning of admin menu icons for some plugins
* Added separator line between news on the news list
* Fixed #93: Agile chart expanding indefinitely when Additional "Go to top" link is enabled
* Fixed #94: subtasks indentation
* Improved progress bar styling, avatar positioning, WYSIWYG button styling, wiki preview font sizes
v2.0.2 (2019-03-20):
* Fixed #89: [RM+ custom menu](http://rmplus.pro/en/redmine/plugins/custom_menu) breaking the layout
v2.0.1 (2019-03-17):
* Fixed #90: regression in some sidebar layouts
* Removed reduntant `abbr[title]` styles
v2.0 (2019-03-13): v2.0 (2019-03-13):
* Refreshed, modernized look & feel * Refreshed, modernized look & feel

41
package-lock.json generated
View File

@@ -784,12 +784,6 @@
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true "dev": true
}, },
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
},
"glob": { "glob": {
"version": "7.1.3", "version": "7.1.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
@@ -805,9 +799,9 @@
} }
}, },
"js-yaml": { "js-yaml": {
"version": "3.12.1", "version": "3.13.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
"integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^1.0.7",
@@ -1087,9 +1081,9 @@
} }
}, },
"esprima": { "esprima": {
"version": "2.7.3", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
}, },
"esquery": { "esquery": {
"version": "1.0.1", "version": "1.0.1",
@@ -1403,9 +1397,9 @@
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
}, },
"grunt": { "grunt": {
"version": "1.0.3", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz", "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz",
"integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==", "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==",
"requires": { "requires": {
"coffeescript": "~1.10.0", "coffeescript": "~1.10.0",
"dateformat": "~1.0.12", "dateformat": "~1.0.12",
@@ -1418,7 +1412,7 @@
"grunt-legacy-log": "~2.0.0", "grunt-legacy-log": "~2.0.0",
"grunt-legacy-util": "~1.1.1", "grunt-legacy-util": "~1.1.1",
"iconv-lite": "~0.4.13", "iconv-lite": "~0.4.13",
"js-yaml": "~3.5.2", "js-yaml": "~3.13.0",
"minimatch": "~3.0.2", "minimatch": "~3.0.2",
"mkdirp": "~0.5.1", "mkdirp": "~0.5.1",
"nopt": "~3.0.6", "nopt": "~3.0.6",
@@ -1864,12 +1858,12 @@
"dev": true "dev": true
}, },
"js-yaml": { "js-yaml": {
"version": "3.5.5", "version": "3.13.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
"integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
"requires": { "requires": {
"argparse": "^1.0.2", "argparse": "^1.0.7",
"esprima": "^2.6.0" "esprima": "^4.0.0"
} }
}, },
"jsbn": { "jsbn": {
@@ -3171,6 +3165,11 @@
"whet.extend": "~0.9.9" "whet.extend": "~0.9.9"
}, },
"dependencies": { "dependencies": {
"esprima": {
"version": "2.7.3",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
"integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
},
"js-yaml": { "js-yaml": {
"version": "3.6.1", "version": "3.6.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",

View File

@@ -7,6 +7,7 @@
// //
$fixed-layout: false !default; $fixed-layout: false !default;
$css-grid-layout: false !default;
$flexbox-layout: true !default; $flexbox-layout: true !default;
$sidebar-position: left !default; $sidebar-position: left !default;
$clean-issues: true !default; $clean-issues: true !default;
@@ -589,7 +590,7 @@ $flash-error-link: $white !default;
// //
$progress-height: 12px !default; $progress-height: 12px !default;
$progress-bg: $gray-300 !default; $progress-bg: rgba($gray-500, .5) !default;
$progress-bar-bg: $brand-primary !default; $progress-bar-bg: $brand-primary !default;
$progress-bar-success-bg: $brand-success !default; $progress-bar-success-bg: $brand-success !default;
$progress-bar-danger-bg: $brand-danger !default; $progress-bar-danger-bg: $brand-danger !default;

View File

@@ -2,8 +2,8 @@
// Admin // Admin
// -------------------------------------------------- // --------------------------------------------------
#main #admin-menu { #admin-menu {
ul { ul:nth-child(n) {
li { li {
list-style-type: none; list-style-type: none;
@@ -14,9 +14,8 @@
} }
} }
} }
}
#main #admin-index > #admin-menu { #admin-index > & {
ul { ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
@@ -32,6 +31,7 @@
background-position: 0 center; background-position: 0 center;
} }
} }
}
//== Groups //== Groups

View File

@@ -106,6 +106,10 @@ table {
td { td {
padding: $table-condensed-cell-padding $table-cell-padding; padding: $table-condensed-cell-padding $table-cell-padding;
} }
p {
margin: 0;
}
} }
ul, ul,
@@ -147,11 +151,11 @@ hr {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
border: 0; border: 0;
border-top: 1px solid $hr-border; border-top: 1px solid $hr-border;
}
abbr[title] { li & {
border-bottom: 1px dotted $abbr-border-color; margin-top: $line-height-computed / 2;
cursor: help; margin-bottom: $line-height-computed / 2;
}
} }
blockquote { blockquote {

View File

@@ -104,6 +104,7 @@ p.buttons,
color $transition-time ease-in-out; color $transition-time ease-in-out;
border: 1px solid; border: 1px solid;
border-radius: $border-radius-base; border-radius: $border-radius-base;
font-size: $font-size-base;
&.icon { &.icon {
padding-left: 20px + $btn-padding-horizontal-small; padding-left: 20px + $btn-padding-horizontal-small;

View File

@@ -1,5 +1,18 @@
#main { #main {
@if $flexbox-layout { @if $css-grid-layout {
display: grid;
grid-template-rows: auto 1fr;
@if $sidebar-position == "left" {
grid-template-areas: "sidebar content"
"footer footer";
grid-template-columns: auto 1fr;
} @else {
grid-template-areas: "content sidebar"
"footer footer";
grid-template-columns: 1fr auto;
}
} @else if $flexbox-layout {
display: flex; display: flex;
} @else { } @else {
@extend %clearfix; @extend %clearfix;
@@ -14,7 +27,9 @@
#content { #content {
padding: $padding-side; padding: $padding-side;
@if $flexbox-layout { @if $css-grid-layout {
grid-area: content;
} @else if $flexbox-layout {
$side-space: $sidebar-width + $padding-side * 2; $side-space: $sidebar-width + $padding-side * 2;
flex: 1 1 auto; flex: 1 1 auto;
width: calc(100% - #{$side-space}); width: calc(100% - #{$side-space});
@@ -28,10 +43,30 @@
// Sidebar // Sidebar
// -------------------------------------------------- // --------------------------------------------------
#main #sidebar { #sidebar {
#main & {
padding: $padding-side $sidebar-padding-horizontal; padding: $padding-side $sidebar-padding-horizontal;
}
@if $flexbox-layout { #main.nosidebar & {
margin: 0;
padding: 0;
border: 0 none;
@if $css-grid-layout {
width: 0;
} @else if $flexbox-layout {
flex: 0 0 auto;
} @else {
width: 0;
float: none;
}
}
@if $css-grid-layout {
grid-area: sidebar;
width: $sidebar-width-computed;
} @else if $flexbox-layout {
flex: 0 0 $sidebar-width-computed; flex: 0 0 $sidebar-width-computed;
@if $sidebar-position == "left" { @if $sidebar-position == "left" {
@@ -68,15 +103,16 @@
} }
ul { ul {
&:nth-child(n) {
margin: 0 0 ($line-height-computed / 2); margin: 0 0 ($line-height-computed / 2);
padding: 0; padding: 0;
@if $sidebar-position == "left" { @if $sidebar-position == "left" {
margin-right: -($sidebar-padding-horizontal); margin-right: -($sidebar-padding-horizontal);
} @else { }
margin-left: -($sidebar-padding-horizontal);
} }
&:not(.watchers) {
li { li {
margin: 0; margin: 0;
padding: 0; padding: 0;
@@ -91,6 +127,7 @@
border-left-width: 3px; border-left-width: 3px;
border-radius: $border-radius-large 0 0 $border-radius-large; border-radius: $border-radius-large 0 0 $border-radius-large;
} @else { } @else {
margin-left: -($sidebar-padding-horizontal);
border-right-width: 3px; border-right-width: 3px;
border-radius: 0 $border-radius-large $border-radius-large 0; border-radius: 0 $border-radius-large $border-radius-large 0;
} }
@@ -112,7 +149,7 @@
border-left-color: $sidebar-link-active-side; border-left-color: $sidebar-link-active-side;
box-shadow: -3px 1px 2px rgba(0, 0, 0, .1); box-shadow: -3px 1px 2px rgba(0, 0, 0, .1);
} @else { } @else {
margin-left: -1px; margin-left: -($sidebar-padding-horizontal + 1px);
border-right-color: $sidebar-link-active-side; border-right-color: $sidebar-link-active-side;
border-left-color: $body-bg; border-left-color: $body-bg;
box-shadow: 3px 1px 2px rgba(0, 0, 0, .1); box-shadow: 3px 1px 2px rgba(0, 0, 0, .1);
@@ -123,16 +160,16 @@
} }
} }
#main.nosidebar #sidebar { // Special treatment for anchor tags directly under sidebar tag
margin: 0; > a {
padding: 0; margin: $sidebar-padding-vertical $sidebar-padding-horizontal;
border: 0 none;
@if $flexbox-layout { @if $sidebar-position == "left" {
flex: 0 0 auto; margin-left: $sidebar-padding-horizontal + 3px;
} @else { } @else {
width: 0; margin-right: $sidebar-padding-horizontal + 3px;
float: none; margin-left: 0;
}
} }
} }
@@ -142,6 +179,10 @@
border-top: 1px solid $gray-400; border-top: 1px solid $gray-400;
color: $gray-600; color: $gray-600;
font-size: $font-size-small; font-size: $font-size-small;
@if $css-grid-layout {
grid-area: footer;
}
} }
@if $fixed-layout { @if $fixed-layout {

View File

@@ -201,10 +201,15 @@ a.collapsible.collapsed,
background: transparent; background: transparent;
} }
> .icon-only {
&::before {
line-height: inherit;
}
}
> .delete { > .delete {
float: right; float: right;
opacity: $icon-opacity; opacity: $icon-opacity;
vertical-align: middle;
&:hover { &:hover {
opacity: $icon-hover-opacity; opacity: $icon-hover-opacity;
@@ -212,10 +217,7 @@ a.collapsible.collapsed,
} }
img.gravatar { img.gravatar {
position: relative;
top: 1px;
margin-right: .5em; margin-right: .5em;
vertical-align: top;
} }
} }
} }
@@ -847,6 +849,8 @@ div.table-list.boards {
.news-article { .news-article {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
padding-top: $line-height-computed;
border-top: 1px solid $panel-border;
header { header {
h3 { h3 {
@@ -859,9 +863,13 @@ div.table-list.boards {
} }
} }
.author .user { .author {
color: $gray-700;
.user {
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
} }
}
//== News comments //== News comments

View File

@@ -70,6 +70,12 @@
padding-left: $padding-large-horizontal; padding-left: $padding-large-horizontal;
text-align: center; text-align: center;
&.nodata-left {
&::before {
float: left;
}
}
&::before { &::before {
margin-left: 0; margin-left: 0;
float: none; float: none;

View File

@@ -651,6 +651,7 @@ fieldset#filters {
} }
&.values { &.values {
min-width: 130px;
white-space: nowrap; white-space: nowrap;
select { select {

View File

@@ -137,17 +137,16 @@
&:hover { &:hover {
z-index: 25; z-index: 25;
.tip { span.tip {
display: block; display: block;
} }
} }
.tip { span.tip {
@include nice-shadow(3); @include nice-shadow(3);
display: none; display: none;
position: absolute; position: absolute;
top: 9px; top: 12px;
left: 24px;
width: 270px; width: 270px;
padding: $padding-base-vertical; padding: $padding-base-vertical;
border: $tooltip-border-width solid $tooltip-border; border: $tooltip-border-width solid $tooltip-border;
@@ -158,9 +157,9 @@
} }
@if $sidebar-position == "left" { @if $sidebar-position == "left" {
tr > td:last-child & { .list & {
.tip { span.tip {
right: 2px; right: 0;
left: auto; left: auto;
} }
} }

View File

@@ -3,6 +3,8 @@
// -------------------------------------------------- // --------------------------------------------------
img.gravatar { img.gravatar {
position: relative;
top: -.15em;
overflow: hidden; overflow: hidden;
border-radius: $border-radius-large; border-radius: $border-radius-large;
line-height: 1; line-height: 1;
@@ -11,8 +13,6 @@ img.gravatar {
h2 &, h2 &,
h3 &, h3 &,
h4 & { h4 & {
position: relative;
top: -1px;
margin-right: 5px; margin-right: 5px;
} }
} }
@@ -22,10 +22,7 @@ img.gravatar {
// //
.username img.gravatar { .username img.gravatar {
position: relative;
top: 1px;
margin-right: .5em; margin-right: .5em;
vertical-align: top;
} }
//== Gravatar //== Gravatar

View File

@@ -247,13 +247,6 @@ a.icon-del {
%admin-icon { %admin-icon {
@extend %fa-icon; @extend %fa-icon;
&::before {
width: 20px;
margin-left: -(5px + 20px);
color: $gray-700;
text-align: center;
}
&:hover::before { &:hover::before {
color: $gray-900; color: $gray-900;
} }
@@ -273,6 +266,16 @@ a.icon-del {
li { li {
> a { > a {
padding-left: $sidebar-padding-horizontal + 5px + 20px; padding-left: $sidebar-padding-horizontal + 5px + 20px;
&::before {
display: inline-block;
width: 20px;
margin: 0;
margin-left: -(5px + 20px);
padding: 0;
color: $gray-700;
text-align: center;
}
} }
} }
@@ -703,6 +706,7 @@ div.wiki {
.other-formats { .other-formats {
%other-format { %other-format {
@extend %fa-icon; @extend %fa-icon;
background-image: none;
&::before { &::before {
margin-right: .3em; margin-right: .3em;

View File

@@ -23,6 +23,7 @@
position: relative; position: relative;
> img.gravatar { > img.gravatar {
top: 0;
width: $issue-gravatar-size; width: $issue-gravatar-size;
height: $issue-gravatar-size; height: $issue-gravatar-size;
margin-right: 10px; margin-right: 10px;
@@ -42,6 +43,7 @@
} }
> img.gravatar { > img.gravatar {
top: 0;
width: $issue-gravatar-size; width: $issue-gravatar-size;
height: $issue-gravatar-size; height: $issue-gravatar-size;
margin-right: 10px; margin-right: 10px;
@@ -244,10 +246,16 @@
} }
div.attachments { div.attachments {
margin: -$issue-padding; margin: 0;
padding: $issue-padding; padding: 0;
border-top: 0; border-top: 0;
} }
div.description + div.attachments {
margin: $issue-padding (-$issue-padding) (-$issue-padding);
padding: $issue-padding;
border-top: 1px solid $issue-border;
}
} }
div.fileover { div.fileover {
@@ -327,6 +335,10 @@ div.thumbnails {
.issues { .issues {
margin: ($line-height-computed / 2) 0 0; margin: ($line-height-computed / 2) 0 0;
tr {
background-color: transparent;
}
tr:last-child > td { tr:last-child > td {
border-bottom: 0 none; border-bottom: 0 none;
} }
@@ -335,26 +347,17 @@ div.thumbnails {
display: none; display: none;
} }
td.subject { td.done_ratio {
padding-left: 0; width: 80px;
} }
td.buttons { td.buttons {
width: 3em;
vertical-align: middle; vertical-align: middle;
} }
} }
} }
#relations {
td.checkbox {
display: none;
}
td.buttons {
padding: 0;
}
}
#new-relation-form { #new-relation-form {
text-align: right; text-align: right;
@@ -520,6 +523,7 @@ div.thumbnails {
} }
> .gravatar { > .gravatar {
top: 0;
margin-top: $line-height-computed - $bubble-gravatar-size; margin-top: $line-height-computed - $bubble-gravatar-size;
margin-left: -($bubble-gravatar-size + $bubble-gravatar-space + $bubble-padding-horizontal + 1px); margin-left: -($bubble-gravatar-size + $bubble-gravatar-space + $bubble-padding-horizontal + 1px);
float: left; float: left;

View File

@@ -74,7 +74,7 @@
} }
} }
.jstElements { div.jstElements {
@extend %clearfix; @extend %clearfix;
line-height: normal; line-height: normal;
@@ -98,20 +98,13 @@
button { button {
margin-right: 2px; margin-right: 2px;
margin-bottom: 4px; margin-bottom: 4px;
box-shadow: none;
vertical-align: top;
}
}
.jstElements {
%jstb-icon {
@include fa-icon;
padding: 0; padding: 0;
border: 0; border: 0;
opacity: 1; opacity: 1;
background: transparent; background-color: transparent;
background-image: none; box-shadow: none;
color: $gray-800; color: $gray-800;
vertical-align: top;
&::before { &::before {
text-align: center; text-align: center;
@@ -124,6 +117,12 @@
} }
} }
%jstb-icon {
@include fa-icon;
background: transparent;
background-image: none;
}
.jstb_strong { .jstb_strong {
@extend %jstb-icon; @extend %jstb-icon;

View File

@@ -25,6 +25,7 @@ table.list {
padding: $table-cell-padding; padding: $table-cell-padding;
border: 2px solid $table-border-color; border: 2px solid $table-border-color;
border-width: $table-list-header-border; border-width: $table-list-header-border;
background-color: $body-bg;
color: $gray-700; color: $gray-700;
vertical-align: bottom; vertical-align: bottom;
@@ -161,16 +162,15 @@ tr.project {
color: $gray-600; color: $gray-600;
} }
&.idnt .name span { &.idnt td.name {
padding-left: 16px;
background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-600))); background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-600)));
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: -5px 50%;
} }
@for $i from 1 through 9 { @for $i from 1 through 9 {
&.idnt-#{$i} .name { &.idnt-#{$i} td.name {
padding-left: $table-cell-padding + 16px * ($i - 1); padding-left: $table-cell-padding + 16px * $i;
background-position: ($table-cell-padding + 16px * ($i - 1) - 3px) 50%;
} }
} }
} }
@@ -195,13 +195,6 @@ tr.issue {
} }
} }
&.idnt .subject a {
padding-left: 10px;
background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-600)));
background-repeat: no-repeat;
background-position: -5px 0;
}
.controller-issues.action-index & { .controller-issues.action-index & {
&.assigned-to-me { &.assigned-to-me {
.assigned_to, .assigned_to,
@@ -213,9 +206,15 @@ tr.issue {
} }
} }
&.idnt td.subject {
background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-600)));
background-repeat: no-repeat;
}
@for $i from 1 through 9 { @for $i from 1 through 9 {
&.idnt-#{$i} .subject { &.idnt-#{$i} td.subject {
padding-left: $table-cell-padding + 16px * ($i - 1); padding-left: $table-cell-padding + 16px * $i;
background-position: ($table-cell-padding + 16px * ($i - 1) - 3px) 50%;
} }
} }
} }

View File

@@ -158,6 +158,86 @@
} }
//
// Redmine Agile
// https://www.redmineup.com/pages/plugins/agile
// --------------------------------------------------
.controller-agile_charts #main {
@if $css-grid-layout {
> div:not(#content):not(#sidebar) {
grid-area: footer;
}
} @else if $flexbox-layout {
flex-wrap: wrap;
> #footer {
flex: 1 0 auto;
order: 3;
}
}
// Page layout on Agile charts is broken, and with "Go to top" link
// from https://github.com/alphanodes/additionals plugin enabled
// the chart expands and resize event is triggered indefinitely.
// Hiding the "Go to top" link fixes this issue.
.gototop {
display: none;
}
}
//
// Redmine Tags
// https://www.redmineup.com/pages/plugins/tags
// --------------------------------------------------
.select2 {
.filter .values & {
min-width: 180px;
margin: 0;
}
&.select2-container.select2-container--default {
.select2-selection--multiple {
line-height: $line-height-base;
.select2-selection__rendered {
padding: 0 3px 3px;
}
.select2-selection__choice {
padding-top: 0;
padding-bottom: 0;
}
.select2-search--inline {
input {
height: auto;
padding-top: 0;
padding-bottom: 0;
line-height: inherit;
}
}
}
.select2-selection {
transition: border-color $transition-time ease-in-out,
box-shadow $transition-time ease-in-out;
border-color: $input-border;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
}
&.select2-container--focus {
.select2-selection {
border-color: rgba($input-border-focus, $input-border-focus-alpha);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 0 2px rgba($input-border-focus, $input-shadow-focus-alpha);
}
}
}
}
// //
// Redmine Checklists // Redmine Checklists
// https://www.redmineup.com/pages/plugins/checklists // https://www.redmineup.com/pages/plugins/checklists
@@ -178,6 +258,65 @@
} }
//
// Redmine custom menu
// http://rmplus.pro/en/redmine/plugins/custom_menu
// --------------------------------------------------
#top-menu {
.cm-menu-header {
> li {
margin: 0;
> a,
> .title {
line-height: $input-height-base;
}
> .cm-menu-divider {
height: 18px;
margin: 5px 4px 0 5px;
border-top: 0;
border-left: 1px solid;
opacity: .3;
}
}
.drdn-trigger {
font-size: $font-size-base;
}
}
.dropdown {
.dropdown-menu > li a:hover,
.dropdown-menu > li a:focus,
.dropdown-submenu:hover a,
.dropdown-submenu:focus a {
background-color: $brand-primary;
color: $brand-text;
}
}
.rm-icon {
&::before {
font-size: $fa-font-size-base;
}
}
#quick-search {
margin: 0;
form > input {
width: $quick-search-width / 2;
min-width: $quick-search-width / 2;
}
a {
line-height: inherit;
}
}
}
// //
// Redmine CRM People // Redmine CRM People

View File

@@ -233,7 +233,7 @@
border: 0; border: 0;
.drdn-trigger { .drdn-trigger {
padding: ($btn-padding-vertical * 2) $btn-padding-horizontal; padding: $btn-padding-vertical $btn-padding-horizontal;
} }
.drdn-items { .drdn-items {

View File

@@ -64,6 +64,7 @@
@if $use-gravatars { @if $use-gravatars {
.gravatar { .gravatar {
top: 0;
margin-top: -2px; margin-top: -2px;
margin-right: $activity-avatar-space; margin-right: $activity-avatar-space;
float: left; float: left;

View File

@@ -56,19 +56,19 @@ $tabs-height: $line-height-computed + $tab-padding-vertical * 2 + 1px + 1px;
top: 0; top: 0;
right: 0; right: 0;
width: $tabs-buttons-width; width: $tabs-buttons-width;
border-bottom: 1px solid $tab-border;
background-color: $body-bg; background-color: $body-bg;
> button { > button {
width: 50%; width: 50%;
height: $tabs-height; height: $tabs-height - 1px;
margin: 0; margin: 0;
padding: 0; padding: 0;
float: left; float: left;
transition: opacity $transition-time; transition: opacity $transition-time;
border: 0 none; border: 0 none;
border-bottom: 1px solid $tab-border;
border-radius: 0; border-radius: 0;
opacity: .8; opacity: $icon-opacity;
background-color: $body-bg; background-color: $body-bg;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
@@ -76,12 +76,16 @@ $tabs-height: $line-height-computed + $tab-padding-vertical * 2 + 1px + 1px;
&:hover, &:hover,
&:active { &:active {
opacity: 1; opacity: $icon-hover-opacity;
} }
&:active { &:active {
background-color: $tab-hover-bg; background-color: $tab-hover-bg;
} }
&.disabled {
opacity: $icon-opacity / 2;
}
} }
.tab-left { .tab-left {

View File

@@ -67,14 +67,15 @@
} }
ul { ul {
@include clearfix;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
li { li {
display: inline;
margin: 0 .5em 0 0; margin: 0 .5em 0 0;
padding: 0; padding: 0;
float: left;
list-style-type: none; list-style-type: none;
white-space: nowrap; white-space: nowrap;
} }
@@ -154,10 +155,12 @@
} }
#quick-search { #quick-search {
#header & {
margin-top: floor(($header-title-line-height + $header-padding-vertical * 2 - $input-height-base) / 2) - 1px; margin-top: floor(($header-title-line-height + $header-padding-vertical * 2 - $input-height-base) / 2) - 1px;
margin-right: $header-padding-horizontal; margin-right: $header-padding-horizontal;
float: right; float: right;
color: $header-text; color: $header-text;
}
> * { > * {
vertical-align: top; vertical-align: top;
@@ -165,11 +168,11 @@
form { form {
display: inline-block; display: inline-block;
}
input { input {
width: $quick-search-width; width: $quick-search-width;
} }
}
> form > input, > form > input,
> select { > select {
@@ -411,11 +414,12 @@
.tabs-buttons { .tabs-buttons {
display: none !important; // scss-lint:disable ImportantRule display: none !important; // scss-lint:disable ImportantRule
padding-left: 0; padding-left: 0;
border-color: $main-menu-border;
background-color: $main-menu-bg; background-color: $main-menu-bg;
> button { > button {
box-sizing: border-box; box-sizing: border-box;
height: $tabs-height; height: $tabs-height - 1px;
background-color: $main-menu-bg; background-color: $main-menu-bg;
} }
} }

View File

@@ -23,10 +23,12 @@
} }
} }
.controller-wiki .wiki > .preview, .controller-wiki {
.wiki > .preview,
.wiki.wiki-preview { .wiki.wiki-preview {
font-size: $wiki-font-size; font-size: $wiki-font-size;
} }
}
div.wiki { div.wiki {
color: $wiki-text; color: $wiki-text;

View File

@@ -1,7 +1,4 @@
@if $enable-sidebar-toggler { @if $enable-sidebar-toggler {
$toggler-position-v: 1px;
$toggler-position-h: -3px;
#main { #main {
position: relative; position: relative;
} }
@@ -35,7 +32,7 @@
.sidebar-toggler { .sidebar-toggler {
display: block; display: block;
position: absolute; position: absolute;
top: $toggler-position-v; top: 1px;
width: 14px; width: 14px;
height: 16px; height: 16px;
border: 2px solid $gray-700; border: 2px solid $gray-700;
@@ -56,11 +53,23 @@
} }
@if $sidebar-position == "left" { @if $sidebar-position == "left" {
left: $toggler-position-h; left: 0;
background-image: inline-svg("chevron-left.svg", (path: (fill: $gray-700))); background-image: inline-svg("chevron-left.svg", (path: (fill: $gray-700)));
@if not $fixed-layout {
border-left: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
} @else { } @else {
right: $toggler-position-h; right: 0;
background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-700))); background-image: inline-svg("chevron-right.svg", (path: (fill: $gray-700)));
@if not $fixed-layout {
border-right: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
} }
&.sidebar-hidden { &.sidebar-hidden {

File diff suppressed because one or more lines are too long