From 6399db60f149a65e3fffe296ef1cabad8a01071c Mon Sep 17 00:00:00 2001 From: Marryggk <99277162+Meronggk@users.noreply.github.com> Date: Thu, 28 Jul 2022 09:38:32 +0100 Subject: [PATCH 1/7] add header --- css/style.css | 8 ++++++++ index.html | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 75e9841e..cfdd5969 100644 --- a/css/style.css +++ b/css/style.css @@ -6,3 +6,11 @@ * for example: General styles, Navigation styles, Hero styles, Footer etc. * */ + header { + height: 50px; + width: 100%; + text-align: center; + font-family: serif; + font-size: 40px; +} + diff --git a/index.html b/index.html index 67dfc7f5..ec6551cd 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,10 @@ - - +
+
Types of Art
+ +
+ From 42bebd546d50b20235e813b94803d5cae5632d93 Mon Sep 17 00:00:00 2001 From: Marryggk <99277162+Meronggk@users.noreply.github.com> Date: Thu, 28 Jul 2022 11:56:12 +0100 Subject: [PATCH 2/7] add linds --- css/style.css | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 62 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 133 insertions(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index cfdd5969..51851912 100644 --- a/css/style.css +++ b/css/style.css @@ -6,6 +6,9 @@ * for example: General styles, Navigation styles, Hero styles, Footer etc. * */ + html { + background-color: rgb(127, 229, 255); + } header { height: 50px; width: 100%; @@ -13,4 +16,73 @@ font-family: serif; font-size: 40px; } + +ul{ + list-style: none; + padding: 0; +} +.arts { + position: fixed; + width: 100%; + z-index: 9999; + background-color: rgb(96, 211, 219); + border-bottom: 1px solid rgb(90, 211, 201); +} +.arts > .content{ + height: 4.375rem; +} +.arts .logo{ +height: 4.375rem; +width: 4.375rem; +} +.arts .link{ + float: right; + color: #838994; + font-size: 1.04rem; + margin-top: 1.7rem; +} +.arts .link li{ + display: inline-block; + margin-left: 1.563rem; +} +.arts .link li.active{ + color: #4c5058; + font-weight: 500; +} +.arts .link li:hover{ +cursor: pointer; +color: #333333; +} +.frame { + margin-top: 5.5rem; + text-align: center; +} +.float { + text-align: center; + margin-bottom: 10erm; + color: rgb(121, 9, 9); + +} + + .break h1 { + margin-top: 3.5rem; + font-size: 3.125rem; + color: rgb(26, 11, 11); + text-align: start; + font-weight: 300; + } + + .gally, .broke, .arty { + margin-top: 3.5; + font-size: 1.45rem; + } + .about { + margin-top: 10rem; + text-align: center; + color: #838994; + } + .about h3 { + margin: 0.437rem; + } + diff --git a/index.html b/index.html index ec6551cd..178f2e17 100644 --- a/index.html +++ b/index.html @@ -17,9 +17,69 @@
-
Types of Art
+
Meron Art
+ + +
+ +
+

Gallery Video

+
+
+
+ +
+

Importance of Art

+
+

What is art

+
In addition to providing commentary about the larger culture, + art makes life more manageable, tolerable and enjoyable. One may + not think about more utilitarian items and places as “art,” but + they do contribute to one's aesthetic experience.
+
+
+
+

Meaning Of Art

+
+ Art gives us meaning and helps us understand our world. Scientific studies + have proven that art appreciation improves our quality of life and makes us feel + good. When we create art, we elevate our mood, we improve our ability to problem + solve, and open our minds to new ideas.
+
+
+
+

Summary

+
When you look at the paintings made in caves and rocks by the ancient people, it + gives us an idea about their culture. So, art is a form of preserving culture. It + reflects a society's beliefs, cultural values, etc.
+
+
+
+ From 89f80f9fad4194b4f9840829a2ab2f1e77dd5cde Mon Sep 17 00:00:00 2001 From: Marryggk <99277162+Meronggk@users.noreply.github.com> Date: Thu, 28 Jul 2022 12:22:18 +0100 Subject: [PATCH 3/7] fixing nav --- css/style.css | 13 ++++++++----- index.html | 10 +++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/css/style.css b/css/style.css index 51851912..4aeadc95 100644 --- a/css/style.css +++ b/css/style.css @@ -12,9 +12,12 @@ header { height: 50px; width: 100%; - text-align: center; + text-align: start; font-family: serif; font-size: 40px; + font-weight: bolder; + font-family: serif; + color: #830837; } @@ -22,6 +25,7 @@ ul{ list-style: none; padding: 0; } + .arts { position: fixed; width: 100%; @@ -32,10 +36,7 @@ ul{ .arts > .content{ height: 4.375rem; } -.arts .logo{ -height: 4.375rem; -width: 4.375rem; -} + .arts .link{ float: right; color: #838994; @@ -84,5 +85,7 @@ color: #333333; } .about h3 { margin: 0.437rem; + color: #333333; + font-family: 'Times New Roman'; } diff --git a/index.html b/index.html index 178f2e17..db6d510f 100644 --- a/index.html +++ b/index.html @@ -23,12 +23,12 @@
- +
From 7c47105adb59ca59d82ebb64c7fce05dcf938927 Mon Sep 17 00:00:00 2001 From: Marryggk <99277162+Meronggk@users.noreply.github.com> Date: Thu, 28 Jul 2022 12:28:05 +0100 Subject: [PATCH 4/7] adding nav --- css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/style.css b/css/style.css index 4aeadc95..dd50e5cd 100644 --- a/css/style.css +++ b/css/style.css @@ -46,6 +46,7 @@ ul{ .arts .link li{ display: inline-block; margin-left: 1.563rem; + } .arts .link li.active{ color: #4c5058; @@ -54,6 +55,7 @@ ul{ .arts .link li:hover{ cursor: pointer; color: #333333; +margin-right: 2rem; } .frame { margin-top: 5.5rem; From 015eb1d2ae4b346e5f30d37e14a5fc05652ee5a4 Mon Sep 17 00:00:00 2001 From: Marryggk <99277162+Meronggk@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:57:03 +0100 Subject: [PATCH 5/7] adding links --- css/style.css | 54 ++++++++++++++++----------------------------------- index.html | 37 ++++++++++++++++++++++------------- 2 files changed, 41 insertions(+), 50 deletions(-) diff --git a/css/style.css b/css/style.css index dd50e5cd..f1c2d5ba 100644 --- a/css/style.css +++ b/css/style.css @@ -16,47 +16,15 @@ font-family: serif; font-size: 40px; font-weight: bolder; - font-family: serif; color: #830837; + margin-top: 5rem; } - + .learns { + font-family: serif; + font-size: 20px; + } -ul{ - list-style: none; - padding: 0; -} - -.arts { - position: fixed; - width: 100%; - z-index: 9999; - background-color: rgb(96, 211, 219); - border-bottom: 1px solid rgb(90, 211, 201); -} -.arts > .content{ - height: 4.375rem; -} -.arts .link{ - float: right; - color: #838994; - font-size: 1.04rem; - margin-top: 1.7rem; -} -.arts .link li{ - display: inline-block; - margin-left: 1.563rem; - -} -.arts .link li.active{ - color: #4c5058; - font-weight: 500; -} -.arts .link li:hover{ -cursor: pointer; -color: #333333; -margin-right: 2rem; -} .frame { margin-top: 5.5rem; text-align: center; @@ -67,6 +35,11 @@ margin-right: 2rem; color: rgb(121, 9, 9); } + .learn { + margin-top: 2rem; + text-decoration: solid; + color: #830837; + } .break h1 { margin-top: 3.5rem; @@ -75,7 +48,14 @@ margin-right: 2rem; text-align: start; font-weight: 300; } + .broken { + text-align: start; + margin-right: 3.5rem; + } +.broken article { + text-align: start; +} .gally, .broke, .arty { margin-top: 3.5; font-size: 1.45rem; diff --git a/index.html b/index.html index db6d510f..cfed312a 100644 --- a/index.html +++ b/index.html @@ -18,19 +18,21 @@
Meron Art
- +
+

Art is a diverse range of human activity, and resulting product, that + involves creative or imaginative talent expressive of technical + proficiency, beauty, emotional power, or conceptual ideas. +There is no generally agreed definition of what constitutes art, and +its interpretation has varied greatly throughout history and across cultures. +The three classical branches of visual art are painting, sculpture, and architecture. +Theatre, dance, and other performing arts, as well as literature, music, film and other +media such as interactive media, are included in a broader definition of the arts. +Until the 17th century, art referred to any skill or mastery and was not differentiated +from crafts or sciences. In modern usage after the 17th century, where aesthetic +considerations are paramount, the fine arts are separated and distinguished from +acquired skills in general, such as the decorative or applied arts. +

+
@@ -52,6 +54,9 @@

What is art

not think about more utilitarian items and places as “art,” but they do contribute to one's aesthetic experience.
+
+ Learn more +

Meaning Of Art

@@ -60,6 +65,9 @@

Meaning Of Art

have proven that art appreciation improves our quality of life and makes us feel good. When we create art, we elevate our mood, we improve our ability to problem solve, and open our minds to new ideas. +
+
+ Learn more

@@ -68,6 +76,9 @@

Summary

gives us an idea about their culture. So, art is a form of preserving culture. It reflects a society's beliefs, cultural values, etc.
+
+ Learn more +
From b57fd03c9f4fb24e5210622e66966004b061ccdb Mon Sep 17 00:00:00 2001 From: Marryggk <99277162+Meronggk@users.noreply.github.com> Date: Thu, 28 Jul 2022 19:08:06 +0100 Subject: [PATCH 6/7] removing article --- index.html | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index cfed312a..0e0246c7 100644 --- a/index.html +++ b/index.html @@ -32,6 +32,9 @@ considerations are paramount, the fine arts are separated and distinguished from acquired skills in general, such as the decorative or applied arts.

+
+ Learn more +
@@ -45,18 +48,6 @@

Gallery Video

-
-

Importance of Art

-
-

What is art

-
In addition to providing commentary about the larger culture, - art makes life more manageable, tolerable and enjoyable. One may - not think about more utilitarian items and places as “art,” but - they do contribute to one's aesthetic experience.
-
-
- Learn more -

Meaning Of Art

@@ -68,7 +59,9 @@

Meaning Of Art

Learn more +
+

Summary

From bc7277310bc5e9fa98aecc85e823ae1596ab9024 Mon Sep 17 00:00:00 2001 From: Marryggk <99277162+Meronggk@users.noreply.github.com> Date: Fri, 29 Jul 2022 14:47:47 +0100 Subject: [PATCH 7/7] add margin --- css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/style.css b/css/style.css index f1c2d5ba..3d4ac690 100644 --- a/css/style.css +++ b/css/style.css @@ -47,6 +47,7 @@ color: rgb(26, 11, 11); text-align: start; font-weight: 300; + } .broken { text-align: start;