summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/css/apps.scss8
-rw-r--r--core/css/fonts.scss25
-rw-r--r--core/css/guest.css34
-rw-r--r--core/css/header.scss2
-rw-r--r--core/css/inputs.scss2
-rw-r--r--core/css/public.scss2
-rw-r--r--core/css/styles.scss12
-rw-r--r--core/css/tooltip.scss2
-rw-r--r--core/fonts/OpenSans-Light.ttfbin117808 -> 0 bytes
-rw-r--r--core/fonts/OpenSans-Light.woffbin66792 -> 0 bytes
-rw-r--r--core/fonts/OpenSans-Semibold.ttfbin119868 -> 0 bytes
-rw-r--r--core/fonts/OpenSans-Semibold.woffbin68880 -> 0 bytes
-rw-r--r--settings/css/settings.scss4
13 files changed, 38 insertions, 53 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss
index a9e5a41910f..8a290abd950 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -21,7 +21,7 @@
h2,
h3,
h4 {
- font-weight: 600;
+ font-weight: bold;
}
h2 {
@@ -727,7 +727,7 @@ kbd {
border-radius: 0;
text-align: left;
padding-left: 42px;
- font-weight: 400;
+ font-weight: normal;
/* like app-navigation a */
color: var(--color-main-text);
@@ -794,7 +794,7 @@ kbd {
margin-bottom: 1px;
}
&.selected {
- font-weight: 600;
+ font-weight: bold;
}
&.selected,
&:hover,
@@ -911,7 +911,7 @@ $popovericon-size: 16px;
align-items: flex-start;
height: auto;
margin: 0;
- font-weight: 300;
+ font-weight: normal;
box-shadow: none;
width: 100%;
color: var(--color-main-text);
diff --git a/core/css/fonts.scss b/core/css/fonts.scss
index 441b48f3856..11e40d06328 100644
--- a/core/css/fonts.scss
+++ b/core/css/fonts.scss
@@ -1,26 +1,17 @@
-/* for low-res screens, use Regular font-weight instead of Light */
-@media (-webkit-max-device-pixel-ratio: 1.3), (max-resolution: 124.8dpi) {
- @font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: normal;
- src: local('Open Sans'), local('OpenSans'),
- url('../fonts/OpenSans-Regular.woff') format('woff');
- }
-}
-
@font-face {
font-family: 'Open Sans';
font-style: normal;
- font-weight: 300;
- src: local('Open Sans Light'), local('OpenSans-Light'),
- url('../fonts/OpenSans-Light.woff') format('woff');
+ font-weight: normal;
+ src: local('Open Sans'), local('OpenSans'),
+ url('../fonts/OpenSans.woff') format('woff'),
+ url('../fonts/OpenSans.ttf') format('ttf');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
- font-weight: 600;
- src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
- url('../fonts/OpenSans-Semibold.woff') format('woff');
+ font-weight: bold;
+ src: local('Open Sans Bold'), local('OpenSans-Bold'),
+ url('../fonts/OpenSans-Bold.woff') format('woff'),
+ url('../fonts/OpenSans-Bold.ttf') format('ttf');
}
diff --git a/core/css/guest.css b/core/css/guest.css
index ca15fee1894..99e7e8c9648 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -16,7 +16,7 @@ ul { list-style:none; }
body {
background-color: #ffffff;
- font-weight: 400;
+ font-weight: normal;
font-size: .8em;
line-height: 1.6em;
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
@@ -56,7 +56,7 @@ em {
h2,
h3,
h4 {
- font-weight: 600;
+ font-weight: bold;
}
h2 {
@@ -198,7 +198,7 @@ select {
min-width: 25px;
padding: 12px;
background-color: white;
- font-weight: 600;
+ font-weight: bold;
color: #555;
border: none;
cursor: pointer;
@@ -216,7 +216,7 @@ input[type='email'] {
-moz-appearance: textfield;
box-sizing: content-box;
border: none;
- font-weight: 300;
+ font-weight: normal;
}
input.login {
width: 269px;
@@ -607,7 +607,7 @@ form #selectDbType label.ui-state-active {
.warning a,
.error a {
color: #fff !important;
- font-weight: 600 !important;
+ font-weight: bold !important;
opacity: 1;
}
.error a.button {
@@ -803,7 +803,7 @@ footer {
}
footer .info .entity-name {
- font-weight: 600;
+ font-weight: bold;
}
.hidden {
@@ -823,26 +823,20 @@ a.legal {
font-size: smaller;
}
-/* for low-res screens, use Regular font-weight instead of Light */
-@media (-webkit-max-device-pixel-ratio: 1.3), (max-resolution: 124.8dpi) {
- @font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: normal;
- src: local('Open Sans'), local('OpenSans'), url('../fonts/OpenSans-Regular.woff') format('woff');
- }
-}
-
@font-face {
font-family: 'Open Sans';
font-style: normal;
- font-weight: 300;
- src: local('Open Sans Light'), local('OpenSans-Light'), url('../fonts/OpenSans-Light.woff') format('woff');
+ font-weight: normal;
+ src: local('Open Sans'), local('OpenSans'),
+ url('../fonts/OpenSans.woff') format('woff'),
+ url('../fonts/OpenSans.ttf') format('ttf');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
- font-weight: 600;
- src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('../fonts/OpenSans-Semibold.woff') format('woff');
+ font-weight: bold;
+ src: local('Open Sans Bold'), local('OpenSans-Bold'),
+ url('../fonts/OpenSans-Bold.woff') format('woff'),
+ url('../fonts/OpenSans-Bold.ttf') format('ttf');
}
diff --git a/core/css/header.scss b/core/css/header.scss
index af98e20a9d3..a80dbcc6cfb 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -212,7 +212,7 @@
.header-appname {
color: var(--color-primary-text);
font-size: 16px;
- font-weight: 600;
+ font-weight: bold;
margin: 0;
padding: 0;
padding-right: 5px;
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index d28884d0c53..78857b322db 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -286,7 +286,7 @@ button img,
}
select,
.button.multiselect {
- font-weight: 400;
+ font-weight: normal;
}
/* Radio & Checkboxes */
diff --git a/core/css/public.scss b/core/css/public.scss
index 0edf391fa49..20048870e2c 100644
--- a/core/css/public.scss
+++ b/core/css/public.scss
@@ -70,7 +70,7 @@ $footer-height: 65px;
color: var(--color-text-lighter);
a {
color: var(--color-text-lighter);
- font-weight: 600;
+ font-weight: bold;
white-space: nowrap;
/* increasing clickability to more than the text height */
padding: 13px;
diff --git a/core/css/styles.scss b/core/css/styles.scss
index dc217fb8f22..6f65f00df19 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -84,7 +84,7 @@ ul {
body {
background-color: var(--color-main-background);
- font-weight: 300;
+ font-weight: normal;
font-size: .8em;
line-height: 1.6em;
font-family: var(--font-face);
@@ -327,14 +327,14 @@ label.infield {
.warning {
legend, a {
color: var(--color-primary-text) !important;
- font-weight: 600 !important;
+ font-weight: bold !important;
}
}
.error {
a {
color: var(--color-primary-text) !important;
- font-weight: 600 !important;
+ font-weight: bold !important;
&.button {
color: var(--color-text-lighter) !important;
display: inline-block;
@@ -541,7 +541,7 @@ code {
.ui-datepicker-title {
line-height: 1;
- font-weight: 300;
+ font-weight: normal;
}
.ui-icon {
opacity: .5;
@@ -622,7 +622,7 @@ code {
.ui-timepicker-title {
line-height: 1;
- font-weight: 300;
+ font-weight: normal;
}
}
/* AM/PM fix */
@@ -1025,7 +1025,7 @@ div.crumb {
&:not(:first-child) a {
}
&:last-child {
- font-weight: 600;
+ font-weight: bold;
margin-right: 10px;
// Allow multiple span next to the main 'a'
a ~ span {
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss
index ad433185f1c..35718c822bb 100644
--- a/core/css/tooltip.scss
+++ b/core/css/tooltip.scss
@@ -15,7 +15,7 @@
display: block;
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
font-style: normal;
- font-weight: 400;
+ font-weight: normal;
letter-spacing: normal;
line-break: auto;
line-height: 1.6;
diff --git a/core/fonts/OpenSans-Light.ttf b/core/fonts/OpenSans-Light.ttf
deleted file mode 100644
index ecdea2de239..00000000000
--- a/core/fonts/OpenSans-Light.ttf
+++ /dev/null
Binary files differ
diff --git a/core/fonts/OpenSans-Light.woff b/core/fonts/OpenSans-Light.woff
deleted file mode 100644
index 085eb478ef0..00000000000
--- a/core/fonts/OpenSans-Light.woff
+++ /dev/null
Binary files differ
diff --git a/core/fonts/OpenSans-Semibold.ttf b/core/fonts/OpenSans-Semibold.ttf
deleted file mode 100644
index 9c90d4ce833..00000000000
--- a/core/fonts/OpenSans-Semibold.ttf
+++ /dev/null
Binary files differ
diff --git a/core/fonts/OpenSans-Semibold.woff b/core/fonts/OpenSans-Semibold.woff
deleted file mode 100644
index 66428f67ebc..00000000000
--- a/core/fonts/OpenSans-Semibold.woff
+++ /dev/null
Binary files differ
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 66361922d0c..8500d6a8353 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -328,7 +328,7 @@ select {
&.active {
box-shadow: inset 2px 0 var(--color-primary);
.menuitem-text {
- font-weight: 600;
+ font-weight: bold;
}
}
}
@@ -566,7 +566,7 @@ li.active {
width: 150px;
}
label {
- font-weight: 700;
+ font-weight: bold;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 13:47:30 +0000