Skip to content

color scheme and some general fixes #2

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
flubber2077 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

color scheme and some general fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63a72fc
color scheme and some general fixes
flubber2077 Jul 19, 2022
544a29d
Merge branch 'main' into css-styling
flubber2077 Jul 19, 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
26 changes: 19 additions & 7 deletions client/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,34 @@
}

body {
background-color: aliceblue;
background-color: #f5f5f5;
}

.main {
margin-left: 450px;
padding: 10px
margin-left: 400px;
padding: 10px;
margin-top: 190px;
}

header {
width: 100%;
position: fixed;
text-align: center;
background-color: rgb(75, 213, 213);
background-color: #94618E;
box-shadow: 0px 0px 4px;
z-index: 1;
}

h1 {
color:#49274A
}

h3 {
color:#49274A
}

.navbar {
background-color: lightgrey;
background-color: #49274A;
display: flex;
align-items: center;
}
Expand Down Expand Up @@ -53,8 +64,9 @@ header {
width: 400px;
height: 80%;
position: fixed;
background-color: rgb(188, 188, 207);
background-color: #F4DECB;
padding: 10px;
padding-top: 200px;
text-align: center;
}

Expand Down Expand Up @@ -99,4 +111,4 @@ tr:hover {background-color: grey;}

tr:nth-child(even) {background-color: #d0d0d0;}

tr:nth-child(even):hover {background-color: grey;}
tr:nth-child(even):hover {background-color: grey;}
4 changes: 2 additions & 2 deletions db/seeds.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Instrument.destroy_all
InstrumentAssignment.destroy_all

15.times do
30.times do
Musician.create!(
name: Faker::Name.unique.first_name,
rate: Faker::Number.between(from: 15, to: 200),
Expand Down Expand Up @@ -40,7 +40,7 @@
end
puts "done seeding songs"

30.times do
70.times do
InstrumentAssignment.create!(
song_id: Faker::Number.between(from: 1, to: 4),
musician_id: Faker::Number.between(from: 1, to: 15),
Expand Down