Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Refactor the Cotton Candy front-end onto Bootstrap #1003

Draft
wants to merge 3 commits into
base: 0.4.x
Choose a base branch
from
Draft

Refactor the Cotton Candy front-end onto Bootstrap #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
180e506
Refactor the Cotton Candy front-end onto Bootstrap.
bartfeenstra Jun 23, 2023
7591db0
meh
bartfeenstra Jun 23, 2023
f90ca8e
meh
bartfeenstra Jun 23, 2023
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
2 changes: 1 addition & 1 deletion babel.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

[jinja2: **.j2]
encoding = utf-8
extensions = jinja2.ext.do
extensions = jinja2.ext.do, jinja2.ext.loopcontrols
7 changes: 5 additions & 2 deletions betty/assets/betty.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Betty VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-06-19 18:41+0100\n"
"POT-Creation-Date: 2023-06-23 23:32+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -93,7 +93,7 @@ msgstr ""
msgid "A citation is available, but has not been published in order to protect people's privacy"
msgstr ""

msgid "A family history as told by <a href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
msgid "A family history as told by <a href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
msgstr ""

msgid "API documentation"
Expand Down Expand Up @@ -409,6 +409,9 @@ msgstr ""
msgid "Generating your site..."
msgstr ""

msgid "Go to the front page"
msgstr ""

msgid "HTTP API Documentation"
msgstr ""

Expand Down
9 changes: 6 additions & 3 deletions betty/assets/locale/fr-FR/betty.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-06-19 18:41+0100\n"
"POT-Creation-Date: 2023-06-23 23:32+0100\n"
"PO-Revision-Date: 2020-11-27 19:49+0100\n"
"Last-Translator: \n"
"Language: fr\n"
Expand Down Expand Up @@ -118,10 +118,10 @@ msgstr ""

msgid ""
"A family history as told by <a "
"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
msgstr ""
"Une histoire familiale racontée par<a "
"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"

msgid "API documentation"
msgstr "documentation de l'API"
Expand Down Expand Up @@ -493,6 +493,9 @@ msgstr ""
msgid "Generating your site..."
msgstr ""

msgid "Go to the front page"
msgstr ""

#, fuzzy
msgid "HTTP API Documentation"
msgstr "documentation de l'API"
Expand Down
9 changes: 6 additions & 3 deletions betty/assets/locale/nl-NL/betty.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-06-19 18:41+0100\n"
"POT-Creation-Date: 2023-06-23 23:32+0100\n"
"PO-Revision-Date: 2022-04-08 01:58+0100\n"
"Last-Translator: \n"
"Language: nl\n"
Expand Down Expand Up @@ -128,10 +128,10 @@ msgstr ""

msgid ""
"A family history as told by <a "
"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
msgstr ""
"Een familieverhaal verteld door <a "
"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"

msgid "API documentation"
msgstr "API-documentatie"
Expand Down Expand Up @@ -530,6 +530,9 @@ msgstr "Bezig je site te genereren naar {output_directory}."
msgid "Generating your site..."
msgstr "Je site aan het genereren..."

msgid "Go to the front page"
msgstr ""

msgid "HTTP API Documentation"
msgstr "HTTP API-documentatie"

Expand Down
9 changes: 6 additions & 3 deletions betty/assets/locale/uk/betty.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Betty VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2023-06-19 18:41+0100\n"
"POT-Creation-Date: 2023-06-23 23:32+0100\n"
"PO-Revision-Date: 2020-05-02 22:29+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: uk\n"
Expand Down Expand Up @@ -118,10 +118,10 @@ msgstr ""

msgid ""
"A family history as told by <a "
"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"
msgstr ""
"Сімейна історія, яку розповіла <a "
"href=\"https://github.com/bartfeenstra/betty\">Betty👵</a>"
"href=\"https://github.com/bartfeenstra/betty\">Betty 👵</a>"

msgid "API documentation"
msgstr "документація API"
Expand Down Expand Up @@ -491,6 +491,9 @@ msgstr ""
msgid "Generating your site..."
msgstr ""

