Skip to content

Commit

Permalink
Merge pull request #42 from mnyrop/ed-styles
Browse files Browse the repository at this point in the history
Ed styles
  • Loading branch information
edmadrid authored Mar 17, 2024
2 parents c206fcc + 71b2fb7 commit 3374043
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 30 deletions.
2 changes: 1 addition & 1 deletion site/_includes/components/heros/exhibits-carousel.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script src="{{ '/assets/vendor/siema.min.js' | url }}"></script>

<div class="not-prose text-neutral-content mx-[calc(50%-50vw)] my-8 w-auto">
<h2 class="text-center text-4xl font-bold pb-6">Exhibit Essays</h2>
<h2 class="text-center text-4xl tracking-tight font-bold pb-6">Exhibit Essays</h2>
<div class="mx-auto text-center">
<button class="prev-exhibit h-8 w-8 md:h-12 md:w-12 md:-mr-2 text-accent hover:text-neutral-content tooltip tooltip-left" data-tip="Previous">{% include "svg/arrow-left.svg" %}</button>
&nbsp;
Expand Down
4 changes: 2 additions & 2 deletions site/_includes/components/heros/home.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="hero not-prose bg-neutral text-center mx-auto ">
<div class="hero-content text-center mx-auto px-6 py-20">
<div>
<h2 class="text-6xl font-bold max-w-3xl text-secondary">A Digital History of the Chicano Studies Library</h2>
<h2 class="text-6xl tracking-tight font-bold max-w-3xl mx-auto text-secondary">A Digital History of the Chicano Studies Library</h2>

<p class="py-8 max-w-prose mx-auto">At the intersection of Chicanx Studies, Digital Humanities and Library History, Bibliopolítica chronicles the history of one of the first Chicanx collections, the UC Berkeley Chicano Studies Library (CSL).</p>
<p class="py-8 text-xl max-w-3xl mx-auto">At the intersection of Chicanx Studies, Digital Humanities and Library History, Bibliopolítica chronicles the history of one of the first Chicanx collections, the UC Berkeley Chicano Studies Library (CSL).</p>

<a href="{{ '/about/project' | url }}">
<button class="btn btn-sm btn-outline btn-accent">Read More About the Project</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{%- endfor -%}
</div>
<div class="basis-1/2">
<h2 class="text-5xl md:text-6xl font-bold">A Digital History of the Chicano Studies Library</h2>
<h2 class="text-5xl md:text-6xl tracking-tight font-bold">A Digital History of the Chicano Studies Library</h2>
<p class="py-6 max-w-prose md:text-lg md:pl-8">Ut eleifend lacus at erat efficitur bibendum. Ut laoreet elit nec dolor molestie finibus. Vivamus justo risus, scelerisque nec dolor ut, pretium fringilla purus. Nam nisl erat, tristique ac libero vitae, bibendum pellentesque nulla.</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion site/_includes/components/items/carousel.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script src="{{ '/assets/vendor/siema.min.js' | url }}"></script>

<div class="container mx-auto pt-6">
<h2 class="text-center text-4xl font-bold">Archival Materials</h2>
<h2 class="text-center text-4xl tracking-tight font-bold">Archival Materials</h2>
<div class="mx-auto text-center py-6">
<button class="prev-items h-8 w-8 md:h-12 md:w-12 md:-mr-2 text-accent hover:text-neutral-content tooltip tooltip-left" data-tip="Previous">{% include "svg/arrow-left.svg" %}</button>
&nbsp;
Expand Down
2 changes: 1 addition & 1 deletion site/_includes/layouts/exhibit.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>

<div class="text-5xl font-bold text-neutral-500">#{{ exhibit.number }}</div>
<h1 class="my-4">{{ exhibit.title }}</h1>
<h1 class="my-4 tracking-tight">{{ exhibit.title }}</h1>
{% if author %}div class="mt-4 italic">By {{ exhibit.author }}</div>{% endif %}

<div class="italic">By {{ exhibit.author | default: "Author/Curator Name(s) Here" }}</div>
Expand Down
4 changes: 2 additions & 2 deletions site/_includes/layouts/item.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<div class="flex p-5 pb-6 items-center">
<div class="basis-5/6">
<h1 class="text-2xl md:text-4xl font-bold">{{ item.label }}</h1>
<h1 class="text-2xl md:text-4xl md:tracking-tight font-bold">{{ item.label }}</h1>
</div>
<div class="basis-1/6 h-10 md:h-12 text-right flex justify-end">
<a href="{{ pagination.href.previous | default: pagination.href.last | url }}" class="-mr-1 hover:text-neutral-content text-accent tooltip tooltip-bottom" data-tip="Previous item">{% include "svg/arrow-left.svg" %}</a>
Expand All @@ -17,7 +17,7 @@ <h1 class="text-2xl md:text-4xl font-bold">{{ item.label }}</h1>
{% include "components/viewers/osd-iiif.html" %}
</div>
<div class="h-full">
<ul class="p-6 md:pl-10 space-y-2 md:basis-1/2 md:flex md:flex-col shrink min-w-80 bg-base-100 break-words">
<ul class="py-6 md:px-8 md:py-2 space-y-2 md:basis-1/2 md:flex md:flex-col shrink min-w-80 bg-base-100 break-words">
<li><b>Alternate Title(s):</b> {{ item["Alternate title"] | join: '; ' | default: 'N/A' }}</li>
<li><b>Corporate Creator(s):</b> {{ item["Corporate Creator"] | join: '; ' | default: 'N/A' }}</li>
<li><b>Person Creator(s):</b> {{ item["Person Creator"] | join: '; ' | default: 'N/A' }}</li>
Expand Down
4 changes: 2 additions & 2 deletions site/_includes/layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
---

