Compare commits

...

3 Commits

Author SHA1 Message Date
mrliptontea
ea28de2898 Update styles for Redmine 4.2.1 2021-05-23 16:01:12 +01:00
Grzegorz Rajchman
95cb578d8f Merge pull request #226 from mrliptontea/update-versions
Update package versions
2021-05-23 15:59:02 +01:00
mrliptontea
41143cf15f Update package versions 2021-05-22 16:23:58 +01:00
32 changed files with 1991 additions and 2480 deletions

View File

@@ -1,3 +1,7 @@
Latest (master):
* Update styles for Redmine 4.2
v2.14.0 (2021-01-27): v2.14.0 (2021-01-27):
* Merged #220: fixed drag & drop behavior. * Merged #220: fixed drag & drop behavior.

File diff suppressed because one or more lines are too long

4015
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -27,25 +27,25 @@
"dependencies": { "dependencies": {
"@liquid-js/sass-inline-svg": "^2.0.0", "@liquid-js/sass-inline-svg": "^2.0.0",
"autoprefixer": "^9.8.6", "autoprefixer": "^9.8.6",
"grunt": "^1.3.0", "grunt": "^1.4.0",
"grunt-contrib-uglify": "^5.0.0", "grunt-contrib-uglify": "^5.0.1",
"grunt-contrib-watch": "^1.1.0", "grunt-contrib-watch": "^1.1.0",
"grunt-postcss": "^0.9.0", "grunt-postcss": "^0.9.0",
"grunt-sass": "^3.1.0", "grunt-sass": "^3.1.0",
"sass": "^1.26.11" "sass": "^1.34.0"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^7.9.0", "eslint": "^7.27.0",
"eslint-config-standard": "^14.1.1", "eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0", "eslint-plugin-import": "^2.23.3",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1", "eslint-plugin-promise": "^4.3.1",
"eslint-plugin-standard": "^4.0.1", "eslint-plugin-standard": "^4.1.0",
"husky": "^4.3.0", "husky": "^4.3.8",
"lint-staged": "^10.4.0", "lint-staged": "^10.5.4",
"stylelint": "^13.7.2", "stylelint": "^13.13.1",
"stylelint-order": "^4.1.0", "stylelint-order": "^4.1.0",
"stylelint-scss": "^3.18.0" "stylelint-scss": "^3.19.0"
}, },
"browserslist": [ "browserslist": [
"last 2 versions", "last 2 versions",

View File

@@ -1,3 +1,5 @@
@use "sass:math";
// //
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
@@ -60,7 +62,7 @@ $shade-map: (
@function shade($color, $shade: 500) { @function shade($color, $shade: 500) {
$mixer: if($shade < 500, $white, $black); $mixer: if($shade < 500, $white, $black);
$saturation: if($shade < 500, 0, ($shade - 500) / 20); $saturation: if($shade < 500, 0, math.div($shade - 500, 20));
@return saturate(mix($mixer, $color, map-get($shade-map, $shade)), $saturation); @return saturate(mix($mixer, $color, map-get($shade-map, $shade)), $saturation);
} }
@@ -575,7 +577,7 @@ $logo-image-width: 60px !default;
$logo-image-height: 40px !default; $logo-image-height: 40px !default;
$logo-position-horizontal: $header-padding-vertical !default; $logo-position-horizontal: $header-padding-vertical !default;
$logo-position-vertical: center !default; $logo-position-vertical: center !default;
$logo-space: floor($header-padding-vertical / 2) !default; $logo-space: floor($header-padding-vertical * .5) !default;
$main-menu-bg: $gray-100 !default; $main-menu-bg: $gray-100 !default;
$main-menu-bg-hover: $gray-100 !default; $main-menu-bg-hover: $gray-100 !default;

View File

@@ -52,3 +52,8 @@ tr.group .count,
border-color: $green; border-color: $green;
color: $green; color: $green;
} }
.badge-issues-count {
border-color: $gray-400;
background-color: $gray-100;
}

View File

@@ -90,7 +90,7 @@ h4 {
} }
p { p {
margin: 0 0 ($line-height-computed / 2); margin: 0 0 ($line-height-computed * .5);
} }
small { small {
@@ -113,7 +113,7 @@ table {
form { form {
p { p {
margin-bottom: ($line-height-computed / 2); margin-bottom: ($line-height-computed * .5);
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
@@ -125,7 +125,7 @@ table {
ul, ul,
ol { ol {
margin-top: 0; margin-top: 0;
margin-bottom: ($line-height-computed / 2); margin-bottom: ($line-height-computed * .5);
padding-left: 1.5em; padding-left: 1.5em;
ul, ul,
@@ -164,14 +164,14 @@ hr {
border-top: 1px solid $hr-border; border-top: 1px solid $hr-border;
li & { li & {
margin-top: $line-height-computed / 2; margin-top: $line-height-computed * .5;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
} }
blockquote { blockquote {
margin: 0 0 $line-height-computed; margin: 0 0 $line-height-computed;
padding: floor($line-height-computed / 4) $padding-large-horizontal; padding: floor($line-height-computed * .25) $padding-large-horizontal;
border-left: 4px solid $blockquote-border-color; border-left: 4px solid $blockquote-border-color;
> :first-child { > :first-child {

View File

@@ -63,7 +63,7 @@ form {
// //
form[action*="repository/diff"] { form[action*="repository/diff"] {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
@@ -151,7 +151,7 @@ p.buttons,
.edit_time_entry, .edit_time_entry,
.edit_membership { .edit_membership {
input[type="submit"] + a { input[type="submit"] + a {
margin-left: ceil($btn-padding-horizontal-small / 2); margin-left: ceil($btn-padding-horizontal-small * .5);
} }
} }
@@ -164,7 +164,7 @@ form {
button, button,
select { select {
~ a { ~ a {
margin-left: ceil($btn-padding-horizontal-small / 2); margin-left: ceil($btn-padding-horizontal-small * .5);
line-height: $input-height-base; line-height: $input-height-base;
} }
} }
@@ -176,6 +176,10 @@ form {
p.buttons { p.buttons {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
a {
line-height: $line-height-base;
}
} }
@@ -227,7 +231,7 @@ p.buttons {
label { label {
display: block; display: block;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
line-height: initial; line-height: initial;
} }
} }

View File

@@ -107,7 +107,7 @@
ul { ul {
&:nth-child(n) { &:nth-child(n) {
margin: 0 0 ($line-height-computed / 2); margin: 0 0 ($line-height-computed * .5);
padding: 0; padding: 0;
@if $sidebar-position == "left" { @if $sidebar-position == "left" {
@@ -173,7 +173,7 @@
> a.icon-only { > a.icon-only {
position: absolute; position: absolute;
top: $sidebar-padding-vertical; top: $sidebar-padding-vertical;
right: $sidebar-padding-horizontal / 2; right: $sidebar-padding-horizontal * .5;
line-height: $line-height-computed; line-height: $line-height-computed;
&::before { &::before {
@@ -196,8 +196,8 @@
li { li {
> a:not(.icon-only) { > a:not(.icon-only) {
padding-right: $sidebar-padding-horizontal / 2; padding-right: $sidebar-padding-horizontal * .5;
padding-left: $sidebar-padding-horizontal / 2; padding-left: $sidebar-padding-horizontal * .5;
@if $sidebar-position == "right" { @if $sidebar-position == "right" {
margin-left: 0; margin-left: 0;
@@ -205,7 +205,7 @@
} }
.pages-hierarchy { .pages-hierarchy {
margin-left: $sidebar-padding-horizontal / 2 + 3px; margin-left: $sidebar-padding-horizontal * .5 + 3px;
} }
} }
} }
@@ -245,7 +245,7 @@
} }
.page-tree__list { .page-tree__list {
margin-left: $sidebar-padding-horizontal / 2 + 3px; margin-left: $sidebar-padding-horizontal * .5 + 3px;
} }
summary { summary {
@@ -263,8 +263,8 @@
li { li {
> a:not(.icon-only) { > a:not(.icon-only) {
padding-right: $sidebar-padding-horizontal / 2; padding-right: $sidebar-padding-horizontal * .5;
padding-left: $sidebar-padding-horizontal / 2; padding-left: $sidebar-padding-horizontal * .5;
@if $sidebar-position == "right" { @if $sidebar-position == "right" {
margin-left: 0; margin-left: 0;
@@ -298,8 +298,8 @@
&::before { &::before {
content: ""; content: "";
position: absolute; position: absolute;
top: ($sidebar-padding-vertical + 1px) + ($line-height-computed - 16px) / 2; top: ($sidebar-padding-vertical + 1px) + ($line-height-computed - 16px) * .5;
left: $sidebar-padding-horizontal / 2 + 6px; left: $sidebar-padding-horizontal * .5 + 6px;
width: 16px; width: 16px;
height: 16px; height: 16px;
background-image: inline-svg("chevron-right.svg", (path: (fill: $btn-default-icon-color))); background-image: inline-svg("chevron-right.svg", (path: (fill: $btn-default-icon-color)));

View File

@@ -76,7 +76,32 @@
} }
.contextual { .contextual {
.drdn { .drdn-items {
padding: 3px;
a,
span {
padding-top: $pagination-padding-vertical;
padding-bottom: $pagination-padding-vertical;
border: 1px solid transparent;
border-radius: $border-radius-small;
color: $pagination-color;
&:hover,
&:focus {
border-color: $pagination-hover-border;
background-color: $pagination-hover-bg;
color: $pagination-hover-color;
text-decoration: none;
&.icon-del {
color: map-get(map-get($icon-color-map, danger), normal);
}
}
}
}
&:not(.journal-actions) > .drdn {
&.expanded { &.expanded {
> .drdn-trigger { > .drdn-trigger {
border-color: $pagination-active-border; border-color: $pagination-active-border;
@@ -85,7 +110,7 @@
} }
} }
&-trigger { .drdn-trigger {
padding: $btn-padding-vertical $btn-padding-horizontal-small; padding: $btn-padding-vertical $btn-padding-horizontal-small;
border: 1px solid $pagination-border; border: 1px solid $pagination-border;
border-radius: $border-radius-base; border-radius: $border-radius-base;
@@ -105,25 +130,20 @@
color: $pagination-hover-color; color: $pagination-hover-color;
} }
} }
}
&-items { }
padding: 3px;
.journal-actions {
a, .drdn-trigger {
span { color: map-get(map-get($icon-color-map, default), normal);
padding-top: $pagination-padding-vertical; }
padding-bottom: $pagination-padding-vertical;
border: 1px solid transparent; .drdn-trigger:hover,
border-radius: $border-radius-small; .drdn.expanded .drdn-trigger {
color: $pagination-color; color: map-get(map-get($icon-color-map, default), hover);
}
&:hover {
border-color: $pagination-hover-border; .drdn-content {
background-color: $pagination-hover-bg; top: $input-height-base;
color: $pagination-hover-color;
text-decoration: none;
}
}
}
} }
} }

View File

@@ -190,12 +190,12 @@ img {
} }
.splitcontentleft { .splitcontentleft {
padding-right: ($padding-side / 2); padding-right: ($padding-side * .5);
float: left; float: left;
} }
.splitcontentright { .splitcontentright {
padding-left: ($padding-side / 2); padding-left: ($padding-side * .5);
float: right; float: right;
} }
@@ -275,7 +275,7 @@ img {
// //
p.subtitle { p.subtitle {
margin-top: ($line-height-computed / -2); margin-top: ($line-height-computed * -.5);
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
font-style: italic; font-style: italic;
} }
@@ -360,13 +360,13 @@ a.close-icon {
#list-left { #list-left {
width: 50%; width: 50%;
padding-right: ($padding-side / 2); padding-right: ($padding-side * .5);
float: left; float: left;
} }
#list-right { #list-right {
width: 50%; width: 50%;
padding-left: ($padding-side / 2); padding-left: ($padding-side * .5);
float: right; float: right;
} }
} }
@@ -461,6 +461,10 @@ ul.projects {
li { li {
list-style-type: none; list-style-type: none;
} }
.archived {
color: $gray-600;
}
} }
#projects-index ul.projects { #projects-index ul.projects {
@@ -468,16 +472,16 @@ ul.projects {
&.root { &.root {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-right: -($padding-side / 2); margin-right: -($padding-side * .5);
margin-left: -($padding-side / 2); margin-left: -($padding-side * .5);
> li { > li {
display: block; display: block;
box-sizing: border-box; box-sizing: border-box;
flex: 0 1 auto; flex: 0 1 auto;
width: 100%; width: 100%;
margin-right: $padding-side / 2; margin-right: $padding-side * .5;
margin-left: $padding-side / 2; margin-left: $padding-side * .5;
padding: $panel-body-padding; padding: $panel-body-padding;
border: 1px solid $panel-border; border: 1px solid $panel-border;
border-radius: $border-radius-base; border-radius: $border-radius-base;
@@ -500,7 +504,7 @@ ul.projects {
} }
li.child { li.child {
margin-top: $line-height-computed / 2; margin-top: $line-height-computed * .5;
} }
a.project { a.project {
@@ -513,6 +517,14 @@ ul.projects {
} }
} }
table.projects {
.name {
a + span.icon {
margin-left: 5px;
}
}
}
#custom_field_tracker_ids { #custom_field_tracker_ids {
label { label {
margin-right: 10px; margin-right: 10px;
@@ -680,7 +692,7 @@ div#version-summary {
left: 50%; left: 50%;
box-sizing: border-box; box-sizing: border-box;
width: 200px; width: 200px;
margin: (($padding-large-vertical * 2 + 1px * 2 + $line-height-computed) / -2) (200px / -2); margin: (($padding-large-vertical * 2 + 1px * 2 + $line-height-computed) * -.5) (200px * -.5);
padding: $padding-large-vertical $padding-large-horizontal; padding: $padding-large-vertical $padding-large-horizontal;
border: 1px solid $highlight-border; border: 1px solid $highlight-border;
border-radius: $border-radius-base; border-radius: $border-radius-base;
@@ -699,7 +711,7 @@ div#version-summary {
box-sizing: border-box; box-sizing: border-box;
width: $line-height-computed; width: $line-height-computed;
height: $line-height-computed; height: $line-height-computed;
margin-right: $line-height-computed / 2; margin-right: $line-height-computed * .5;
animation: spin 1s linear infinite; animation: spin 1s linear infinite;
border: 3px solid rgba($highlight-text, .3); border: 3px solid rgba($highlight-text, .3);
border-radius: 50%; border-radius: 50%;
@@ -765,7 +777,7 @@ div.table-list.boards {
.controller-messages.action-show { .controller-messages.action-show {
h2 { h2 {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
.message { .message {
@@ -871,14 +883,14 @@ div.table-list.boards {
.news.box { .news.box {
p > a:not(:last-child) { p > a:not(:last-child) {
display: inline-block; display: inline-block;
margin-bottom: floor($line-height-computed / 4); margin-bottom: floor($line-height-computed * .25);
font-size: $font-size-h4; font-size: $font-size-h4;
} }
.summary, .summary,
.author { .author {
display: block; display: block;
margin-bottom: floor($line-height-computed / 4); margin-bottom: floor($line-height-computed * .25);
+ br { + br {
display: none; display: none;
@@ -893,7 +905,7 @@ div.table-list.boards {
#edit-news + p { #edit-news + p {
em { em {
display: block; display: block;
margin-bottom: floor($line-height-computed / 4); margin-bottom: floor($line-height-computed * .25);
+ br { + br {
display: none; display: none;
@@ -903,7 +915,7 @@ div.table-list.boards {
.news.box .summary, .news.box .summary,
#edit-news + p em { #edit-news + p em {
padding: floor($line-height-computed / 4) $padding-base-horizontal; padding: floor($line-height-computed * .25) $padding-base-horizontal;
border-left: 4px solid $blockquote-border-color; border-left: 4px solid $blockquote-border-color;
} }
@@ -914,7 +926,7 @@ div.table-list.boards {
header { header {
h3 { h3 {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
> a { > a {
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
@@ -942,7 +954,7 @@ div.table-list.boards {
#comments { #comments {
> h4 { > h4 {
margin-top: $line-height-computed; margin-top: $line-height-computed;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
} }

View File

@@ -12,7 +12,7 @@ form {
> input, > input,
> select { > select {
margin-right: 5px; margin-right: 5px;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
} }
@@ -228,7 +228,7 @@ select:-moz-focusring {
fieldset { fieldset {
min-width: 0; min-width: 0;
margin: 0; margin: 0;
padding: ($line-height-computed / 2) 0; padding: ($line-height-computed * .5) 0;
border: 0 none; border: 0 none;
border-top: 1px solid $legend-border-color; border-top: 1px solid $legend-border-color;
@@ -297,7 +297,7 @@ em.info {
p { p {
@extend %clearfix; @extend %clearfix;
margin: 0 0 ($line-height-computed / 2); margin: 0 0 ($line-height-computed * .5);
padding-left: $label-width + $label-space; padding-left: $label-width + $label-space;
clear: left; clear: left;
line-height: $input-height-base; line-height: $input-height-base;
@@ -435,7 +435,7 @@ label[for="issue_description"] + a {
// //
label[for="closed"] { label[for="closed"] {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
@@ -481,7 +481,7 @@ label[for="closed"] {
// //
.jstEditor { .jstEditor {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
//== User form //== User form
@@ -505,13 +505,13 @@ label[for="closed"] {
.attachments_fields { .attachments_fields {
> span { > span {
display: block; display: block;
margin-bottom: $line-height-computed / 4; margin-bottom: $line-height-computed * .25;
} }
input { input {
width: 21.5em; width: 21.5em;
margin-right: .5em; margin-right: .5em;
margin-bottom: $line-height-computed / 4; margin-bottom: $line-height-computed * .25;
&.filename { &.filename {
padding-left: $input-padding-horizontal + 16px; padding-left: $input-padding-horizontal + 16px;
@@ -621,7 +621,7 @@ label[for="closed"] {
#watchers_inputs { #watchers_inputs {
display: block; display: block;
max-height: $check-list-max-height; max-height: $check-list-max-height;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
overflow: auto; overflow: auto;
label { label {
@@ -757,7 +757,7 @@ fieldset#filters {
.query_sort_criteria_count { .query_sort_criteria_count {
display: inline-block; display: inline-block;
min-width: 1em; min-width: 1em;
margin-bottom: $line-height-computed / 4; margin-bottom: $line-height-computed * .25;
line-height: $input-height-base; line-height: $input-height-base;
} }

View File

@@ -49,6 +49,11 @@ table.gantt-table {
z-index: 2; z-index: 2;
} }
.last_gantt_selected_column .gantt_selected_column_container,
.gantt_subjects_container .gantt_subjects * {
z-index: 10;
}
.gantt_subjects_column { .gantt_subjects_column {
.gantt_hdr { .gantt_hdr {
border-left: 1px solid $gray-500 !important; // stylelint-disable-line declaration-no-important border-left: 1px solid $gray-500 !important; // stylelint-disable-line declaration-no-important

View File

@@ -104,6 +104,8 @@ $icon-map: (
icon-toggle-minus: $fa-var-minus-square, icon-toggle-minus: $fa-var-minus-square,
icon-clear-query: $fa-var-times, icon-clear-query: $fa-var-times,
icon-import: $fa-var-cloud-upload, icon-import: $fa-var-cloud-upload,
icon-bookmarked-project: $fa-var-tag,
icon-copy-link: $fa-var-clipboard,
// Plugin icons // Plugin icons
icon-call: $fa-var-phone, icon-call: $fa-var-phone,
@@ -179,6 +181,10 @@ a.icon:empty {
display: inline-block; display: inline-block;
} }
span.icon + span.icon {
margin-left: $padding-small-vertical;
}
$icons-selector: (); $icons-selector: ();
@each $class, $icon in $icon-map { @each $class, $icon in $icon-map {
$icons-selector: append($icons-selector, unquote(".#{$class}"), "comma"); $icons-selector: append($icons-selector, unquote(".#{$class}"), "comma");
@@ -191,6 +197,8 @@ $icons-selector: ();
color: $orange; color: $orange;
} @else if $class == "icon-heart" { } @else if $class == "icon-heart" {
color: $pink; color: $pink;
} @else if $class == "icon-bookmarked-project" {
color: $blue;
} }
} }
@@ -586,13 +594,48 @@ dt {
} }
} }
.my-project { a.project {
$svg-star: inline-svg("icon-star.svg", (path: (fill: $orange)));
$svg-tag: inline-svg("icon-tag.svg", (path: (fill: $blue)));
&.icon {
padding-left: 0;
&::before {
content: "";
display: none;
margin: 0;
}
}
&.my-project,
&.icon-user,
&.icon-bookmarked-project {
padding-right: $icon-width;
background-image: $svg-star;
background-repeat: no-repeat;
background-position: bottom .2em right 0, bottom .2em right $icon-width;
}
&.icon-bookmarked-project {
background-image: $svg-tag;
}
&.icon-user.icon-bookmarked-project {
padding-right: $icon-width * 2;
background-image: $svg-tag, $svg-star;
}
}
span.my-project {
@extend %fa-icon; @extend %fa-icon;
&::before { &::before {
content: $fa-var-star; content: $fa-var-star;
color: $yellow; width: $icon-width;
font-size: $font-size-small; margin-right: 0;
color: $orange;
text-align: center;
} }
} }
@@ -894,6 +937,12 @@ div.wiki {
> a { > a {
@extend %fa-icon; @extend %fa-icon;
&::before {
width: $icon-width;
margin-right: 0;
text-align: center;
}
&:not([class*="icon"]) { &:not([class*="icon"]) {
&::before { &::before {
content: $fa-var-comment; content: $fa-var-comment;

View File

@@ -27,7 +27,7 @@
width: $issue-gravatar-size; width: $issue-gravatar-size;
height: $issue-gravatar-size; height: $issue-gravatar-size;
margin-right: 10px; margin-right: 10px;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
float: left; float: left;
&:nth-child(2) { &:nth-child(2) {
@@ -47,7 +47,7 @@
width: $issue-gravatar-size; width: $issue-gravatar-size;
height: $issue-gravatar-size; height: $issue-gravatar-size;
margin-right: 10px; margin-right: 10px;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
float: left; float: left;
} }
@@ -297,7 +297,8 @@
} }
} }
div.fileover { div.fileover,
p.custom-field-filedroplistner.fileover {
background-color: $highlight-bg; background-color: $highlight-bg;
} }
@@ -373,7 +374,7 @@ div.thumbnails {
} }
.issues { .issues {
margin: ($line-height-computed / 2) 0 0; margin: ($line-height-computed * .5) 0 0;
tr { tr {
background-color: transparent; background-color: transparent;
@@ -383,6 +384,10 @@ div.thumbnails {
border-bottom: 0 none; border-bottom: 0 none;
} }
td.subject {
width: 50%;
}
td.checkbox { td.checkbox {
display: none; display: none;
} }
@@ -406,7 +411,7 @@ div.thumbnails {
display: none; display: none;
dt { dt {
margin: 0 0 ($line-height-computed / 4); margin: 0 0 ($line-height-computed * .25);
} }
dd { dd {
@@ -535,14 +540,6 @@ div.thumbnails {
padding: $bubble-padding-vertical $bubble-padding-horizontal; padding: $bubble-padding-vertical $bubble-padding-horizontal;
font-size: $font-size-list; font-size: $font-size-list;
a {
opacity: $icon-opacity;
&:hover {
opacity: $icon-hover-opacity;
}
}
> a.journal-link { > a.journal-link {
padding-left: $issue-attribute-padding-h; padding-left: $issue-attribute-padding-h;
opacity: 1; opacity: 1;
@@ -550,6 +547,7 @@ div.thumbnails {
&::before { &::before {
content: ""; content: "";
display: none;
} }
} }
} }
@@ -671,7 +669,7 @@ div.thumbnails {
> label { > label {
display: inline-block; display: inline-block;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
line-height: $line-height-base; line-height: $line-height-base;
} }
@@ -721,7 +719,16 @@ div.thumbnails {
clear: left; clear: left;
} }
.journal-actions > a,
.journal-actions .drdn-trigger {
margin: -3px 3px;
padding-top: 3px;
padding-bottom: 3px;
}
.journal-link { .journal-link {
margin: -3px -3px -3px 0;
padding: 3px;
float: right; float: right;
} }
@@ -757,7 +764,7 @@ span.private {
} }
div.changeset { div.changeset {
margin-top: $line-height-computed / 2 + 2px * 2; margin-top: $line-height-computed * .5 + 2px * 2;
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
border: 1px solid $bubble-border; border: 1px solid $bubble-border;

View File

@@ -43,22 +43,22 @@
a, a,
button { button {
&.ui-state-default { &.ui-button {
border-color: $header-bg; border-color: $header-bg;
background: $header-bg; background: $header-bg;
box-shadow: none;
color: $header-text; color: $header-text;
}
&.ui-state-hover,
&.ui-state-focus {
border-color: darken($header-bg, 12%);
background: darken($header-bg, 10%);
}
.ui-icon { .ui-icon {
background-image: url("../../../stylesheets/jquery/images/ui-icons_ffffff_256x240.png"); background-image: url("../../../stylesheets/jquery/images/ui-icons_ffffff_256x240.png");
} }
} }
&.ui-button:hover {
border-color: darken($header-bg, 12%);
background: darken($header-bg, 10%);
}
}
} }

View File

@@ -245,3 +245,16 @@ div.jstElements {
&::before { content: $fa-var-question-circle; } &::before { content: $fa-var-question-circle; }
} }
} }
body {
.table-generator {
td {
border-color: $tab-border;
}
td.selected-cell,
td:hover {
background-color: $brand-primary;
}
}
}

View File

@@ -108,6 +108,7 @@ table.list {
&.last_notes, &.last_notes,
&.last_updated_by, &.last_updated_by,
&.name, &.name,
&.parent-subject,
&.priority, &.priority,
&.relations, &.relations,
&.roles, &.roles,
@@ -252,7 +253,7 @@ tr.issue {
> span { > span {
display: block; display: block;
margin-bottom: $line-height-computed / 4; margin-bottom: $line-height-computed * .25;
padding: $table-cell-padding; padding: $table-cell-padding;
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
} }
@@ -323,7 +324,7 @@ td.last_updated_by {
} }
.sample-data { .sample-data {
margin: $line-height-computed / 2; margin: $line-height-computed * .5;
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
border: 1px solid $table-border-color; border: 1px solid $table-border-color;
@@ -494,7 +495,7 @@ tr.entry {
right: 5px; right: 5px;
bottom: 0; bottom: 0;
left: 5px; left: 5px;
height: calc(50% - 2px / 2); height: calc(50% - 2px * .5);
transform: rotate(-4deg); transform: rotate(-4deg);
transition: border-color $transition-time; transition: border-color $transition-time;
border-top: 2px solid rgba($tracker-default-text, .95); border-top: 2px solid rgba($tracker-default-text, .95);

View File

@@ -91,3 +91,21 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right $input-padding-horizontal center; background-position: right $input-padding-horizontal center;
} }
//
// Two-factor authentication
// --------------------------------------------------
.controller-twofa {
.splitcontentleft {
width: auto;
padding-right: 0;
}
}
ul.twofa_backup_codes {
margin-left: 0;
padding: 0;
list-style-type: none;
}

View File

@@ -6,7 +6,7 @@
#sidebar .sidebar-additionals { #sidebar .sidebar-additionals {
ul, ul,
ol { ol {
margin: 0 0 ($line-height-computed / 2); margin: 0 0 ($line-height-computed * .5);
padding-left: 1.5em; padding-left: 1.5em;
ul, ul,
@@ -174,7 +174,7 @@
p, p,
ul, ul,
ol { ol {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
@@ -207,7 +207,7 @@
> .heart-link-with-count { > .heart-link-with-count {
display: block; display: block;
position: relative; position: relative;
margin: -($line-height-computed / 2 + 1px) ($bubble-padding-horizontal - $padding-small-vertical) 0; margin: -($line-height-computed * .5 + 1px) ($bubble-padding-horizontal - $padding-small-vertical) 0;
float: right; float: right;
border: 0; border: 0;
background-color: $body-bg; background-color: $body-bg;
@@ -252,7 +252,7 @@
> a:first-child { > a:first-child {
margin-right: 0; margin-right: 0;
margin-left: 4px; margin-left: 4px;
padding-right: floor($btn-padding-horizontal-small / 2); padding-right: floor($btn-padding-horizontal-small * .5);
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
@@ -323,7 +323,7 @@ h2 {
} }
.live_search { .live_search {
margin-left: $padding-side / 2; margin-left: $padding-side * .5;
} }
.tags { .tags {
@@ -596,7 +596,7 @@ div.add-note {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 8px; left: 8px;
margin: ($fa-font-size-base / -2) 0 0; margin: ($fa-font-size-base * -.5) 0 0;
} }
} }
} }
@@ -755,8 +755,8 @@ span.tag-label-color {
margin: 0; margin: 0;
form > input { form > input {
width: $quick-search-width / 2; width: $quick-search-width * .5;
min-width: $quick-search-width / 2; min-width: $quick-search-width * .5;
} }
a { a {

View File

@@ -30,13 +30,13 @@ table.progress {
border: 0 none; border: 0 none;
&:first-child { &:first-child {
border-top-left-radius: $progress-height / 2; border-top-left-radius: $progress-height * .5;
border-bottom-left-radius: $progress-height / 2; border-bottom-left-radius: $progress-height * .5;
} }
&:last-child { &:last-child {
border-top-right-radius: $progress-height / 2; border-top-right-radius: $progress-height * .5;
border-bottom-right-radius: $progress-height / 2; border-bottom-right-radius: $progress-height * .5;
} }
&.done { &.done {

View File

@@ -116,7 +116,7 @@ body {
&__search { &__search {
height: $responsive-header-height; height: $responsive-header-height;
padding: ($padding-side / 2); padding: ($padding-side * .5);
line-height: normal; line-height: normal;
input[type="text"] { input[type="text"] {
@@ -249,13 +249,13 @@ body {
#watchers { #watchers {
.contextual { .contextual {
padding-top: $line-height-computed / 2; padding-top: $line-height-computed * .5;
padding-bottom: $line-height-computed / 2; padding-bottom: $line-height-computed * .5;
} }
.watchers { .watchers {
li { li {
margin: ($line-height-computed / 2) 0 0; margin: ($line-height-computed * .5) 0 0;
padding: 0; padding: 0;
img.gravatar { img.gravatar {
@@ -451,7 +451,7 @@ body {
.query-columns { .query-columns {
span { span {
display: block; display: block;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
.buttons { .buttons {

View File

@@ -105,7 +105,7 @@
input, input,
select { select {
margin-right: 5px; margin-right: 5px;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
} }
label { label {

View File

@@ -84,7 +84,7 @@ $tabs-height: $line-height-computed + $tab-padding-vertical * 2 + 1px + 1px;
} }
&.disabled { &.disabled {
opacity: $icon-opacity / 2; opacity: $icon-opacity * .5;
} }
} }

View File

@@ -159,7 +159,7 @@
#quick-search { #quick-search {
#header & { #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) * .5) - 1px;
margin-right: $header-padding-horizontal; margin-right: $header-padding-horizontal;
float: right; float: right;
color: $header-text; color: $header-text;
@@ -203,7 +203,7 @@
.drdn-trigger { .drdn-trigger {
z-index: 1003; z-index: 1003;
height: auto; height: auto;
padding-bottom: $header-padding-horizontal / 2; padding-bottom: $header-padding-horizontal * .5;
border-color: $quick-search-dropdown-bg; border-color: $quick-search-dropdown-bg;
background-color: $quick-search-dropdown-bg; background-color: $quick-search-dropdown-bg;
@@ -223,7 +223,7 @@
&::after { &::after {
content: $fa-var-caret-down; content: $fa-var-caret-down;
position: absolute; position: absolute;
top: ($font-size-base / 2); top: ($font-size-base * .5);
right: $input-padding-horizontal; right: $input-padding-horizontal;
} }
} }
@@ -233,7 +233,7 @@
background: $quick-search-dropdown-bg; background: $quick-search-dropdown-bg;
> .quick-search { > .quick-search {
padding: $header-padding-horizontal / 2; padding: $header-padding-horizontal * .5;
> input { > input {
width: 100%; width: 100%;

View File

@@ -344,7 +344,7 @@ p.footnote {
display: block; display: block;
width: 300px; width: 300px;
margin-top: $line-height-computed; margin-top: $line-height-computed;
padding-top: $line-height-computed / 2; padding-top: $line-height-computed * .5;
border-top: 1px solid $gray-400; border-top: 1px solid $gray-400;
} }
@@ -408,7 +408,7 @@ p.footnote {
display: inline-block; display: inline-block;
padding: $padding-base-vertical $padding-base-horizontal; padding: $padding-base-vertical $padding-base-horizontal;
border: 1px solid $btn-default-border; border: 1px solid $btn-default-border;
border-radius: ceil($font-size-base + ($padding-base-vertical + 1px) * 2) / 2; border-radius: ceil($font-size-base + ($padding-base-vertical + 1px) * 2) * .5;
background-color: $body-bg; background-color: $body-bg;
line-height: 1; line-height: 1;
white-space: nowrap; white-space: nowrap;

View File

@@ -1,3 +1,5 @@
@use "sass:math";
// Variables // Variables
// -------------------------- // --------------------------
@@ -8,7 +10,7 @@ $fa-css-prefix: fa !default;
$fa-version: "4.7.0" !default; $fa-version: "4.7.0" !default;
$fa-border-color: #eee !default; $fa-border-color: #eee !default;
$fa-inverse: #fff !default; $fa-inverse: #fff !default;
$fa-li-width: (30em / 14) !default; $fa-li-width: math.div(30em, 14) !default;
$fa-var-500px: "\f26e"; $fa-var-500px: "\f26e";
$fa-var-address-book: "\f2b9"; $fa-var-address-book: "\f2b9";

View File

@@ -256,8 +256,8 @@ ul.ui-sortable {
.ui-tooltip { .ui-tooltip {
.ui-tooltip-content { .ui-tooltip-content {
hr { hr {
margin-top: $line-height-computed / 2; margin-top: $line-height-computed * .5;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed * .5;
border: 0; border: 0;
border-top: 1px solid $hr-border; border-top: 1px solid $hr-border;
} }

View File

@@ -51,17 +51,17 @@ $story-sp-input-width: 50px;
// //
#backlogs_container { #backlogs_container {
padding: ($padding-side / 2) ($padding-side / 4); padding: ($padding-side * .5) ($padding-side * .25);
.backlogs-panel-inner { .backlogs-panel-inner {
padding: 0 ($padding-side / 4); padding: 0 ($padding-side * .25);
} }
@media screen and (min-width: $screen-md-min) { @media screen and (min-width: $screen-md-min) {
padding: $padding-side ($padding-side / 2); padding: $padding-side ($padding-side * .5);
.backlogs-panel-inner { .backlogs-panel-inner {
padding: 0 ($padding-side / 2); padding: 0 ($padding-side * .5);
} }
} }
@@ -158,7 +158,7 @@ $story-sp-input-width: 50px;
@include nice-shadow(1); @include nice-shadow(1);
display: block; display: block;
position: relative; position: relative;
margin: 0 0 ($padding-side / 2); margin: 0 0 ($padding-side * .5);
border-radius: $border-radius-large $border-radius-large 0 0; border-radius: $border-radius-large $border-radius-large 0 0;
background-color: $gray-100; background-color: $gray-100;
@@ -243,7 +243,7 @@ $story-sp-input-width: 50px;
} }
.editing { .editing {
$editor-padding: (($header-line-height - $input-height-base) / 2); $editor-padding: (($header-line-height - $input-height-base) * .5);
.editors { .editors {
display: block; display: block;
@@ -823,7 +823,7 @@ $story-sp-input-width: 50px;
// //
#show_completed_sprints { #show_completed_sprints {
margin-left: $padding-side / 2; margin-left: $padding-side * .5;
color: $gray-950; color: $gray-950;
cursor: pointer; cursor: pointer;
} }

File diff suppressed because one or more lines are too long

1
svg/icon-star.svg Normal file
View File

@@ -0,0 +1 @@
<svg width="16" height="16" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="red" d="M1728 647q0 22-26 48l-363 354 86 500q1 7 1 20 0 21-10.5 35.5t-30.5 14.5q-19 0-40-12l-449-236-449 236q-22 12-40 12-21 0-31.5-14.5t-10.5-35.5q0-6 2-20l86-500-364-354q-25-27-25-48 0-37 56-46l502-73 225-455q19-41 49-41t49 41l225 455 502 73q56 9 56 46z"/></svg>

After

Width:  |  Height:  |  Size: 363 B

1
svg/icon-tag.svg Normal file
View File

@@ -0,0 +1 @@
<svg width="16" height="16" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="red" d="M576 448q0-53-37.5-90.5t-90.5-37.5-90.5 37.5-37.5 90.5 37.5 90.5 90.5 37.5 90.5-37.5 37.5-90.5zm1067 576q0 53-37 90l-491 492q-39 37-91 37-53 0-90-37l-715-716q-38-37-64.5-101t-26.5-117v-416q0-52 38-90t90-38h416q53 0 117 26.5t102 64.5l715 714q37 39 37 91z"/></svg>

After

Width:  |  Height:  |  Size: 369 B