Skip to content

Commit

Permalink
Merge pull request #12 from buzcarter/feature/more_author_captures
Browse files Browse the repository at this point in the history
Feature/more author captures
  • Loading branch information
buzcarter authored Nov 17, 2023
2 parents 558254b + 5f73def commit c099844
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/buildRecipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const RegExes = Object.freeze({
FRACTION_SYMBOL: /([½⅓⅔¼¾⅕⅖⅗⅘⅙⅚⅐⅛⅜⅝⅞])/g,

/** Custom meta tags */
CUSTOMIZATIONS: /^\s*<!--\s+recipe-(style|theme|body-class)\s*[:=]\s*([\w-]+)\s+-->\s*$/,
CUSTOMIZATIONS: /^\s*<!--\s+recipe[- ](style|theme|body-class)\s*[:=]\s*([\w-]+)\s+-->\s*$/,
});
/* eslint-enable key-spacing */

Expand Down
2 changes: 1 addition & 1 deletion src/libs/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const RegExes = {
// #endregion

// #region Find Author Credit
AUTHOR: /^(?:#{3,6})?\s*(?:adapted by|author|by|courtesy of|from(?: the)? kitchen of|from|source)\s*[ :-]\s*([A-Z][\w '"]+)/im,
AUTHOR: /^(?:#{3,6})?\s*(?:recipe )?(?:adapted by|author|by|courtesy(?: of)?|from(?: the)? kitchen of|from|source)\s*[ :-]\s*([A-Z][\w '"]+)/im,
// #endregion
};

Expand Down
15 changes: 11 additions & 4 deletions src/static/styles/recipe.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

.complete {
font-style: italic;
opacity: 80%;
opacity: 33%;
text-decoration: line-through;
text-decoration-color: var(--color-complete-line-through);
}
Expand Down Expand Up @@ -40,13 +40,19 @@ hr {
font-style: normal;
}

.back-link::after {
content: '';
display: block;
clear: right;
}

.back-link__link:hover {
background: none;
}

.back-link__svg {
display: none;
width: 24px;
display: inline-block;
width: 18px;
}

.link-svg {
Expand Down Expand Up @@ -252,7 +258,8 @@ a:hover .link-svg {
}

.back-link__svg {
display: block;
/* display: inline-block; */
width: 24px;
}

.section--title {
Expand Down
8 changes: 6 additions & 2 deletions src/static/styles/recipesIndex.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
color: var(--color-view-svg-selected);
}

.nav-view__list {
display: inline-block;
text-wrap: nowrap;
}

/* View radio buttons */
html body .nav-view__item {
display: inline-block;
Expand Down Expand Up @@ -145,7 +150,6 @@ html body .nav-view__item {
width: var(--small-btn-length);
position: absolute;
right: calc(5px + var(--small-btn-length) + var(--search-icon-length));
;
top: calc((var(--search-input-height) - var(--small-btn-length)) / 2);
}

Expand Down Expand Up @@ -253,6 +257,7 @@ body .recipe-list .recipe-list__item--hidden {

.view--grid .recipe-list__item {
display: block;
line-height: 1.12;
margin: 0;
}

Expand All @@ -277,7 +282,6 @@ body .recipe-list .recipe-list__item--hidden {
-webkit-line-clamp: 2;
font-size: 110%;
font-weight: 700;
line-height: 1.4;
overflow: hidden;
padding: 0 1em;
text-overflow: ellipsis;
Expand Down
1 change: 1 addition & 0 deletions src/static/styles/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ img {
width: 90%;
max-width: 900px;
margin: 0 auto;
min-width: 320px;
padding: 1em 0 4em 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/static/styles/vars.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
--color-peach-30: rgb(236, 169, 111);
--color-peach-80: rgb(193, 89, 0);

--color-olive-50: rgba(255, 255, 0, 0.5);
--color-olive-50: rgb(255 250 225); /* rgba(255, 255, 0, 0.5); */
--color-olive-90: rgba(255, 255, 0, 0.25);

/*-----*: GLobal :*-----*/
Expand Down

0 comments on commit c099844

Please sign in to comment.