Skip to content

Commit cb61e53

Browse files
ezenzenezenzen
authored
Merge pull request #1 from ezenzen/trunk_font_size
Introduction of rem
2 parents 0aa6b8a + 9e62d8d commit cb61e53

63 files changed

Lines changed: 1974 additions & 645 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/UI/templates/default/Breadcrumbs/breadcrumbs.less‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
text-align: left;
1212
margin: 0;
1313
font-weight: @il-standard-page-breadcrumbs-font-weight;
14-
font-size: @font-size-small;
15-
padding: (@il-padding-small-vertical * 2);
16-
padding-left: @il-standard-page-content-padding;
14+
font-size: @il-font-size-small;
15+
padding: @il-padding-small-vertical;
16+
padding-left: @il-mainbar-btn-width + @il-standard-page-content-padding;
1717

1818
span.crumb a {
1919
color: @il-standard-page-breadcrumbs-color;
@@ -77,7 +77,7 @@
7777

7878
.breadcrumb {
7979
margin: @il-breadcrumb-margin-top @il-breadcrumb-margin-right @il-breadcrumb-margin-bottom @il-breadcrumb-margin-left;
80-
font-size: 90%;
80+
font-size: @il-font-size-small;
8181

8282
> li + li:before {
8383
font-family: 'il-icons';

‎src/UI/templates/default/Chart/chart.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424

2525
.il-chart-scale-bar-item {
26-
font-size: @font-size-xs;
26+
font-size: @il-font-size-xsmall;
2727
padding: @il-padding-xs-vertical @il-padding-xs-horizontal;
2828
color: @il-chart-item-inactive-color;
2929
text-align: center;
@@ -102,7 +102,7 @@
102102
}
103103
.il-chart-progressmeter-text {
104104
.text-score {
105-
font-size: 7.5px;
105+
font-size: @il-font-size-xsmall;
106106
font-weight: bold;
107107

108108
fill: @il-chart-progressmeter-score-text-color;

‎src/UI/templates/default/Dropzone/dropzone.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.message-style(@font-color; @padding-base-vertical; @padding-base-horizontal; @font-size; @line-height-base) {
22
.button-size(@padding-base-vertical; @padding-base-horizontal; @font-size; @line-height-base; 0);
3-
font-size: @font-size;
3+
font-size: @il-font-size-base;
44
border: 1px solid transparent;
55
color: @font-color;
66
display: inline-block;

‎src/UI/templates/default/Input/input.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
.input-group-addon {
6262
padding: 3px 8px;
63-
font-size: 14px;
63+
font-size: @il-font-size-base;
6464
font-weight: 400;
6565
line-height: 1;
6666
color: @il-text-color;

‎src/UI/templates/default/Item/item.less‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
padding: @il-item-padding;
99

1010
.il-item-title {
11-
font-size: @font-size-base;
11+
font-size: @il-font-size-base;
1212
display: inline-block;
1313
.btn-link, a {
1414
font-size: inherit;
@@ -36,18 +36,18 @@
3636

3737
.il-item-description {
3838
padding: @il-item-description-padding;
39-
font-size: @font-size-small;
39+
font-size: @il-font-size-small;
4040
clear: both;
4141
}
4242

4343
.il-item-property-name {
44-
font-size: @font-size-small;
44+
font-size: @il-font-size-small;
4545
color: @il-text-light-color;
4646
overflow: hidden;
4747
}
4848

4949
.il-item-property-value {
50-
font-size: @font-size-small;
50+
font-size: @il-font-size-small;
5151
overflow: hidden;
5252
}
5353

@@ -81,7 +81,7 @@
8181
> h3 {
8282
float:left;
8383
color: @panel-heading-color;
84-
font-size: @font-size-h4;
84+
font-size: @il-font-size-large;
8585
font-weight: normal;
8686
padding: @panel-heading-padding;
8787
margin: 0;
@@ -172,7 +172,7 @@
172172

173173
.il-item-description {
174174
padding-top: 0;
175-
font-size: @font-size-xs;
175+
font-size: @il-font-size-xsmall;
176176
word-break: break-word;
177177
}
178178

‎src/UI/templates/default/Layout/standardpage.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ div.il-system-infos {
154154
.il-pagetitle {
155155
font-weight: 600;
156156
display: flex;
157-
font-size: @font-size-base * 1.142;
157+
font-size: @il-font-size-large;
158158
align-items: flex-end;
159159
padding-left: 35px; // dynamic value desirable
160160
}
@@ -419,7 +419,7 @@ footer {
419419
background-color: transparent;
420420
border: none;
421421
color: @il-neutral-color;
422-
font-size: 1.5rem;
422+
font-size: @il-font-size-xxlarge;
423423
max-width: 220px;
424424
white-space: nowrap;
425425
overflow: hidden;

‎src/UI/templates/default/Listing/workflow.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.il-workflow-title {
55
background-color: @il-content-bg;
66
color: @il-main-color;
7-
font-size: 2.6rem;
7+
font-size: @il-font-size-xxlarge;
88
font-weight: 300;
99
margin-bottom: @il-slate-content-padding*3;
1010
margin-top: 0;

‎src/UI/templates/default/MainControls/Slate/slate.less‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
&.engaged::before,
2424
&.disengaged::before {
2525
font-family: "il-icons";
26-
font-size: @il-slate-bulky-glyph-size * 0.85;
26+
font-size: @il-slate-bulky-glyph-size;
2727
position: absolute;
2828
right: 10px;
29-
top: 20px;
29+
top: 17px;
3030
}
3131
&.engaged::before {
3232
content: " \e604";
@@ -55,7 +55,7 @@
5555
}
5656
.bulky-label {
5757
font-size: @il-slate-bulky-label-size;
58-
line-height: @il-slate-bulky-label-size * 1.3;
58+
line-height: @il-slate-bulky-label-size * 1.0625;
5959
text-align: left;
6060
word-break: normal;
6161
}
@@ -73,7 +73,7 @@
7373
:before{
7474
content: " \e605";
7575
font-family: "il-icons";
76-
font-size: 1.7rem;
76+
font-size: 1.0625rem;
7777
margin-right: 10px;
7878
}
7979
}
@@ -99,7 +99,7 @@
9999
:before{
100100
content: " \e605";
101101
font-family: "il-icons";
102-
font-size: 1.7rem;
102+
font-size: 1.0625rem;
103103
margin-right: 10px;
104104
}
105105
}

‎src/UI/templates/default/MainControls/footer.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ footer{
44
}
55
.il-maincontrols-footer {
66
color: @il-footer-color;
7-
font-size: 0.9em;
7+
font-size: @il-font-size-small;
88
padding: 2px 10px;
99

1010
.il-footer-content div {

‎src/UI/templates/default/MainControls/mainbar.less‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
}
243243
.close {
244244
color: @il-main-color;
245-
font-size: 4.5rem;
245+
font-size: 2.8125rem;
246246
font-weight: 300;
247247
height: @il-mainbar-btn-height;
248248
padding: 0 20px;
@@ -272,7 +272,7 @@
272272
content:" \e605";
273273
display: block;
274274
font-family: "il-icons"; // should be defined more general at .glyphicon
275-
font-size: 2.1rem;
275+
font-size: 1.5rem;
276276
}
277277
.glyphicon {
278278
display: none;
@@ -346,7 +346,7 @@
346346
.il-mainbar-remove-tool {
347347
top: 0;
348348
.close {
349-
font-size: 4rem;
349+
font-size: 2.5rem;
350350
height: @il-mainbar-small-btn-height;
351351
}
352352
}

0 commit comments

Comments
 (0)