Skip to content

Commit

Permalink
Remove prettier css ignore, fix styles warnings and errors
Browse files Browse the repository at this point in the history
  • Loading branch information
fadihanna123 committed Sep 19, 2024
1 parent ffcec02 commit f97bb6d
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 57 deletions.
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
node_modules/*
README.md
AUTHORS
css/
yarn.lock
.dockerignore
3 changes: 1 addition & 2 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
node_modules/
css/
node_modules/
22 changes: 11 additions & 11 deletions competition.html
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ <h1 class="myheading">Tävling</h1>
<p>
Varje år anordnar vi en tävling som resulterar på en vinnare som får
</p>
<ul class="competitionPriceList">
<ul class="competition-price-list">
<li>Gratis år datahjälp</li>
<li>HTC express mobil</li>
</ul>
Expand All @@ -117,10 +117,10 @@ <h1 class="myheading">Tävling</h1>
<!-- Skapa en tabell med ett tävlingsformulär-->
<form method="post" class="myform">
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="firsttxt">Ditt namn:*</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<input
type="text"
name="nametxt"
Expand All @@ -131,10 +131,10 @@ <h1 class="myheading">Tävling</h1>
</div>
</div>
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="mailtxt">Din e-postadress:*</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<input
aria-label="Email"
id="mailtxt"
Expand All @@ -145,10 +145,10 @@ <h1 class="myheading">Tävling</h1>
</div>
</div>
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="chooserang">Hur var ditt besök:*</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<select id="chooserang" name="rank">
<option>1</option>
<option>2</option>
Expand All @@ -164,20 +164,20 @@ <h1 class="myheading">Tävling</h1>
</div>
</div>
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="whytxt"
>Varför vill du delta i den här tävlingen:*</label
>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<textarea cols="50" id="whytxt" rows="4" name="whytxt"></textarea>
</div>
</div>
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="other">Övriga frågor/kommentarer:</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<textarea id="other" cols="50" rows="5" name="other"></textarea>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ <h1 class="myheading">Kontakta oss</h1>
</p>
<form method="post" class="myform">
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="nametxt">Ditt namn:*</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<input
aria-label="Namn"
type="text"
Expand All @@ -127,10 +127,10 @@ <h1 class="myheading">Kontakta oss</h1>
</div>
</div>
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="mail">Din e-postadress:*</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<input
aria-label="Email"
id="mail"
Expand All @@ -140,10 +140,10 @@ <h1 class="myheading">Kontakta oss</h1>
</div>
</div>
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="rang">Hur var ditt besök:*</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<select id="rang" name="rang">
<option>1</option>
<option>2</option>
Expand All @@ -159,10 +159,10 @@ <h1 class="myheading">Kontakta oss</h1>
</div>
</div>
<div class="row">
<div class="labelCol">
<div class="label-col">
<label for="othertxt">Meddelande</label>
</div>
<div class="formFieldCol">
<div class="form-field-col">
<textarea
cols="50"
id="othertxt"
Expand Down
87 changes: 52 additions & 35 deletions css/main.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
@charset "UTF-8";

/* Styles created by Fadi Hanna */
#container {
/* Font list of which fonts browsers should use */
font-family: "Times New Roman", times, serif;
/* Typsnittlista på vilka typsnitt webbläsare ska använda */
margin: 10px;
transition: 0.3s;
}
Expand All @@ -12,23 +13,25 @@ label {
}

textarea :focus,
input[type=text]:focus,
input[type=password]:focus,
input[type=datetime]:focus,
input[type=datetime-local]:focus,
input[type=date]:focus,
input[type=month]:focus,
input[type=time]:focus,
input[type=week]:focus,
input[type=number]:focus,
input[type=email]:focus,
input[type=url]:focus,
input[type=search]:focus,
input[type=tel]:focus,
input[type=color]:focus,
input[type="text"]:focus,
input[type="password"]:focus,
input[type="datetime"]:focus,
input[type="datetime-local"]:focus,
input[type="date"]:focus,
input[type="month"]:focus,
input[type="time"]:focus,
input[type="week"]:focus,
input[type="number"]:focus,
input[type="email"]:focus,
input[type="url"]:focus,
input[type="search"]:focus,
input[type="tel"]:focus,
input[type="color"]:focus,
.uneditable-input:focus {
border-color: #0275d8;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px #add8e6;
box-shadow:
0 1px 1px rgba(0 0 0 7.5%) inset,
0 0 8px #add8e6;
outline: 0 none;
transition: 0.3s;
}
Expand All @@ -39,8 +42,8 @@ input[type=color]:focus,
}

