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.

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

Git week2 6 #40

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

Git week2 6 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e24aafc
modify bg-color
AliRezaHassanloo2731 Oct 10, 2024
a319105
changing opacity
AliRezaHassanloo2731 Oct 10, 2024
a1c5376
modify to made up of
AliRezaHassanloo2731 Oct 10, 2024
9771153
modify first ol to ul
AliRezaHassanloo2731 Oct 10, 2024
a95ee1d
mdify 3 to three
AliRezaHassanloo2731 Oct 10, 2024
add8ff5
mdify bg to green
AliRezaHassanloo2731 Oct 10, 2024
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
15 changes: 9 additions & 6 deletions tiny-web-page/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,21 @@
<body>
<h1>Tiny web page</h1>

<p>This is a tiny web page, consisting of just 3 files:</p>
<p>
This is a tiny web page, made up of just three files:
</p>

<ol>
<ul>
<li>index.html</li>
<li>style.css</li>
<li>logo.png</li>
</ol>
</ul>

<p>
We can use this as a place to try out some branching and merging, and to
explore when two changes <em>can</em> be merged automatically, and when
they <em>can't</em>.
We can use this as a place to try out some branching
and merging, and to explore when two changes
<em>can</em> be merged automatically, and when they
<em>can't</em>.
</p>

<p>Merge conflicts are nothing to be afraid of!</p>
Expand Down
7 changes: 4 additions & 3 deletions tiny-web-page/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand All @@ -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;
Expand Down