<article class="container mx-auto px-6 py-20 max-w-3xl prose lg:prose-lg text-base-content">
<h1 class="">{{ title }}</h1>
<h1 class="tracking-tight">{{ title }}</h1>
{% if subtitle %}
<div class="-mt-8 text-xl">{{ subtitle }}</div>
{% endif %}
{% if author %}
<div class="mt-4 italic">By {{ author }}</div>
{% endif %}
{{ content }}
<div class="font-serif my-8">{{ content }}</div>
</article>
2 changes: 1 addition & 1 deletion site/_includes/partials/header.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="sticky top-0 z-50 navbar bg-base-100 drop-shadow-sm">
<div class="sticky top-0 z-50 navbar bg-base-100 border-b border-neutral">
<div class="navbar-start w-2/3 md:w-1/5">
<a class="btn btn-ghost text-3xl text-accent font-serif" href="{{ '/' | url }}"><h1>{{ site.title }}</h1></a>
</div>
Expand Down
3 changes: 2 additions & 1 deletion site/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import url('https://fonts.googleapis.com/css2?family=Alegreya:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Lora:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;700&display=swap');

@tailwind base;
@tailwind components;
Expand Down
32 changes: 16 additions & 16 deletions site/pages/browse/items.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ layout: "base"
permalink: "/browse/items/index.html"
---

<h1 class="p-5 pb-3 md:pt-5 md:pb-9 text-3xl md:text-5xl font-bold">Browse Archival Items</h1>
<h1 class="p-5 pb-3 md:pt-5 md:pb-9 text-3xl md:text-5xl md:tracking-tight font-bold">Browse Archival Items</h1>

<div class="md:flex px-5 pb-10">
<aside class="flex-none top-0 min-w-56">
<!-- mobile dropdown menu -->
<ul class="md:hidden menu menu-horizontal rounded-box border border-neutral-300 w-full mb-5">
<ul class="md:hidden menu menu-horizontal rounded-box border border-neutral w-full mb-5">
<li>
<details closed>
<summary class="font-bold">Location</summary>
Expand Down Expand Up @@ -39,23 +39,23 @@ permalink: "/browse/items/index.html"
<!-- desktop menu -->
<ul class="hidden md:block md:text-sm sticky top-20 max-h-screen overflow-y-scroll">
<li class="pb-5">
<div class="font-bold text-2xl mb-1">Location</div>
<div class="font-bold text-2xl tracking-tight mb-1">Location</div>
<ul>
<li class="border-t py-1"><a href="">Turkey</a></li>
<li class="border-t py-1"><a href="">Iran</a></li>
<li class="border-t py-1"><a href="">Middle East and North Africa</a></li>
<li class="border-t py-1"><a href="">Egypt</a></li>
<li class="border-t py-1"><a class="italic" href="">Show more</a></li>
</ul>
<li class="border-t border-neutral py-1"><a href="">Turkey</a></li>
<li class="border-t border-neutral py-1"><a href="">Iran</a></li>
<li class="border-t border-neutral py-1"><a href="">Middle East and North Africa</a></li>
<li class="border-t border-neutral py-1"><a href="">Egypt</a></li>
<li class="border-t border-neutral py-1"><a class="italic" href="">Show more</a></li>
</ul>
</li>
<li class="pb-5">
<div class="font-bold text-2xl mb-1">Object Type</div>
<li class="pb-5">
<div class="font-bold border-neutral text-2xl tracking-tight mb-1">Object Type</div>
<ul>
<li class="border-t py-1"><a href="">Manuscripts</a></li>
<li class="border-t py-1"><a class="font-bold text-accent" href="">Portraits</a></li>
<li class="border-t py-1"><a href="">Maps</a></li>
<li class="border-t py-1"><a href="">Panels</a></li>
<li class="border-t py-1"><a class="italic" href="">Show more</a></li>
<li class="border-t border-neutral py-1"><a href="">Manuscripts</a></li>
<li class="border-t border-neutral py-1"><a class="font-bold text-accent" href="">Portraits</a></li>
<li class="border-t border-neutral py-1"><a href="">Maps</a></li>
<li class="border-t border-neutral py-1"><a href="">Panels</a></li>
<li class="border-t border-neutral py-1"><a class="italic" href="">Show more</a></li>
</ul>
</li>
</ul>
Expand Down
5 changes: 3 additions & 2 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module.exports = {
theme: {
extend: {
fontFamily: {
serif: ["Alegreya", "serif"],
serif: ["Lora", "serif"],
sans: ["DM Sans", "sans"]
}
},
},
Expand All @@ -14,7 +15,7 @@ module.exports = {
{
light: {
...require("daisyui/src/theming/themes")["light"],
"base-100": "#F3EDE2", // alabaster
"base-100": "#f5f0e6", // alabaster
"base-content": "#230616", // dark purple
"accent": "#006642", // dartmouth green "#007A50", // dark spring green
"secondary": "#a6673e", // brown sugar
Expand Down

0 comments on commit 3374043

Please sign in to comment.