.main {
/* Make text size 20px */
font-size: 20px;
/* Gör textstorlek till 20px */
background-color: #5bc0de;
margin: 10px;
text-align: center;
Expand Down Expand Up @@ -97,23 +100,26 @@ button {
.myform {
margin: 0 auto;
}

.myform .row {
width: 50%;
margin: 0 auto;
}

#srch {
/* Make the width of the search bar 180% */
width: 180%;
/* Gör bredden av sökfältet till 180% */

/* Remove the round corner of the search bar */
border-radius: 0;
/* Ta bort sökfältets runda hörn */
}

#srchbtn {
/* Remove round corner search button */
border-radius: 0;
/* Ta bort sökknappens runda hörn */
}
}

.myheading {
font-size: 35px;
color: #3a1627;
Expand Down Expand Up @@ -147,7 +153,7 @@ a {
transition: 0.3s;
}

.competitionPriceList li {
.competition-price-list li {
list-style-type: disc;
list-style-position: inside;
}
Expand All @@ -171,10 +177,11 @@ img {
}

footer {
/* Make the footer white */
background-color: #1a0000;
/* Gör sidfoten till vit */

/* Make the height of the text 30% */
height: 30%;
/* Gör höjden av texten till 30% */
color: #f7f7f7;
margin: 10px;
text-align: center;
Expand Down Expand Up @@ -208,6 +215,7 @@ footer {
width: 30%;
}
}

@media screen and (max-width: 1900px) {
.logobild {
width: 100%;
Expand All @@ -221,6 +229,7 @@ footer {
flex-direction: column;
}
}

#mainnav {
display: -webkit-box;
display: -ms-flex;
Expand All @@ -233,11 +242,13 @@ footer {
text-align: center;
transition: 0.3s all;
}

#mainnav a {
/* Create rounded corners around the links */
border-radius: 10px;
/* Skapa runda hörn runt länkarna */

/* Add distance between links 6px */
padding: 6px;
/* Lägg avstånd mellan länkarna 6px */
background: #292b2c;
border: 1px solid #292b2c;
color: #f7f7f7;
Expand All @@ -254,14 +265,15 @@ footer {
flex-direction: column;
}
}
.labelCol {

.label-col {
width: 500px;
margin-bottom: 15px;
transition: 0.3s all;
display: inline-block;
}

.formFieldCol {
.form-field-col {
width: 500px;
margin-bottom: 15px;
transition: 0.3s all;
Expand All @@ -282,17 +294,17 @@ footer {

@media screen and (max-width: 1200px) {
h1,
img {
img {
width: 100%;
}

#container {
/* Font list of which fonts browsers should use */
font-family: "Times New Roman", times, serif;
/* Typsnittlista på vilka typsnitt webbläsare ska använda */
}

.labelCol,
.formFieldCol {
.label-col,
.form-field-col {
width: 100%;
}

Expand All @@ -302,38 +314,43 @@ img {
flex-direction: column;
}
}

#abouttxt {
/* Make text size 20px */
font-size: 20px;
/* Gör textstorlek till 20px */
margin: 10px;
transition: 0.3s all;
}

#pricetable {
/* Move price table to center */
margin: 0 auto;
/* Flytta pristabell till mitten */
margin-bottom: 10px;
width: 98%;
padding: 10px;
transition: 0.3s;
}

#pricetable table,
#pricetable th,
#pricetable tr,
#pricetable td {
border: 1px solid #292b2c;

/* Make the table borders collapse to a single border in the table. */
border-collapse: collapse;
/* Gör att tabellgränserna ska kollapsa till en enda gräns i tabellen. */
transition: 0.3s;
}

#pricetable td:hover {
background: #292b2c;
color: #fff;
transition: 0.3s all;
}

#pricetable thead {
border: 1px solid #292b2c;
background: #292b2c;
color: #fff;
transition: 0.3s;
}
}

0 comments on commit f97bb6d

Please sign in to comment.