msgid "Go to the front page"
msgstr ""

msgid "HTTP API Documentation"
msgstr "документація HTTP API"

Expand Down
17 changes: 1 addition & 16 deletions betty/extension/cotton_candy/assets/betty.extension.npm._Npm/src/accessibility.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
.visually-hidden,
.with-js .js-visually-hidden {
border: 0;
clip: rect(0 0 0 0);
clip-path: inset(50%);
height: 1px;
margin: 0;
overflow: hidden;
padding: 0;
position: absolute;
white-space: nowrap;
width: 1px;
}

.tooltip {
cursor: help;
text-decoration: dotted underline;
@extend .visually-hidden;
}
60 changes: 0 additions & 60 deletions betty/extension/cotton_candy/assets/betty.extension.npm._Npm/src/entity.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,63 +12,3 @@
.entities li.even {
background-color: #f7f7f7;
}

.featured-entities {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
}

.featured-entity {
height: 500px;
}

.featured-entity h2 {
margin: 0;
}

.featured-entity-intro {
height: calc(30% - 2rem);
padding: 1rem;
width: calc(100% - 2rem);
}

.featured-entity-feature {
height: 70%;
width: 100%;
}

.featured-entity-feature-link {
display: block;
height: 100%;
width: 100%;
}

.featured-entity-feature img {
height: 350px;
object-fit: cover;
width: 100%;
}

@media (min-width: 900px) {
.featured-entities {
grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));
}

.featured-entity {
height: 750px;
}

.featured-entity-intro {
height: calc(20% - 2rem);
padding: 1rem 3rem;
width: calc(100% - 6rem);
}

.featured-entity-feature {
height: 80%;
}

.featured-entity-feature img {
height: 600px;
}
}
9 changes: 9 additions & 0 deletions betty/extension/cotton_candy/assets/betty.extension.npm._Npm/src/feature.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.featured {
margin: 0 -1rem;
width: calc(100% + 2rem);
}

.featured-cards {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
}
50 changes: 49 additions & 1 deletion betty/extension/cotton_candy/assets/betty.extension.npm._Npm/src/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,58 @@
@import "~bootstrap/scss/functions";

// Default variable overrides.
@import "variables.scss";
@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/variables-dark";

// Default map overrides.
// ...

@import "~bootstrap/scss/maps";
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/root";
@import "~bootstrap/scss/utilities";
@import "~bootstrap/scss/reboot";
@import "~bootstrap/scss/type";
@import "~bootstrap/scss/images";
@import "~bootstrap/scss/containers";
@import "~bootstrap/scss/grid";
@import "~bootstrap/scss/helpers";
@import "~bootstrap/scss/tables";
@import "~bootstrap/scss/forms";
@import "~bootstrap/scss/buttons";
@import "~bootstrap/scss/transitions";
@import "~bootstrap/scss/dropdown";
@import "~bootstrap/scss/button-group";
@import "~bootstrap/scss/nav";
@import "~bootstrap/scss/navbar";
@import "~bootstrap/scss/card";
@import "~bootstrap/scss/accordion";
@import "~bootstrap/scss/breadcrumb";
@import "~bootstrap/scss/pagination";
@import "~bootstrap/scss/badge";
@import "~bootstrap/scss/alert";
@import "~bootstrap/scss/progress";
@import "~bootstrap/scss/list-group";
@import "~bootstrap/scss/close";
@import "~bootstrap/scss/toasts";
@import "~bootstrap/scss/modal";
@import "~bootstrap/scss/tooltip";
@import "~bootstrap/scss/popover";
@import "~bootstrap/scss/carousel";
@import "~bootstrap/scss/spinners";
@import "~bootstrap/scss/offcanvas";
@import "~bootstrap/scss/placeholders";
@import "~bootstrap/scss/utilities/api";

@import "accessibility";
@import "citation";
@import "entity";
@import "feature";
@import "file";
@import "meta";
@import "navigation";
@import "overlay";
@import "page";
@import "permalink";
@import "person";
@import "search";
Expand Down
Loading