This is a tiny web page, consisting of just 3 files:
++ This is a tiny web page, made up of just three files: +
-- We can use this as a place to try out some branching and merging, and to - explore when two changes can be merged automatically, and when - they can't. + We can use this as a place to try out some branching + and merging, and to explore when two changes + can be merged automatically, and when they + can't.
Merge conflicts are nothing to be afraid of!
diff --git a/tiny-web-page/style.css b/tiny-web-page/style.css index 34e647b..cf03e1e 100644 --- a/tiny-web-page/style.css +++ b/tiny-web-page/style.css @@ -1,7 +1,8 @@ body { - background: rgb(55, 30, 55); + background: green; color: rgb(250, 250, 220); - font-family: "Gill Sans", "Gill Sans MT", Calibri, "Trebuchet MS", sans-serif; + font-family: "Gill Sans", "Gill Sans MT", Calibri, + "Trebuchet MS", sans-serif; padding: 1.5em 3em; font-size: 1.8rem; } @@ -14,7 +15,7 @@ h1:before { top: 0; width: 100vw; height: 100vh; - opacity: 0.3; + opacity: 0.6; background-image: url(logo.png); background-repeat: no-repeat; background-size: cover;