Skip to content

Commit

Permalink
new font, ui fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Forberg committed Feb 17, 2024
1 parent e8cef0e commit b667d81
Show file tree
Hide file tree
Showing 15 changed files with 62 additions and 9 deletions.
12 changes: 12 additions & 0 deletions public/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@

.entity-card {

padding: 1.2em;
border: 1px solid #dbdbdb;
border-radius: 8px;

.entity-card-icon {
width: auto;
height: 52px;
Expand All @@ -153,13 +157,21 @@
.entity-card-header {
display: flex;
align-items: center;
margin-bottom: -4px;
}

.entity-card-header .title {
font-size: 1.2em;

}

.entity-card-content {
margin-top: 0.5em;
}

.entity-card-footer {
font-size: .8em;
color: #626568;
margin-top: 0.5em;
}
}
Expand Down
13 changes: 13 additions & 0 deletions public/css/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,17 @@
font-family: 'Roboto';
src: url('./../fonts/Roboto-Bold.ttf');
font-weight: bold;
}

@font-face {
font-family: 'Inter';
src: url('./../fonts/Inter-Regular.ttf');
}



@font-face {
font-family: 'Inter';
src: url('./../fonts/Inter-Bold.ttf');
font-weight: 600;
}
6 changes: 4 additions & 2 deletions public/css/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
.result-item {
padding: .35em .7em;
display: flex;
align-items: center;
cursor: pointer;
overflow: hidden;

Expand Down Expand Up @@ -217,7 +218,7 @@
}

.item-header {
display: flex;
display: box;
color: white
}
}
Expand Down Expand Up @@ -277,12 +278,13 @@
}

.result-item type-tag {
margin-right: 8px;
margin-right: 12px;
}

.result-item .item-label {
font-weight: 600;
margin-right: 8px;
margin-bottom: -4px;
}

.result-item .item-abstract {
Expand Down
30 changes: 27 additions & 3 deletions public/css/website.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@
src: url("./../fonts/Roboto-Bold.ttf");
font-weight: bold;
}
@font-face {
font-family: "Inter";
src: url("./../fonts/Inter-Regular.ttf");
}
@font-face {
font-family: "Inter";
src: url("./../fonts/Inter-Bold.ttf");
font-weight: 600;
}
.collection-summary.table {
background-color: transparent;
}
Expand Down Expand Up @@ -10077,6 +10086,11 @@ label.panel-block:hover {
transition-duration: 0.5s;
}

.entity-card {
padding: 1.2em;
border: 1px solid #dbdbdb;
border-radius: 8px;
}
.entity-card .entity-card-icon {
width: auto;
height: 52px;
Expand All @@ -10085,11 +10099,17 @@ label.panel-block:hover {
.entity-card .entity-card-header {
display: flex;
align-items: center;
margin-bottom: -4px;
}
.entity-card .entity-card-header .title {
font-size: 1.2em;
}
.entity-card .entity-card-content {
margin-top: 0.5em;
}
.entity-card .entity-card-footer {
font-size: 0.8em;
color: #626568;
margin-top: 0.5em;
}

Expand Down Expand Up @@ -10682,6 +10702,7 @@ template {
.databus-navbar .nav-search .results .result-item {
padding: 0.35em 0.7em;
display: flex;
align-items: center;
cursor: pointer;
overflow: hidden;
}
Expand All @@ -10704,7 +10725,7 @@ template {
color: #e7e7e7 !important;
}
.databus-navbar .nav-search .results .result-item .item-header {
display: flex;
display: box;
color: white;
}
.databus-navbar .nav-search .results::-webkit-scrollbar {
Expand Down Expand Up @@ -10745,11 +10766,12 @@ template {
fill: #a7a7a7;
}
.databus-navbar .nav-search .result-item type-tag {
margin-right: 8px;
margin-right: 12px;
}
.databus-navbar .nav-search .result-item .item-label {
font-weight: 600;
margin-right: 8px;
margin-bottom: -4px;
}
.databus-navbar .nav-search .result-item .item-abstract {
color: white;
Expand Down Expand Up @@ -10923,9 +10945,11 @@ template {

body,
html {
font-family: "PT Sans", sans-serif;
font-family: "Inter", "PT Sans", sans-serif;
text-rendering: optimizeLegibility;
line-height: 1.5em;
font-size: 16px;
color: rgb(95, 99, 104);
background: #fff;
}

Expand Down
4 changes: 3 additions & 1 deletion public/css/website.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@

body,
html {
font-family: 'PT Sans', sans-serif;
font-family: 'Inter', 'PT Sans', sans-serif;
text-rendering: optimizeLegibility;
line-height: 1.5em;
font-size: 16px;
color: rgb(95, 99, 104);
background: #fff;
}

Expand Down
Binary file added public/fonts/Inter-Black.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Bold.ttf
Binary file not shown.
Binary file added public/fonts/Inter-ExtraBold.ttf
Binary file not shown.
Binary file added public/fonts/Inter-ExtraLight.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Light.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Medium.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Regular.ttf
Binary file not shown.
Binary file added public/fonts/Inter-SemiBold.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Thin.ttf
Binary file not shown.
6 changes: 3 additions & 3 deletions public/js/components/entity-card/entity-card.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="entity-card" style="padding: 1em; border: 1px solid #dbdbdb; border-radius: 0em;">
<div class="entity-card">
<div class="entity-card-header">
<img class="entity-card-icon" ng-if="$ctrl.imageUrl" ng-src="{{ $ctrl.imageUrl }}" />
<type-tag width="48" height="48" style="margin-right:12px" ng-if="$ctrl.type" type="$ctrl.type"></type-tag>
<div class="dataset-name">
<a ng-href="{{ $ctrl.uri }}">
<p id="const" class="title is-6 search-result" ng-bind-html="$ctrl.formatResult($ctrl.label)"></p>
<p id="const" class="title search-result" ng-bind-html="$ctrl.formatResult($ctrl.label)"></p>
</a>
<div ng-if="$ctrl.uri" class="subtitle is-6 has-text-link">
<uri-breadcrumbs absolute="$ctrl.absolute" uri="$ctrl.uri"></uri-breadcrumbs>
Expand All @@ -17,6 +17,6 @@
</div>
</div>
<div class="entity-card-footer" ng-if="$ctrl.date">
<div style="color: #bbb">{{ $ctrl.date }}</div>
<div>{{ $ctrl.date }}</div>
</div>
</div>

0 comments on commit b667d81

Please sign in to comment.