Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 7 additions & 1 deletion .hooks/pre-commit
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
#!/bin/sh

if [ -e 'vendor/bin/php-cs-fixer' ]; then
lines_before=`git stash list | wc -l`
git stash push --keep-index
lines_after=`git stash list | wc -l`

composer cs:check || { echo "The PHP code is not validly formatted."; exit 1; }
git stash pop

if [ $lines_before -lt $lines_after ]; then
git stash pop
fi
fi

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
[#805](https://github.com/nextcloud/cookbook/pull/805) @jotoeri
- Fix CI test scripts
[#809](https://github.com/nextcloud/cookbook/pull/809) @christianlupus
- Update stylelint-config-prettier
[#807](https://github.com/nextcloud/cookbook/pull/807) @christianlupus


## 0.9.4 - 2021-09-29
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"prettier": "^2.2.1",
"stylelint": "^13.12.0",
"stylelint-config-idiomatic-order": "^8.1.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-sass-guidelines": "^8.0.0",
"stylelint-config-standard": "^22.0.0",
"stylelint-scss": "^3.19.0",
Expand Down
1 change: 1 addition & 0 deletions src/components/AppInvalidGuest.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export default {
div {
margin: 20px 5px;
}

.message {
font-size: x-large;
font-weight: bold;
Expand Down
3 changes: 3 additions & 0 deletions src/components/AppMain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,15 @@ export default {
padding: 0 !important;
margin-left: 0 !important;
}

#app-navigation-vue {
display: none !important;
}

#header {
display: none !important;
}

a:link::after,
a:visited::after {
content: " [" attr(href) "] ";
Expand Down
1 change: 1 addition & 0 deletions src/components/AppSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ export default {
padding: 0;
border-radius: var(--border-radius);
}

#app-settings .button p {
margin: auto;
font-size: 13px;
Expand Down
2 changes: 2 additions & 0 deletions src/components/EditInputGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ li .controls > button:last-child {
border-bottom-right-radius: var(--border-radius);
border-top-right-radius: var(--border-radius);
}

li .controls > button:last-child:not(:hover):not(:focus) {
border-right-color: var(--color-border-dark);
}
Expand All @@ -427,6 +428,7 @@ li .controls > button:last-child:not(:hover):not(:focus) {
clear: both;
content: "";
}

.step-number {
position: absolute;
top: 0;
Expand Down
1 change: 1 addition & 0 deletions src/components/EditMultiselect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ fieldset > * {
float: none;
}
}

fieldset > label {
display: inline-block;
width: 10em;
Expand Down
1 change: 1 addition & 0 deletions src/components/EditMultiselectInputGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ fieldset > * {
float: none;
}
}

fieldset > label {
display: inline-block;
width: 16em;
Expand Down
2 changes: 2 additions & 0 deletions src/components/LazyPicture.vue
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ picture .full-resolution.image-loaded {
from {
opacity: 0;
}

to {
opacity: 1;
}
Expand All @@ -171,6 +172,7 @@ picture .full-resolution.image-loaded {
from {
filter: blur(0.5rem);
}

to {
filter: blur(0);
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/RecipeCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,14 @@ export default {
max-width: 100%;
margin: 0.5rem 1rem 1rem;
}

.recipe-card a {
display: block;
height: 105px;
border-radius: 3px;
box-shadow: 0 0 3px #aaa;
}

.recipe-card a:hover {
box-shadow: 0 0 5px #888;
}
Expand Down Expand Up @@ -120,6 +122,7 @@ export default {
.recipe-card .recipe-info-date {
display: flex;
}

.recipe-info-date-icon {
height: 1.4ex;
min-height: 0;
Expand Down
1 change: 1 addition & 0 deletions src/components/RecipeEdit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@ export default {
background-color: var(--color-main-background);
opacity: 0.75;
}

.overlay.hidden {
display: none;
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/RecipeImages.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,19 @@ div {
margin-bottom: 1rem;
text-align: center;
}

img {
width: 100%;
max-width: 950px;
background-color: #bebdbd;
cursor: pointer;
}

.collapsed {
overflow: hidden;
height: 40vh;
}

.collapsed img {
display: block;
margin: 0 auto;
Expand Down
4 changes: 4 additions & 0 deletions src/components/RecipeInstruction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ li {
cursor: pointer;
white-space: pre-line;
}

li::before {
position: absolute;
top: 0;
Expand All @@ -52,12 +53,15 @@ li::before {
outline: none;
text-align: center;
}

li:hover::before {
border-color: var(--color-primary-element);
}

.done::before {
content: "✔";
}

li span,
li input[type="checkbox"] {
display: inline-block;
Expand Down
1 change: 1 addition & 0 deletions src/components/RecipeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ export default {
.recipe-sorting-item-placeholder {
display: block;
}

.ordering-item-icon {
margin-right: 0.5em;
}
Expand Down
1 change: 1 addition & 0 deletions src/components/RecipeListKeywordCloud.vue
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ export default {
font-size: 8px;
vertical-align: bottom;
}

.ordering-button {
padding: 2px 6px;
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/RecipeTimer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export default {
font-size: 1.2rem;
text-align: center;
}

.time button {
position: absolute;
top: 0;
Expand All @@ -150,6 +151,7 @@ export default {
height: 36px;
transform: translate(-50%, -50%);
}

.time h4 {
padding: 0.5rem;
border-bottom: 1px solid var(--color-border-dark);
Expand Down
19 changes: 19 additions & 0 deletions src/components/RecipeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -561,12 +561,15 @@ export default {
display: flex;
flex-wrap: wrap;
}

.header > .image {
flex: 600px 0 0;
}

.header > .meta {
margin: 0 10px;
}

.header a::after {
content: "";
}
Expand All @@ -585,26 +588,32 @@ export default {
.meta {
margin: 0 1rem;
}

.dates {
font-size: 0.9em;
}

.date {
margin-right: 1.5em;
}

.date-icon {
display: inline-block;
margin-right: 0.2em;
margin-bottom: 0.2em;
background-size: 1em;
vertical-align: middle;
}

.date-text {
vertical-align: middle;
}

.description {
font-style: italic;
white-space: pre-line;
}

.details p {
margin: 0.5em 0;
}
Expand Down Expand Up @@ -639,6 +648,7 @@ export default {
font-size: 1.2rem;
text-align: center;
}

.times .time button {
position: absolute;
top: 0;
Expand All @@ -647,6 +657,7 @@ export default {
height: 36px;
transform: translate(-50%, -50%);
}

.times .time h4 {
padding: 0.5rem;
border-bottom: 1px solid var(--color-border-dark);
Expand All @@ -661,6 +672,7 @@ export default {
section {
margin-bottom: 1rem;
}

section::after {
display: table;
clear: both;
Expand Down Expand Up @@ -692,11 +704,13 @@ aside {
aside ul {
list-style-type: none;
}

aside ul li {
margin-bottom: 0.75ex;
margin-left: 1em;
line-height: 2.5ex;
}

aside ul li span,
aside ul li input[type="checkbox"] {
display: inline-block;
Expand Down Expand Up @@ -749,12 +763,14 @@ main {
counter-reset: instruction-counter;
list-style: none;
}

.instructions .instruction {
margin-bottom: 2rem;
clear: both;
counter-increment: instruction-counter;
cursor: pointer;
}

.instructions .instruction::before {
display: block;
width: 36px;
Expand All @@ -771,9 +787,11 @@ main {
outline: none;
text-align: center;
}

.instructions .instruction:hover::before {
border-color: var(--color-primary-element);
}

.instructions .instruction.done::before {
content: "✔";
}
Expand All @@ -784,6 +802,7 @@ main {
color: var(--color-text-maxcontrast);
font-weight: 450;
}

.recipe-reference-inline:hover {
color: var(--color-main-text);
}
Expand Down