Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fixing bugs#1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
chillenberger merged 1 commit intomasterfromdan-bug-fixes-12-5-23
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletionspgml-dashboard/static/css/scss/base/_base.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,10 @@ pre {
}
}

pre[data-controller="copy"] {
padding-top: 2rem;
}

// links
a {
text-decoration: none;
Expand DownExpand Up@@ -115,3 +119,10 @@ article {
user-select: none; /* Non-prefixed version, currently
supported by Chrome, Edge, Opera and Firefox */
}

// Smooth scroll does not work in firefox and turbo. New pages will not scroll to top, so we remove smooth for Firefox.
@-moz-document url-prefix() {
:root {
scroll-behavior: auto;
}
}
69 changes: 69 additions & 0 deletionspgml-dashboard/static/css/scss/base/_font.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,4 +85,73 @@ $font-family-base: 'silka', 'Roboto', 'sans-serif';
font-display: swap;
}

@font-face {
font-family: 'inter';
src: url('/dashboard/static/fonts/inter-bold.woff2') format('woff2'),
url('/dashboard/static/fonts/inter-bold.woff') format('woff'),
url('/dashboard/static/fonts/inter-bold.ttf') format('truetype');
font-weight: 700;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'inter';
src: url('/dashboard/static/fonts/inter-semibold.woff2') format('woff2'),
url('/dashboard/static/fonts/inter-semibold.woff') format('woff'),
url('/dashboard/static/fonts/inter-semibold.ttf') format('truetype');
font-weight: 600;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'inter';
src: url('/dashboard/static/fonts/inter-medium.woff2') format('woff2'),
url('/dashboard/static/fonts/inter-medium.woff') format('woff'),
url('/dashboard/static/fonts/inter-medium.ttf') format('truetype');
font-weight: 500;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'inter';
src: url('/dashboard/static/fonts/inter-regular.woff') format('woff'),
url('/dashboard/static/fonts/inter-regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'inter';
src: url('/dashboard/static/fonts/inter-light.woff2') format('woff2'),
url('/dashboard/static/fonts/inter-light.woff') format('woff'),
url('/dashboard/static/fonts/inter-light.ttf') format('truetype');
font-weight: 300;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'inter';
src: url('/dashboard/static/fonts/inter-thin.woff2') format('woff2'),
url('/dashboard/static/fonts/inter-thin.woff') format('woff'),
url('/dashboard/static/fonts/inter-thin.ttf') format('truetype');
font-weight: 200;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'inter';
src: url('/dashboard/static/fonts/inter-extralight.woff2') format('woff2'),
url('/dashboard/static/fonts/inter-extralight.woff') format('woff'),
url('/dashboard/static/fonts/inter-extralight.ttf') format('truetype');
font-weight: 100;
font-style: normal;
font-display: swap;
}

@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');
2 changes: 1 addition & 1 deletionpgml-dashboard/static/css/scss/base/_typography.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ h6, .h6 {
}

.subcopy-text {
font-family:Inter;
font-family:'inter', sans-serif;
font-size: 18px;
line-height: 22px;
}
Expand Down
79 changes: 69 additions & 10 deletionspgml-dashboard/static/css/scss/components/_cards.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,20 +96,79 @@
}
}

