Skip to content

Commit c099844

Browse files
authored
Merge pull request #12 from buzcarter/feature/more_author_captures
Feature/more author captures
2 parents 558254b + 5f73def commit c099844

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

src/buildRecipes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const RegExes = Object.freeze({
8484
FRACTION_SYMBOL: /([½¼¾])/g,
8585

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

src/libs/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const RegExes = {
2323
// #endregion
2424

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

src/static/styles/recipe.css

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
.complete {
1313
font-style: italic;
14-
opacity: 80%;
14+
opacity: 33%;
1515
text-decoration: line-through;
1616
text-decoration-color: var(--color-complete-line-through);
1717
}
@@ -40,13 +40,19 @@ hr {
4040
font-style: normal;
4141
}
4242

43+
.back-link::after {
44+
content: '';
45+
display: block;
46+
clear: right;
47+
}
48+
4349
.back-link__link:hover {
4450
background: none;
4551
}
4652

4753
.back-link__svg {
48-
display: none;
49-
width: 24px;
54+
display: inline-block;
55+
width: 18px;
5056
}
5157

5258
.link-svg {
@@ -252,7 +258,8 @@ a:hover .link-svg {
252258
}
253259

254260
.back-link__svg {
255-
display: block;
261+
/* display: inline-block; */
262+
width: 24px;
256263
}
257264

258265
.section--title {

src/static/styles/recipesIndex.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
color: var(--color-view-svg-selected);
4545
}
4646

47+
.nav-view__list {
48+
display: inline-block;
49+
text-wrap: nowrap;
50+
}
51+
4752
/* View radio buttons */
4853
html body .nav-view__item {
4954
display: inline-block;
@@ -145,7 +150,6 @@ html body .nav-view__item {
145150
width: var(--small-btn-length);
146151
position: absolute;
147152
right: calc(5px + var(--small-btn-length) + var(--search-icon-length));
148-
;
149153
top: calc((var(--search-input-height) - var(--small-btn-length)) / 2);
150154
}
151155

@@ -253,6 +257,7 @@ body .recipe-list .recipe-list__item--hidden {
253257

254258
.view--grid .recipe-list__item {
255259
display: block;
260+
line-height: 1.12;
256261
margin: 0;
257262
}
258263

@@ -277,7 +282,6 @@ body .recipe-list .recipe-list__item--hidden {
277282
-webkit-line-clamp: 2;
278283
font-size: 110%;
279284
font-weight: 700;
280-
line-height: 1.4;
281285
overflow: hidden;
282286
padding: 0 1em;
283287
text-overflow: ellipsis;

src/static/styles/stylesheet.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ img {
261261
width: 90%;
262262
max-width: 900px;
263263
margin: 0 auto;
264+
min-width: 320px;
264265
padding: 1em 0 4em 0;
265266
}
266267

src/static/styles/vars.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
--color-peach-30: rgb(236, 169, 111);
2020
--color-peach-80: rgb(193, 89, 0);
2121

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

2525
/*-----*: GLobal :*-----*/

0 commit comments

Comments
 (0)