Skip to content
This repository was archived by the owner on Jul 14, 2025. It is now read-only.

Commit 0ade3af

Browse files
committed
Update styles for Redmine 6
fixes #284
1 parent 8cece55 commit 0ade3af

File tree

10 files changed

+86
-8
lines changed

10 files changed

+86
-8
lines changed

src/sass/components/_base.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,7 @@ blockquote {
186186
.clear {
187187
@extend %clearfix;
188188
}
189+
190+
.inline-block {
191+
display: inline-block;
192+
}

src/sass/components/_buttons.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,10 @@ p.buttons {
235235
line-height: initial;
236236
}
237237
}
238+
}
238239

240+
#list-definition,
241+
.query-columns {
239242
.buttons {
240243
vertical-align: middle;
241244

src/sass/components/_calendar.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,7 @@ p.cal.legend {
176176
span {
177177
display: block;
178178
}
179+
svg + span {
180+
display: inline-block;
181+
}
179182
}

src/sass/components/_content.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
}
102102

103103
> h3:first-child,
104+
#sidebar-wrapper > h3:first-child,
104105
> form:first-child > h3 {
105106
margin-top: $line-height-computed * .25;
106107
}

src/sass/components/_context-menu.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555

5656
&.submenu {
5757
background-image: inline-svg("chevron-right.svg", (path: (fill: $btn-default-icon-color)));
58+
background-repeat: no-repeat;
59+
background-position: right;
60+
61+
+ span.icon-only {
62+
display: none;
63+
}
5864
}
5965
}
6066
}

src/sass/components/_forms.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// --------------------------------------------------
44

55
form {
6+
.filter > div,
7+
#list-definition > div div,
68
td {
79
padding: $table-condensed-cell-padding;
810
}
@@ -676,6 +678,7 @@ fieldset#filters {
676678
}
677679
}
678680

681+
div,
679682
td {
680683
&.field {
681684
padding-right: $table-cell-padding * 2;
@@ -715,6 +718,11 @@ fieldset#filters {
715718
}
716719
}
717720

721+
div.filter {
722+
display: flex;
723+
align-items: center;
724+
}
725+
718726
div.add-filter {
719727
padding-top: $table-condensed-cell-padding;
720728

src/sass/components/_icons.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
// Hide Redmine 6 new SVG icons
2+
svg.s12,
3+
svg.s14,
4+
svg.s18,
5+
svg.s20 {
6+
display: none;
7+
}
8+
19
%fa-icon {
210
&::before {
311
@include fa-icon;
@@ -886,6 +894,21 @@ div.wiki {
886894
}
887895
}
888896

897+
.flyout-menu__search {
898+
form {
899+
&::after {
900+
content: $fa-var-search;
901+
display: block;
902+
position: absolute;
903+
top: 50%;
904+
left: .5em;
905+
transform: translateY(-50%);
906+
color: $text-color;
907+
font-family: FontAwesome;
908+
}
909+
}
910+
}
911+
889912

890913
//== Hacks and overrides for Font Awesome
891914
//

src/sass/components/_list.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -774,3 +774,23 @@ table.list.enumerations {
774774
font-weight: $font-weight-bold;
775775
}
776776
}
777+
778+
779+
//== Definition lists
780+
//
781+
782+
#list-definition {
783+
> div {
784+
display: flex;
785+
flex-wrap: wrap;
786+
align-items: center;
787+
788+
.query-columns label {
789+
display: block;
790+
}
791+
792+
.field {
793+
width: 4.85rem;
794+
}
795+
}
796+
}

src/sass/components/_responsive.scss

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,14 @@ body {
3939
}
4040
}
4141

42+
.flyout-menu__sidebar {
43+
> div {
44+
padding-left: 0;
45+
}
46+
}
47+
4248
#header {
49+
height: $responsive-header-height;
4350
background-color: $header-bg;
4451

4552
#project-jump {
@@ -98,6 +105,10 @@ body {
98105
width: 200px;
99106
}
100107

108+
.sidebar-toggler {
109+
display: none;
110+
}
111+
101112
.mobile-toggle-button {
102113
width: $responsive-header-height;
103114
height: $responsive-header-height;
@@ -113,7 +124,7 @@ body {
113124
color: $flyout-menu-text;
114125

115126
.search-magnifier {
116-
left: 18px;
127+
display: none;
117128
}
118129

119130
&__search {
@@ -212,8 +223,13 @@ body {
212223
}
213224

214225
form {
226+
position: relative;
215227
padding-left: 0;
216228

229+
label {
230+
display: inline-block;
231+
}
232+
217233
> ul {
218234
margin-left: 0;
219235

@@ -289,12 +305,6 @@ body {
289305
}
290306
}
291307

292-
.search-magnifier {
293-
&--flyout {
294-
line-height: normal;
295-
}
296-
}
297-
298308
.splitcontentleft {
299309
margin-bottom: $line-height-computed;
300310
padding-right: 0;

stylesheets/application.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)