From c319bb6c5f2b8270b0c2469dbbcc3c8b02e056c1 Mon Sep 17 00:00:00 2001 From: Nez27 Date: Thu, 6 Jul 2023 09:32:05 +0700 Subject: [PATCH] Change folder name and fix style --- .editorconfig | 11 - .github/workflows/preview.yml | 0 .github/workflows/production.yml | 0 .gitignore | 0 .prettierrc | 7 + README.md | 0 package-lock.json | 0 package.json | 0 src/assets/images/avatar-1.png | Bin src/assets/images/avatar-2.png | Bin src/assets/images/avatar-3.png | Bin src/assets/images/avatar-4.png | Bin src/assets/images/conversation.png | Bin src/assets/images/facebook.svg | 0 src/assets/images/header-image.png | Bin src/assets/images/instagram.svg | 0 src/assets/images/logo-1.png | Bin src/assets/images/logo-2.png | Bin src/assets/images/logo-3.png | Bin src/assets/images/logo-4.png | Bin src/assets/images/logo-5.png | Bin src/assets/images/logo.svg | 0 src/assets/images/pinterest.svg | 0 src/assets/images/security.png | Bin src/assets/images/tiktok.svg | 0 src/assets/images/twitter.svg | 0 src/assets/images/wechat.svg | 0 src/assets/images/youtube.svg | 0 src/{font => fonts}/CrimsonText-700.ttf | Bin src/{font => fonts}/CrimsonText-Regular.ttf | Bin src/{font => fonts}/WorkSans-500.ttf | Bin src/{font => fonts}/WorkSans-700.ttf | Bin src/{font => fonts}/WorkSans-Regular.ttf | Bin src/index.html | 494 +++++++----------- src/{style => styles}/abstracts/variables.css | 0 src/{style/base => styles/bases}/reset.css | 0 src/{style/base => styles/bases}/typo.css | 10 +- src/{style => styles}/main.css | 17 +- vercel.json | 0 39 files changed, 221 insertions(+), 318 deletions(-) delete mode 100644 .editorconfig mode change 100644 => 100755 .github/workflows/preview.yml mode change 100644 => 100755 .github/workflows/production.yml mode change 100644 => 100755 .gitignore create mode 100755 .prettierrc mode change 100644 => 100755 README.md mode change 100644 => 100755 package-lock.json mode change 100644 => 100755 package.json mode change 100644 => 100755 src/assets/images/avatar-1.png mode change 100644 => 100755 src/assets/images/avatar-2.png mode change 100644 => 100755 src/assets/images/avatar-3.png mode change 100644 => 100755 src/assets/images/avatar-4.png mode change 100644 => 100755 src/assets/images/conversation.png mode change 100644 => 100755 src/assets/images/facebook.svg mode change 100644 => 100755 src/assets/images/header-image.png mode change 100644 => 100755 src/assets/images/instagram.svg mode change 100644 => 100755 src/assets/images/logo-1.png mode change 100644 => 100755 src/assets/images/logo-2.png mode change 100644 => 100755 src/assets/images/logo-3.png mode change 100644 => 100755 src/assets/images/logo-4.png mode change 100644 => 100755 src/assets/images/logo-5.png mode change 100644 => 100755 src/assets/images/logo.svg mode change 100644 => 100755 src/assets/images/pinterest.svg mode change 100644 => 100755 src/assets/images/security.png mode change 100644 => 100755 src/assets/images/tiktok.svg mode change 100644 => 100755 src/assets/images/twitter.svg mode change 100644 => 100755 src/assets/images/wechat.svg mode change 100644 => 100755 src/assets/images/youtube.svg rename src/{font => fonts}/CrimsonText-700.ttf (100%) mode change 100644 => 100755 rename src/{font => fonts}/CrimsonText-Regular.ttf (100%) mode change 100644 => 100755 rename src/{font => fonts}/WorkSans-500.ttf (100%) mode change 100644 => 100755 rename src/{font => fonts}/WorkSans-700.ttf (100%) mode change 100644 => 100755 rename src/{font => fonts}/WorkSans-Regular.ttf (100%) mode change 100644 => 100755 mode change 100644 => 100755 src/index.html rename src/{style => styles}/abstracts/variables.css (100%) mode change 100644 => 100755 rename src/{style/base => styles/bases}/reset.css (100%) mode change 100644 => 100755 rename src/{style/base => styles/bases}/typo.css (54%) mode change 100644 => 100755 rename src/{style => styles}/main.css (95%) mode change 100644 => 100755 mode change 100644 => 100755 vercel.json diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index dad6b58..0000000 --- a/.editorconfig +++ /dev/null @@ -1,11 +0,0 @@ -# editorconfig.org - -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml old mode 100644 new mode 100755 diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.prettierrc b/.prettierrc new file mode 100755 index 0000000..9fb01bb --- /dev/null +++ b/.prettierrc @@ -0,0 +1,7 @@ +{ + "bracketSameLine": false, + "bracketSpacing": true, + "embeddedLanguageFormatting": "auto", + "printWidth": 120, + "tabWidth": 2 +} diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/src/assets/images/avatar-1.png b/src/assets/images/avatar-1.png old mode 100644 new mode 100755 diff --git a/src/assets/images/avatar-2.png b/src/assets/images/avatar-2.png old mode 100644 new mode 100755 diff --git a/src/assets/images/avatar-3.png b/src/assets/images/avatar-3.png old mode 100644 new mode 100755 diff --git a/src/assets/images/avatar-4.png b/src/assets/images/avatar-4.png old mode 100644 new mode 100755 diff --git a/src/assets/images/conversation.png b/src/assets/images/conversation.png old mode 100644 new mode 100755 diff --git a/src/assets/images/facebook.svg b/src/assets/images/facebook.svg old mode 100644 new mode 100755 diff --git a/src/assets/images/header-image.png b/src/assets/images/header-image.png old mode 100644 new mode 100755 diff --git a/src/assets/images/instagram.svg b/src/assets/images/instagram.svg old mode 100644 new mode 100755 diff --git a/src/assets/images/logo-1.png b/src/assets/images/logo-1.png old mode 100644 new mode 100755 diff --git a/src/assets/images/logo-2.png b/src/assets/images/logo-2.png old mode 100644 new mode 100755 diff --git a/src/assets/images/logo-3.png b/src/assets/images/logo-3.png old mode 100644 new mode 100755 diff --git a/src/assets/images/logo-4.png b/src/assets/images/logo-4.png old mode 100644 new mode 100755 diff --git a/src/assets/images/logo-5.png b/src/assets/images/logo-5.png old mode 100644 new mode 100755 diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg old mode 100644 new mode 100755 diff --git a/src/assets/images/pinterest.svg b/src/assets/images/pinterest.svg old mode 100644 new mode 100755 diff --git a/src/assets/images/security.png b/src/assets/images/security.png old mode 100644 new mode 100755 diff --git a/src/assets/images/tiktok.svg b/src/assets/images/tiktok.svg old mode 100644 new mode 100755 diff --git a/src/assets/images/twitter.svg b/src/assets/images/twitter.svg old mode 100644 new mode 100755 diff --git a/src/assets/images/wechat.svg b/src/assets/images/wechat.svg old mode 100644 new mode 100755 diff --git a/src/assets/images/youtube.svg b/src/assets/images/youtube.svg old mode 100644 new mode 100755 diff --git a/src/font/CrimsonText-700.ttf b/src/fonts/CrimsonText-700.ttf old mode 100644 new mode 100755 similarity index 100% rename from src/font/CrimsonText-700.ttf rename to src/fonts/CrimsonText-700.ttf diff --git a/src/font/CrimsonText-Regular.ttf b/src/fonts/CrimsonText-Regular.ttf old mode 100644 new mode 100755 similarity index 100% rename from src/font/CrimsonText-Regular.ttf rename to src/fonts/CrimsonText-Regular.ttf diff --git a/src/font/WorkSans-500.ttf b/src/fonts/WorkSans-500.ttf old mode 100644 new mode 100755 similarity index 100% rename from src/font/WorkSans-500.ttf rename to src/fonts/WorkSans-500.ttf diff --git a/src/font/WorkSans-700.ttf b/src/fonts/WorkSans-700.ttf old mode 100644 new mode 100755 similarity index 100% rename from src/font/WorkSans-700.ttf rename to src/fonts/WorkSans-700.ttf diff --git a/src/font/WorkSans-Regular.ttf b/src/fonts/WorkSans-Regular.ttf old mode 100644 new mode 100755 similarity index 100% rename from src/font/WorkSans-Regular.ttf rename to src/fonts/WorkSans-Regular.ttf diff --git a/src/index.html b/src/index.html old mode 100644 new mode 100755 index 298d6cb..ac32a17 --- a/src/index.html +++ b/src/index.html @@ -4,318 +4,214 @@ Practice 01 - - + + -
-
- -
-
-
- - -
-
- - -
-
- Welcome -

- Lorem ipsum dolor sit amet consectetur -

-

- Lorem ipsum, dolor sit amet consectetur adipisicing elit. - Suscipit nemo hic quos, ab, dolor aperiam nobis cum est eos - error ipsum, voluptate culpa nesciunt delectus iste? -

- Explore -
- Header Image -
-
-
- +
+
- - + - -
-
- - Conversation Image - - -
-

- Lorem ipsum dolor sit amet consectetur -

-

- Lorem ipsum, dolor sit amet consectetur adipisicing elit. - Suscipit nemo hic quos, ab, dolor aperiam nobis cum est eos - error ipsum, voluptate culpa nesciunt delectus iste? -

- Learn More -
-
-
- - -
-
- -
-

- Lorem ipsum dolor sit amet consectetur -

-

- Lorem ipsum, dolor sit amet consectetur adipisicing elit. - Suscipit nemo hic quos, ab, dolor aperiam nobis cum est eos - error ipsum, voluptate culpa nesciunt delectus iste? -

- Learn More -
- - - Image Security -
-
- - -
-
- -
- Team -

- Our talents -

-

- Lorem ipsum, dolor sit amet consectetur Suscipit nemo hic quos, - ab, -

-
- - -
- -
-
- Avatar Image -
- Peg legge - Ceo -
-
-
- - -
-
- Avatar Image -
- Richard guerra - Cto -
-
-
- - -
-
- Avatar Image -
- Alexandra stolz - Designer -
-
-
- - -
-
- Avatar Image -
- Janet bray - Developer -
-
-
-
- View Team + +
+
+ Welcome +

