Skip to content

Commit e0c92db

Browse files
chillenbergerchillenberger
authored
fixing bugs (#1218)
1 parent cad6289 commit e0c92db

29 files changed

+167
-22
lines changed

‎pgml-dashboard/static/css/scss/base/_base.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ pre {
4141
}
4242
}
4343

44+
pre[data-controller="copy"] {
45+
padding-top: 2rem;
46+
}
47+
4448
// links
4549
a {
4650
text-decoration: none;
@@ -115,3 +119,10 @@ article {
115119
user-select: none; /* Non-prefixed version, currently
116120
supported by Chrome, Edge, Opera and Firefox */
117121
}
122+
123+
// Smooth scroll does not work in firefox and turbo. New pages will not scroll to top, so we remove smooth for Firefox.
124+
@-moz-document url-prefix() {
125+
:root {
126+
scroll-behavior: auto;
127+
}
128+
}

‎pgml-dashboard/static/css/scss/base/_font.scss

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,73 @@ $font-family-base: 'silka', 'Roboto', 'sans-serif';
8585
font-display: swap;
8686
}
8787

88+
@font-face {
89+
font-family: 'inter';
90+
src: url('/dashboard/static/fonts/inter-bold.woff2') format('woff2'),
91+
url('/dashboard/static/fonts/inter-bold.woff') format('woff'),
92+
url('/dashboard/static/fonts/inter-bold.ttf') format('truetype');
93+
font-weight: 700;
94+
font-style: normal;
95+
font-display: swap;
96+
}
97+
98+
@font-face {
99+
font-family: 'inter';
100+
src: url('/dashboard/static/fonts/inter-semibold.woff2') format('woff2'),
101+
url('/dashboard/static/fonts/inter-semibold.woff') format('woff'),
102+
url('/dashboard/static/fonts/inter-semibold.ttf') format('truetype');
103+
font-weight: 600;
104+
font-style: normal;
105+
font-display: swap;
106+
}
107+
108+
@font-face {
109+
font-family: 'inter';
110+
src: url('/dashboard/static/fonts/inter-medium.woff2') format('woff2'),
111+
url('/dashboard/static/fonts/inter-medium.woff') format('woff'),
112+
url('/dashboard/static/fonts/inter-medium.ttf') format('truetype');
113+
font-weight: 500;
114+
font-style: normal;
115+
font-display: swap;
116+
}
117+
118+
@font-face {
119+
font-family: 'inter';
120+
src: url('/dashboard/static/fonts/inter-regular.woff') format('woff'),
121+
url('/dashboard/static/fonts/inter-regular.ttf') format('truetype');
122+
font-weight: 400;
123+
font-style: normal;
124+
font-display: swap;
125+
}
126+
127+
@font-face {
128+
font-family: 'inter';
129+
src: url('/dashboard/static/fonts/inter-light.woff2') format('woff2'),
130+
url('/dashboard/static/fonts/inter-light.woff') format('woff'),
131+
url('/dashboard/static/fonts/inter-light.ttf') format('truetype');
132+
font-weight: 300;
133+
font-style: normal;
134+
font-display: swap;
135+
}
136+
137+
@font-face {
138+
font-family: 'inter';
139+
src: url('/dashboard/static/fonts/inter-thin.woff2') format('woff2'),
140+
url('/dashboard/static/fonts/inter-thin.woff') format('woff'),
141+
url('/dashboard/static/fonts/inter-thin.ttf') format('truetype');
142+
font-weight: 200;
143+
font-style: normal;
144+
font-display: swap;
145+
}
146+
147+
@font-face {
148+
font-family: 'inter';
149+
src: url('/dashboard/static/fonts/inter-extralight.woff2') format('woff2'),
150+
url('/dashboard/static/fonts/inter-extralight.woff') format('woff'),
151+
url('/dashboard/static/fonts/inter-extralight.ttf') format('truetype');
152+
font-weight: 100;
153+
font-style: normal;
154+
font-display: swap;
155+
}
156+
88157
@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700;900&family=Roboto+Mono:wght@100;300;400;500;700&display=swap');

‎pgml-dashboard/static/css/scss/base/_typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ h6, .h6 {
5656
}
5757

5858
.subcopy-text {
59-
font-family: Inter;
59+
font-family: 'inter', sans-serif;
6060
font-size: 18px;
6161
line-height: 22px;
6262
}

‎pgml-dashboard/static/css/scss/components/_cards.scss

Lines changed: 69 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,79 @@
9696
}
9797
}
9898

