Skip to content
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.

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

Migrate to vite #12

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e4f6ef6
First step done
JoeOsG Jan 30, 2021
1043a28
routes: about, episodes, home
JoeOsG Feb 12, 2021
4147138
initial commit
narvmtz Feb 18, 2021
8342e03
Adding data from API
narvmtz Feb 18, 2021
2da3d48
Merge pull request #3 from narvmtz/fetchData
narvmtz Feb 18, 2021
678085d
Adding routes
narvmtz Feb 23, 2021
ec84e92
Fixing HTML render in the show/episodes summaries
narvmtz Feb 23, 2021
37bcc3e
Merge pull request #4 from narvmtz/fetchData
narvmtz Feb 23, 2021
1c3f344
Fixing order in episode list page
narvmtz Mar 16, 2021
1cddf4c
Various calls to api to have season on its own
JoeOsG Mar 21, 2021
0cbdd31
Merge branch 'seasonsComponent' into develop
JoeOsG Mar 21, 2021
6baa729
Delete .eslintcache
narvmtz Mar 22, 2021
21269b9
ignore eslintchace
JoeOsG Mar 22, 2021
66a55aa
Updated homepage styles
narvmtz Jun 1, 2021
fa0e92e
Updated list styles
narvmtz Jun 1, 2021
f1e8c00
Adding styles
narvmtz Jun 11, 2021
38d9dc7
Adding styles to main page
narvmtz Jun 20, 2021
fc8632c
Adding descriptive classes
narvmtz Jun 20, 2021
62f9387
Added button to show/hide episodes
narvmtz Jun 20, 2021
5c3e66f
Added styles to episodes' page
narvmtz Jun 20, 2021
6266886
Added styles to each episode page
narvmtz Jun 20, 2021
73c7dd6
Added styles to full episode list page
narvmtz Jun 21, 2021
09717a4
Adding season portraits & styles to list page
narvmtz Jun 22, 2021
31fe787
Merged short list component to dataShow
narvmtz Jun 22, 2021
dced03f
Replaced useFetch hook with react-query
narvmtz Jun 22, 2021
b8f3c79
minor changes in folder's order
narvmtz Jun 22, 2021
2e6990d
test
narvmtz Jun 22, 2021
1713dda
changed http to https
narvmtz Jun 22, 2021
6a16d33
Merge pull request #7 from JoeOsG/develop
JoeOsG Jul 29, 2022
32ba0a0
Merge branch 'fetchData' of https://github.com/narvmtz/mystery-west i…
JoeOsuna Dec 19, 2022
586a9c1
Merge branch 'narvmtz-fetchData' into develop
JoeOsuna Dec 19, 2022
228c63e
Merge branch 'develop' into narvmtz-fetchData
JoeOsuna Dec 20, 2022
ca46c29
Merge branch 'develop' into narvmtz-fetchData
JoeOsuna Dec 23, 2022
f1d5451
Migrated done
JoeOsuna Jan 17, 2023
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
Prev Previous commit
Next Next commit
Added styles to episodes' page
  • Loading branch information
narvmtz committed Jun 20, 2021
commit 5c3e66f7252ceab3ec50872ddcc4a129851b86ee
124 changes: 116 additions & 8 deletions tvshow/src/sass/list.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
$hover-color: #e01d3b;
$hover-bg: rgb(255, 252, 224);
$hover-shadow: #aaaaaa;
$light: #dadada;
$dark: #919191;

$season1: rgba(34, 129, 195, 0.2);
$season2: rgba(104, 129, 183, 0.2);
$season3: rgba(171, 176, 182, 0.2);
$season4: rgba(160, 58, 132, 0.2);
$season5: rgba(101, 101, 155, 0.2);
$season6: rgba(53, 128, 157, 0.2);
$season7: rgba(0, 191, 254, 0.2);
$season8: rgba(214, 108, 154, 0.2);
$season9: rgba(245, 46, 41, 0.2);

li {
list-style: none;
}

.summaryList {
display: flex;
height: 3rem;
}

.sumListMargin:hover {
height: 3rem;
}

.episodeNum {
Expand All @@ -17,26 +38,113 @@ li {
}
}

.episodeName {
width: 15rem;
@mixin EpisodeName($width, $paddingTB, $paddingLR) {
width: $width;
margin: 0;
padding: 0.5rem 1rem;
padding: $paddingTB $paddingLR;

&:hover:not(.title) {
color: #e01d3b;
background-color: rgb(255, 252, 224);
box-shadow: 5px 8px 7px -1px #aaaaaa;
border-radius: 0.3rem;
color: $hover-color;
padding: 0.5rem;
background-color: $hover-bg;
box-shadow: 5px 8px 7px -1px $hover-shadow;
}
}
.episodeName {
@include EpisodeName(18rem, 0.5rem, 0);
}

.allSeasons {
width: 100%;
display: flex;
flex-direction: column;
justify-content: flex-start;
flex-wrap: wrap;
justify-content: center;
align-items: center;
}

.season {
width: 20rem;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

.episodeListHidden {
display: none;
}

.episodeList {
margin: 0.5rem 0 0;
padding: 0;
box-sizing: border-box;
}

@mixin buttonStyle {
font-size: 1rem;
width: 8rem;
padding: 0.5rem 1rem;
border-radius: 0.3rem;
border: none;

&:hover {
cursor: pointer;
border-top: $light 2px solid;
border-left: $light 2px solid;
border-bottom: $dark 2px solid;
border-right: $dark 2px solid;
}
}

.button-1 {
@include buttonStyle();
background-color: $season1;
}

.button-2 {
@include buttonStyle();
background-color: $season2;
}

.button-3 {
@include buttonStyle();
background-color: $season3;
}

.button-4 {
@include buttonStyle();
background-color: $season4;
}

.button-5 {
@include buttonStyle();
background-color: $season5;
}

.button-6 {
@include buttonStyle();
background-color: $season6;
}

.button-7 {
@include buttonStyle();
background-color: $season7;
}

.button-8 {
@include buttonStyle();
background-color: $season8;
}

.button-9 {
@include buttonStyle();
background-color: $season9;
}

@media (min-width: 48em) {
.summaryList {
display: flex;
height: 2.5rem;
}
}
180 changes: 176 additions & 4 deletions tvshow/src/styles/list.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tvshow/src/styles/list.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.