Lorem ipsum dolor sit amet consectetur

+

+ Lorem ipsum, dolor sit amet consectetur adipisicing elit. Suscipit nemo hic quos, ab, dolor aperiam nobis + cum est eos error ipsum, voluptate culpa nesciunt delectus iste? +

+ Explore
+ Header Image
+
- -
-
-
-
- Facebook logo - Instagram logo - - Twitter logo - - - Pinterest logo - - - Tiktok logo - - - Wechat logo - - - Youtube Logo - -
+
+ + + + +
+
+ + Conversation Image + + +
+

Lorem ipsum dolor sit amet consectetur

+

+ Lorem ipsum, dolor sit amet consectetur adipisicing elit. Suscipit nemo hic quos, ab, dolor aperiam nobis + cum est eos error ipsum, voluptate culpa nesciunt delectus iste? +

+ Learn More
-
+ + + +
+
+ +
+

Lorem ipsum dolor sit amet consectetur

+

+ Lorem ipsum, dolor sit amet consectetur adipisicing elit. Suscipit nemo hic quos, ab, dolor aperiam nobis + cum est eos error ipsum, voluptate culpa nesciunt delectus iste? +

+ Learn More +
+ + + Image Security +
+
+ + +
+
+ +
+ Team +

Our talents

+

Lorem ipsum, dolor sit amet consectetur Suscipit nemo hic quos, ab,

+
+ + +
+ +
+
+ Avatar Image +
+ Peg legge + Ceo +
+
+
+ + +
+
+ Avatar Image +
+ Richard guerra + Cto +
+
+
+ + +
+
+ Avatar Image +
+ Alexandra stolz + Designer +
+
+
+ + +
+
+ Avatar Image +
+ Janet bray + Developer +
+
+
+
+ View Team +
+
+ + + diff --git a/src/style/abstracts/variables.css b/src/styles/abstracts/variables.css old mode 100644 new mode 100755 similarity index 100% rename from src/style/abstracts/variables.css rename to src/styles/abstracts/variables.css diff --git a/src/style/base/reset.css b/src/styles/bases/reset.css old mode 100644 new mode 100755 similarity index 100% rename from src/style/base/reset.css rename to src/styles/bases/reset.css diff --git a/src/style/base/typo.css b/src/styles/bases/typo.css old mode 100644 new mode 100755 similarity index 54% rename from src/style/base/typo.css rename to src/styles/bases/typo.css index 2a0ae5f..714b45d --- a/src/style/base/typo.css +++ b/src/styles/bases/typo.css @@ -1,25 +1,25 @@ @font-face { font-family: CrimsonText-Regular; - src: url(../../font/CrimsonText-Regular.ttf); + src: url(../../fonts/CrimsonText-Regular.ttf); } @font-face { font-family: CrimsonText-Bold; - src: url(../../font/CrimsonText-700.ttf); + src: url(../../fonts/CrimsonText-700.ttf); font-weight: 700; } @font-face { font-family: WorkSans-Medium; - src: url(../../font/WorkSans-500.ttf); + src: url(../../fonts/WorkSans-500.ttf); } @font-face { font-family: WorkSans-Bold; - src: url(../../font/WorkSans-700.ttf); + src: url(../../fonts/WorkSans-700.ttf); } @font-face { font-family: WorkSans-Regular; - src: url(../../font/WorkSans-Regular.ttf); + src: url(../../fonts/WorkSans-Regular.ttf); } diff --git a/src/style/main.css b/src/styles/main.css old mode 100644 new mode 100755 similarity index 95% rename from src/style/main.css rename to src/styles/main.css index bf6cbac..454ac19 --- a/src/style/main.css +++ b/src/styles/main.css @@ -1,5 +1,5 @@ @import url("./abstracts/variables.css"); -@import url("./base/typo.css"); +@import url("./bases/typo.css"); * { line-height: 125%; @@ -73,12 +73,23 @@ } /* Header */ + +.header { + padding-top: 35px; + padding-bottom: 40px; +} + +.logo-link { + height: auto; +} + .background { background-color: var(--primary-color); } .container { - padding: 37px 0px; + /* padding-top: 35px; + padding-bottom: 40px; */ margin: auto; color: var(--white); } @@ -292,4 +303,4 @@ line-height: 125%; color: var(--white); -} \ No newline at end of file +} diff --git a/vercel.json b/vercel.json old mode 100644 new mode 100755