.testimonial-card {
@extend .card, .card-lg, .card-light;
.form-card {
@extend .card, .card-lg;

min-width: Min(25rem, 75vw);
min-width: 25vw;
}

&> .card-body {
display: flex;
flex-direction: column;
justify-content: space-between;
@mixin gradient-border-card($primary-color, $gradient, $on_hover_only: false) {
$border: 2px;
backdrop-filter: none;

background: $primary-color;
--bs-card-bg: $primary-color;
--bs-card-border-color: transparent;
--bs-card-color: #DEE0E7;
background-clip: padding-box;
border: solid $border transparent;

position: relative;
box-sizing: border-box;

&:before {
content: '';
position: absolute;
top: 0; right: 0; bottom: 0; left: 0;
z-index: -1;
margin: -$border;
border-radius: inherit;

@if $on_hover_only {
background: transparent;
} @else {
background: $gradient;
}
}

@if $on_hover_only {
&:hover {
&:before {
background: $gradient;
}
}
}
}

.form-card {
@extend .card, .card-lg;
.main-gradient-border-card {
@include gradient-border-card($gray-600, $gradient-main);
}

min-width: 25vw;
.red-gradient-border-card {
@include gradient-border-card($gray-600, $gradient-pink);
}

.main-gradient-border-card-hover {
@include gradient-border-card($gray-600, $gradient-main, true);
}

.interactive-card {
border: 1px solid transparent;
background-color: #{$gray-700};

.edit-icon {
color: #{$slate-tint-100};
border-bottom: 2px solid #{$slate-tint-100};
}

&:hover, &:active, &:focus, &:focus-within, &:target {
border: 1px solid #{$neon-tint-100};
background-color: #{$gray-800};
cursor: pointer;
.edit-icon {
color: #{$slate-tint-400};
border-bottom: 2px solid #{$slate-tint-400};
}

}
}
2 changes: 2 additions & 0 deletionspgml-dashboard/static/css/scss/themes/dark.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
--bs-success-border-subtle: #{$purple};
--bs-success-text: #{$gray-100};

--bs-light-border-subtle: #{$gray-300};

--bs-link-color: #{$purple};
--bs-link-hover-color:#{$purple};

Expand Down
Binary file addedpgml-dashboard/static/fonts/inter-black.ttf
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
Binary file addedpgml-dashboard/static/fonts/inter-bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file addedpgml-dashboard/static/fonts/inter-bold.woff
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
Binary file addedpgml-dashboard/static/fonts/inter-light.ttf
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
Binary file addedpgml-dashboard/static/fonts/inter-thin.ttf
View file
Open in desktop
Binary file not shown.
Binary file addedpgml-dashboard/static/fonts/inter-thin.woff
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Binary file not shown.
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@
<div class="row gx-4 gy-4 position-relative">
<% for notebook in notebooks { %>
<div class="col-12 col-md-6 col-xxl-4">
<div class="card h-100">
<div class="card h-100 interactive-card">
<div class="card-body h-100">
<div class="d-flex flex-column justify-content-between h-100 gap-4">
<div>
<h6 class="h6 mb-0">
<h6 class="subcopy-text fw-semibold mb-0">
<%= notebook.name %>
</h6>
<small class="text-muted">Created by: <%= notebook.created_by() %></small>
<small class="legal-texttext-muted">Created by: <%= notebook.created_by() %></small>
</div>

<div>
<small class="text-muted">Last modified <%= notebook.updated_at.month() as u32 %>/<%= notebook.updated_at.day() %>/<%= notebook.updated_at.year() %></small>
<small class="legal-texttext-muted">Last modified <%= notebook.updated_at.month() as u32 %>/<%= notebook.updated_at.day() %>/<%= notebook.updated_at.year() %></small>
</div>
</div>
<a href="/dashboard?tab=Notebook&id=<%= notebook.id %>" data-turbo-frame="_top" class="stretched-link">
Expand All@@ -37,21 +37,25 @@ <h6 class="h6 mb-0">
<% } %>
<% if new { %>
<div class="col-12 col-md-6 col-xxl-4">
<div class="card h-100">
<div class="card-body h-100 pt-1 pe-1">
<div class="card h-100 interactive-card">
<div class="card-body h-100 pt-2 pe-2">
<div class="d-flex flex-column h-100">
<div class="d-flex justify-content-end">
<a href="/dashboard/notebooks" class="btn btn-close"></a>
</div>
<div class="d-flex flex-column justify-content-between flex-grow-1">
<div class="d-flex flex-column justify-content-between flex-grow-1 gap-4">
<div>
<form action="/dashboard/notebooks" method="post" data-turbo-frame="_top">
<input class="form-control borderless" placeholder="Create a title" type="text" class="w-100" autofocus required name="name">
<input class="subcopy-textform-control borderless" placeholder="Create a title" type="text" class="w-100" autofocus required name="name">
</form>
<small class="text-muted">Created by: User</small>
<small class="legal-texttext-muted">Created by: User</small>
</div>

<small class="text-muted">Last modified 8/22/2023</small>
<script>
date = new Date();
document.getElementById("todays-date").innerHTML = date.toLocaleDateString();
delete date;
</script>
<small class="legal-text text-muted">Last modified <span id="todays-date">Today</span></small>
</div>
</div>
</div>
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp