Skip to content

Addressed Issue 41: was annoying #74

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

Open
BryanVeith wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Addressed Issue 41: was annoying #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1029b2
Addressed Issue 41: was annoying
BryanVeith Dec 3, 2022
d177050
fixed login back to normal
BryanVeith Dec 3, 2022
4b0e5dc
fixed the login/register button
BryanVeith Dec 3, 2022
d50d8c0
issue 30 create vars for multiple colors
BryanVeith Dec 3, 2022
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
19 changes: 19 additions & 0 deletions src/components/AddIngredientView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,23 @@ export default {
.next {
text-align: right;
}

.btn-primary {
width: fit-content;
box-shadow: none;
}

.col-md-2 {
background-color: #ffffff00 !important;
}

.col-md-10,
.col-md-2 {
padding-left: 15px !important;
padding-right: 15px !important;
}

.container {
background-color: white;
}
</style>
54 changes: 1 addition & 53 deletions src/components/HomeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,57 +71,5 @@ export default {
</script>

<style scoped>
/* TODO(#16): set script to have the inital tab (IngredientFeed) button active */
/* TODO(#9): replace this icon with the ones we're using in the figma diagrams */
.container {
padding: 0 !important;
margin: 0 !important;
max-width: 100%;
}

.col-md-2,
.col-md-10 {
padding: 0;
}

.list-group {
margin: 0 !important;
}

.sectionicons {
margin-right: 10px;
}

.pb-2,
.py-2 {
padding: 1.5rem !important;
margin: 0 !important;
}

button {
width: 100%;
padding: 20px;
border: none;
background-color: white;
text-align: left;
}

button:hover {
color: green;
font-weight: bold;
}

.svg-inline--fa {
margin-right: 10px;
font-size: 20px;
}

.white {
color: black;
}

.green {
color: #008600;
font-weight: bold;
}
@import "css/HomeView.css";
</style>
38 changes: 21 additions & 17 deletions src/components/IngredientFeed.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
placeholder="Search Inventory..."
v-model="searchString"
type="text"
class="form-control"
class="form-control search-feeds"
/>
</div>
<button
Expand Down Expand Up @@ -298,7 +298,9 @@ export default {

<style scoped>
/* TODO(41): Extract css into separate file */
.container {
@import "css/FeedStyles.css";
@import "css/IngredientFeed.css";
/* .container {
Copy link
Copy Markdown
Contributor

@nashirj nashirj Dec 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're not using the commented out code, it can be deleted - this applies everywhere

padding: 0 !important;
margin: 0 !important;
background-color: #f9f9f9;
Expand Down Expand Up @@ -338,9 +340,9 @@ export default {
border-radius: 50%;
height: fit-content;
align-self: center;
}
} */

.type-of-food {
/* .type-of-food {
width: 10vw;
height: 5vw;
border-radius: 15px;
Expand Down Expand Up @@ -378,19 +380,19 @@ export default {
url("../assets/food.png");
margin: 15px;
padding: 0;
}
} */

.col-md-auto {
/* .col-md-auto {
padding: 0;
margin: 0;
}
} */

.categories {
/* .categories {
list-style: none;
display: flex;
}
} */

ul {
/* ul {
margin: 0;
display: flex;
max-width: 80vw;
Expand All @@ -402,26 +404,28 @@ ul {
h3 {
padding-left: 15px;
padding-top: 15px;
}
} */

.dropdown-menu {
/* .dropdown-menu {
display: none;
}
} */

.btn-sortBy {
/* .btn-sortBy {
color: black !important;
background-color: white !important;
border: none;
border-radius: 100px;
box-shadow: 0px 3px 3px #bdbdbd;
}

.btn-sortBy:hover,
.btn-sortBy:active,
.btn-sortBy:focus {
color: white !important;
background-color: #008600 !important;
}
} */

.dropdown-item.active,
/* .dropdown-item.active,
.dropdown-item:active {
background-color: #008600;
}
Expand All @@ -430,5 +434,5 @@ h3 {
user-select: none;
cursor: pointer;
width: 100%;
}
} */
</style>
11 changes: 10 additions & 1 deletion src/components/ModalView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,13 @@ export default {
};
</script>

<style scoped></style>
<style scoped>
.btn-secondary {
width: fit-content;
box-shadow: none;
}
.btn-primary {
width: fit-content;
box-shadow: none;
}
</style>
82 changes: 22 additions & 60 deletions src/components/RecipeFeed.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
placeholder="Search Recipes..."
v-model="searchString"
type="text"
class="form-control"
class="form-control search-feeds"
/>
</div>
<!-- TODO(59): Add a button for search -->
Expand Down Expand Up @@ -74,7 +74,7 @@
<div v-for="(recipe, name) in types" :key="name">
<div class="col-md-auto">
<button type="button" class="btn recipe-item">
<div class="col-md-auto text-center recipe-text">
<div class="col-md-auto recipe-text">
{{ name }}
</div>
</button>
Expand Down Expand Up @@ -179,49 +179,10 @@ export default {
<style scoped>
/* TODO(41): If the styles for this and ingredient are identical, make them share
css. If not, just extract this into a separate css file */
Comment on lines 180 to 181
Copy link
Copy Markdown
Contributor

@nashirj nashirj Dec 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can delete these comments for TODO(41) everywhere

.container {
padding: 0 !important;
margin: 0 !important;
background-color: #f9f9f9;
max-width: 100%;
}

.btn {
background-color: white;
border-radius: 100px;
box-shadow: 0px 3px 3px #bdbdbd;
}

.tool-bar {
margin: 0 !important;
flex-wrap: wrap;
height: fit-content;
display: flex;
justify-content: space-between;
}

.form-outline {
padding-right: 20px;
}
.form-control {
border: none;
border-radius: 100px !important;
box-shadow: 0px 3px 3px #bdbdbd;
display: inline-block;
}

.tool-bar-container {
display: flex;
padding: 20px;
}

.btn-floating {
border-radius: 50%;
height: fit-content;
align-self: center;
}
@import "css/FeedStyles.css";
@import "css/RecipeFeed.css";

.type-of-recipe {
/* .type-of-recipe {
width: 10vw;
height: 5vw;
border-radius: 15px;
Expand Down Expand Up @@ -250,7 +211,7 @@ css. If not, just extract this into a separate css file */
width: 12vw;
height: 19vw;
border-radius: 15px;
/* TODO(40): Update this to display the image from the ingredient in inventory */
/* TODO(40): Update this to display the image from the ingredient in inventory
background-size: auto;
background-image: linear-gradient(
to bottom,
Expand All @@ -262,21 +223,22 @@ css. If not, just extract this into a separate css file */
padding: 0;
}

li {
list-style: none;
} */

/*
.col-md-auto {
padding: 0;
margin: 0;
}

li {
list-style: none;
}
} */

.categories {
/* .categories {
list-style: none;
display: flex;
}
} */

ul {
/* ul {
margin: 0;
display: flex;
max-width: 80vw;
Expand All @@ -288,13 +250,13 @@ ul {
h3 {
padding-left: 15px;
padding-top: 15px;
}
} */

.dropdown-menu {
/* .dropdown-menu {
display: none;
}
} */

.btn-sortBy {
/* .btn-sortBy {
color: black !important;
background-color: white !important;
border: none;
Expand All @@ -305,9 +267,9 @@ h3 {
.btn-sortBy:focus {
color: white !important;
background-color: #008600 !important;
}
} */

.dropdown-item.active,
/* .dropdown-item.active,
.dropdown-item:active {
background-color: #008600;
}
Expand All @@ -316,5 +278,5 @@ h3 {
user-select: none;
cursor: pointer;
width: 100%;
}
} */
</style>
Loading