99-
.testimonial-card {
100-
@extend .card, .card-lg, .card-light;
99+
.form-card {
100+
@extend .card, .card-lg;
101101

102-
min-width: Min(25rem, 75vw);
102+
min-width: 25vw;
103+
}
103104

104-
&> .card-body {
105-
display: flex;
106-
flex-direction: column;
107-
justify-content: space-between;
105+
@mixin gradient-border-card($primary-color, $gradient, $on_hover_only: false) {
106+
$border: 2px;
107+
backdrop-filter: none;
108+
109+
background: $primary-color;
110+
--bs-card-bg: $primary-color;
111+
--bs-card-border-color: transparent;
112+
--bs-card-color: #DEE0E7;
113+
background-clip: padding-box;
114+
border: solid $border transparent;
115+
116+
position: relative;
117+
box-sizing: border-box;
118+
119+
&:before {
120+
content: '';
121+
position: absolute;
122+
top: 0; right: 0; bottom: 0; left: 0;
123+
z-index: -1;
124+
margin: -$border;
125+
border-radius: inherit;
126+
127+
@if $on_hover_only {
128+
background: transparent;
129+
} @else {
130+
background: $gradient;
131+
}
132+
}
133+
134+
@if $on_hover_only {
135+
&:hover {
136+
&:before {
137+
background: $gradient;
138+
}
139+
}
108140
}
109141
}
110142

111-
.form-card {
112-
@extend .card, .card-lg;
143+
.main-gradient-border-card {
144+
@include gradient-border-card($gray-600, $gradient-main);
145+
}
113146

114-
min-width: 25vw;
147+
.red-gradient-border-card {
148+
@include gradient-border-card($gray-600, $gradient-pink);
149+
}
150+
151+
.main-gradient-border-card-hover {
152+
@include gradient-border-card($gray-600, $gradient-main, true);
153+
}
154+
155+
.interactive-card {
156+
border: 1px solid transparent;
157+
background-color: #{$gray-700};
158+
159+
.edit-icon {
160+
color: #{$slate-tint-100};
161+
border-bottom: 2px solid #{$slate-tint-100};
162+
}
163+
164+
&:hover, &:active, &:focus, &:focus-within, &:target {
165+
border: 1px solid #{$neon-tint-100};
166+
background-color: #{$gray-800};
167+
cursor: pointer;
168+
.edit-icon {
169+
color: #{$slate-tint-400};
170+
border-bottom: 2px solid #{$slate-tint-400};
171+
}
172+
173+
}
115174
}

‎pgml-dashboard/static/css/scss/themes/dark.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
--bs-success-border-subtle: #{$purple};
1717
--bs-success-text: #{$gray-100};
1818

19+
--bs-light-border-subtle: #{$gray-300};
20+
1921
--bs-link-color: #{$purple};
2022
--bs-link-hover-color:#{$purple};
2123

‎pgml-dashboard/static/fonts/inter-black.ttf

309 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-black.woff

153 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-bold.ttf

309 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-bold.woff

157 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-bold.woff2

108 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-extra-bold.ttf

310 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-extra-bold.woff

157 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-extra-bold.woff2

109 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-extra-light.ttf

304 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-extra-light.woff

154 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-light.ttf

304 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-light.woff

154 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-light.woff2

107 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-medium.ttf

308 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-medium.woff

156 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-regular.ttf

303 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-regular.woff

147 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-semibold.ttf

309 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-semibold.woff

157 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-semibold.woff2

109 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-thin.ttf

304 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-thin.woff

149 KB
Binary file not shown.

‎pgml-dashboard/static/fonts/inter-thin.woff2

104 KB
Binary file not shown.

‎pgml-dashboard/templates/content/dashboard/panels/notebooks.html

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
<div class="row gx-4 gy-4 position-relative">
1616
<% for notebook in notebooks { %>
1717
<div class="col-12 col-md-6 col-xxl-4">
18-
<div class="card h-100">
18+
<div class="card h-100 interactive-card">
1919
<div class="card-body h-100">
2020
<div class="d-flex flex-column justify-content-between h-100 gap-4">
2121
<div>
22-
<h6 class="h6 mb-0">
22+
<h6 class="subcopy-text fw-semibold mb-0">
2323
<%= notebook.name %>
2424
</h6>
25-
<small class="text-muted">Created by: <%= notebook.created_by() %></small>
25+
<small class="legal-text text-muted">Created by: <%= notebook.created_by() %></small>
2626
</div>
2727

2828
<div>
29-
<small class="text-muted">Last modified <%= notebook.updated_at.month() as u32 %>/<%= notebook.updated_at.day() %>/<%= notebook.updated_at.year() %></small>
29+
<small class="legal-text text-muted">Last modified <%= notebook.updated_at.month() as u32 %>/<%= notebook.updated_at.day() %>/<%= notebook.updated_at.year() %></small>
3030
</div>
3131
</div>
3232
<a href="/dashboard?tab=Notebook&id=<%= notebook.id %>" data-turbo-frame="_top" class="stretched-link">
@@ -37,21 +37,25 @@ <h6 class="h6 mb-0">
3737
<% } %>
3838
<% if new { %>
3939
<div class="col-12 col-md-6 col-xxl-4">
40-
<div class="card h-100">
41-
<div class="card-body h-100 pt-1 pe-1">
40+
<div class="card h-100 interactive-card">
41+
<div class="card-body h-100 pt-2 pe-2">
4242
<div class="d-flex flex-column h-100">
4343
<div class="d-flex justify-content-end">
4444
<a href="/dashboard/notebooks" class="btn btn-close"></a>
4545
</div>
46-
<div class="d-flex flex-column justify-content-between flex-grow-1">
46+
<div class="d-flex flex-column justify-content-between flex-grow-1 gap-4">
4747
<div>
4848
<form action="/dashboard/notebooks" method="post" data-turbo-frame="_top">
49-
<input class="form-control borderless" placeholder="Create a title" type="text" class="w-100" autofocus required name="name">
49+
<input class="subcopy-text form-control borderless" placeholder="Create a title" type="text" class="w-100" autofocus required name="name">
5050
</form>
51-
<small class="text-muted">Created by: User</small>
51+
<small class="legal-text text-muted">Created by: User</small>
5252
</div>
53-
54-
<small class="text-muted">Last modified 8/22/2023</small>
53+
<script>
54+
date = new Date();
55+
document.getElementById("todays-date").innerHTML = date.toLocaleDateString();
56+
delete date;
57+
</script>
58+
<small class="legal-text text-muted">Last modified <span id="todays-date">Today</span></small>
5559
</div>
5660
</div>
5761
</div>

0 commit comments

Comments
 (0)