Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TheOdinProject/css-exercises
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: aruegge/css-exercises
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 7 commits
  • 9 files changed
  • 1 contributor

Commits on Jun 15, 2024

  1. Copy the full SHA
    af3e1b5 View commit details
  2. Copy the full SHA
    b972b09 View commit details
  3. Copy the full SHA
    e37f593 View commit details
  4. Style buttons for exercise

    aruegge committed Jun 15, 2024
    Copy the full SHA
    035c3fb View commit details

Commits on Jun 16, 2024

  1. Style CSS to reflect exercise

    aruegge committed Jun 16, 2024
    Copy the full SHA
    b705484 View commit details

Commits on Jun 18, 2024

  1. Copy the full SHA
    35a4ae8 View commit details
  2. Copy the full SHA
    3e36e6d View commit details
10 changes: 9 additions & 1 deletion foundations/01-css-methods/index.html
Original file line number Diff line number Diff line change
@@ -4,11 +4,19 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="styles.css">
<title>Methods for Adding CSS</title>
<style>
p {
background-color: green;
color: white;
font-size: 18px;
}
</style>
</head>
<body>
<div>Style me via the external method!</div>
<p>I would like to be styled with the internal method, please.</p>
<button>Inline Method</button>
<button style="background-color: orange; font-size: 18px;">Inline Method</button>
</body>
</html>
8 changes: 8 additions & 0 deletions foundations/01-css-methods/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
div {
background-color: red;
color: white;
font-size: 32px;
text-align: center;
font-weight: bold;
}

10 changes: 5 additions & 5 deletions foundations/02-class-id-selectors/index.html
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@
<link rel="stylesheet" href="style.css">
</head>
<body>
<p>Number 1 - I'm a class!</p>
<div>Number 2 - I'm one ID.</div>
<p>Number 3 - I'm a class, but cooler!</p>
<div>Number 4 - I'm another ID.</div>
<p>Number 5 - I'm a class!</p>
<p class="odd-numbered">Number 1 - I'm a class!</p>
<div id="number-2">Number 2 - I'm one ID.</div>
<p class="odd-numbered number-3">Number 3 - I'm a class, but cooler!</p>
<div id="number-4">Number 4 - I'm another ID.</div>
<p class="odd-numbered">Number 5 - I'm a class!</p>
</body>
</html>
19 changes: 19 additions & 0 deletions foundations/02-class-id-selectors/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.odd-numbered {
background-color: rgb(255, 176, 176);
font-family: Verdana, "DejaVu Sans", sans-serif;
}

.number-3 {
font-size: 24px;
}

#number-2 {
color: blue;
font-size: 32px
}

#number-4 {
background-color: lightgreen;
font-size: 24px;
font-weight: bold;
}
4 changes: 2 additions & 2 deletions foundations/03-grouping-selectors/index.html
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<link rel="stylesheet" href="style.css">
</head>
<body>
<button>Click Me!</button>
<button>No, Click Me!</button>
<button class="black">Click Me!</button>
<button class="yellow">No, Click Me!</button>
</body>
</html>
15 changes: 15 additions & 0 deletions foundations/03-grouping-selectors/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.black,
.yellow {
font-size: 28px;
font-family: Helvetica, "Times New Roman", sans-serif;
}

.black {
background-color: black;
color: white;
font-weight: bold
}

.yellow {
background-color: yellow;
}
12 changes: 11 additions & 1 deletion foundations/04-chaining-selectors/style.css
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
/* Add CSS Styling */
/* Add CSS Styling */

.avatar.proportioned {
height: auto;
width: 300px;
}

.avatar.distorted {
height: 400px;
width: 200px;
}
6 changes: 6 additions & 0 deletions foundations/05-descendant-combinator/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.container .text {
background-color: yellow;
color: red;
font-size: 20px;
text-align: center;
}
12 changes: 6 additions & 6 deletions foundations/06-cascade-fix/style.css
Original file line number Diff line number Diff line change
@@ -8,16 +8,16 @@ body {
font-weight: 800;
}

.para {
font-size: 22px;
}

.small-para {
font-size: 14px;
font-weight: 800;
}

.para {
font-size: 22px;
}

.confirm {
.button.confirm {
background: green;
color: white;
font-weight: bold;
@@ -29,7 +29,7 @@ body {
font-size: 20px;
}

.child {
.text .child {
color: rgb(0, 0, 0);
font-weight: 800;
font-size: 14px;