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.

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

DIA project #984

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
01e6471
DIA version #1
taniaisthatyou Sep 7, 2024
1ffd9e9
Poppins 1
taniaisthatyou Sep 7, 2024
637349e
Poppins 2
taniaisthatyou Sep 7, 2024
0e65f43
add DIA icons
taniaisthatyou Sep 7, 2024
6a3498d
add DIA logo
taniaisthatyou Sep 7, 2024
1ae30d3
add Version bg dark theme
taniaisthatyou Sep 7, 2024
261d4f0
add Slider 2
taniaisthatyou Sep 7, 2024
91d65ec
add Slider 3
taniaisthatyou Sep 7, 2024
a7101bc
add Slider 1
taniaisthatyou Sep 7, 2024
8d65533
add Testimonials imgs
taniaisthatyou Sep 7, 2024
f1cea8f
add WWD imgs
taniaisthatyou Sep 7, 2024
52e05be
add styles
taniaisthatyou Sep 7, 2024
21fbe68
add move switcher
taniaisthatyou Sep 8, 2024
8409060
solution move switcher
taniaisthatyou Sep 9, 2024
2bf39b1
logo
taniaisthatyou Sep 9, 2024
5c86ed8
Fixed error after submit form
taniaisthatyou Sep 9, 2024
e7981e5
method post
taniaisthatyou Sep 9, 2024
fbc7161
fixed errors
taniaisthatyou Sep 9, 2024
5a8323c
check it
taniaisthatyou Sep 9, 2024
3f07613
check solution
taniaisthatyou Sep 10, 2024
4233566
borders
taniaisthatyou Sep 10, 2024
61f9eac
solution top-bar
taniaisthatyou Sep 10, 2024
5669090
2
taniaisthatyou Sep 10, 2024
13bed47
delete aside
taniaisthatyou Sep 10, 2024
08cec6d
nav height auto
taniaisthatyou Sep 10, 2024
e9b70ec
top-bar
taniaisthatyou Sep 10, 2024
37824ed
nav 1 top-bar 2
taniaisthatyou Sep 10, 2024
cc8e662
overflow visible
taniaisthatyou Sep 10, 2024
8f7ad7b
fixed top
taniaisthatyou Sep 12, 2024
793bb3e
Merge branch 'master' into develop
taniaisthatyou Sep 12, 2024
8555120
js top
taniaisthatyou Sep 12, 2024
4196741
bg top
taniaisthatyou Sep 12, 2024
cfc967c
v3
taniaisthatyou Sep 12, 2024
6fa8032
change z-index
taniaisthatyou Sep 12, 2024
437bdd1
modified top-bar
taniaisthatyou Sep 13, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Adapt the page to the following screens:
11. `git push origin develop` - to send you code for PR.
12. Create a Pull Request (PR) from your branch `develop` to branch `master` of original repo.
13. Replace `<your_account>` with your Github username in the
[DEMO LINK](https://<your_account>.github.io/layout_dia/).
[DEMO LINK](https://taniaisthatyou.github.io/layout_dia/).
14. Copy `DEMO LINK` to the PR description.

> To update you PR repeat steps 7-11.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@linthtml/linthtml": "^0.9.5",
"@mate-academy/bemlint": "latest",
"@mate-academy/linthtml-config": "latest",
"@mate-academy/scripts": "^1.7.3",
"@mate-academy/scripts": "^1.8.6",
"@mate-academy/stylelint-config": "latest",
"@parcel/transformer-sass": "^2.12.0",
"jest": "^29.7.0",
Expand Down
Binary file added src/fonts/Poppins.zip
Binary file not shown.
93 changes: 93 additions & 0 deletions src/fonts/Poppins/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file added src/fonts/Poppins/Poppins-Black.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-BlackItalic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-Bold.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-BoldItalic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-ExtraBold.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-ExtraBoldItalic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-ExtraLight.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-ExtraLightItalic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-Italic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-Light.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-LightItalic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-Medium.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-MediumItalic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-Regular.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-SemiBold.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-SemiBoldItalic.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-Thin.ttf
Binary file not shown.
Binary file added src/fonts/Poppins/Poppins-ThinItalic.ttf
Binary file not shown.
10 changes: 10 additions & 0 deletions src/images/icons/button-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/images/icons/close-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/images/icons/menu-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/images/icons/socials/facebook-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/images/icons/socials/facebook-coral.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/images/icons/socials/facebook-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/images/icons/socials/instagram-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/images/icons/socials/instagram-coral.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/images/icons/socials/instagram-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/images/icons/socials/twitter-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/images/icons/socials/twitter-coral.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading