-
Notifications
You must be signed in to change notification settings - Fork 1
03 lection1 new #4
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
Open
Nasty6163459
wants to merge
10
commits into
js-tasks-ru:master
Choose a base branch
from
Nasty6163459:03-lection1-new
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
6d5f213
add button and accordions
Nasty6163459 d378c83
add button and accordion
Nasty6163459 0797981
add button
Nasty6163459 1f5d0d7
add accordion
Nasty6163459 a4f7f54
changes added
Nasty6163459 74716fa
add chnges
Nasty6163459 1f45802
add changes
Nasty6163459 8bfbca5
add changes
Nasty6163459 78e9701
add changes
Nasty6163459 a5b7408
add changes
Nasty6163459 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,35 @@ | ||
| /* Стилизация кнопки */ | ||
| .button { | ||
| height: 48px; | ||
| border-radius: 8px; | ||
| font-size: 16px; | ||
| font-family: Roboto; | ||
| line-height: 100%; | ||
| font-weight: 500; | ||
| padding: 15px 15px 14px; | ||
| } | ||
| .button_primary { | ||
| background-color: var(--primary); | ||
| color: var(--color); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. --white There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. вот это еще актуально |
||
| border: 1px solid var(--primary); | ||
| transition: opacity 200ms ease-in-out, background 200ms ease-in-out; | ||
| } | ||
| .button_secondary { | ||
| background-color: var(--secondary); | ||
| color: var(--white); | ||
| border: 1px solid var(--secondary); | ||
| } | ||
| .button_alternate { | ||
| color: #495057; | ||
| background-color: var(--alternate); | ||
| border: 1px solid var(--gray-3); | ||
| transition: opacity 200ms ease-in-out, background 200ms ease-in-out; | ||
| } | ||
| .button:hover { | ||
| filter: brightness(80%); | ||
| } | ||
| .button:disabled { | ||
| opacity: 0.5; | ||
| pointer-events: none; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,20 @@ | ||
| <!DOCTYPE html> | ||
| <!-- Страница с кнопкой --> | ||
| <html lang="ru"> | ||
| <head> | ||
| <head> | ||
| <link rel="stylesheet" href="../../assets/css/main.css"> | ||
| <link rel="stylesheet" href="./button.css"> | ||
| </head> | ||
| <body> | ||
|
|
||
| </body> | ||
| </html> | ||
| <div> | ||
| <button class="button button_primary">Primary</button> | ||
| <button class="button button_secondary">Secondary</button> | ||
| <button class="button button_alternate">Alternate </button> | ||
| <button class="button button_primary"> Primary hover</button> | ||
| <button class="button button_secondary">Secondary hover</button> | ||
| <button class="button button_alternate">Alternate hover</button> | ||
| <button class="button button_primary"disabled> Primary disadled</button> | ||
| <button class="button button_secondary"disabled>Secondary disadled</button> | ||
| <button class="button button_alternate"disabled>Alternate disadled</button> | ||
| </div> | ||
| </body> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,45 @@ | ||
| /* Стилизация аккордеона */ | ||
| .accordion { | ||
| color: Black; | ||
| font-family: Inter; | ||
| font-size: 16px; | ||
| line-height: 24px; | ||
| letter-spacing: 0%; | ||
| border-width: 1px; | ||
| border-style: solid; | ||
| border-color: #acb5bd; | ||
| border-radius: 8px; | ||
| } | ||
| .accordion__section { | ||
| background-color: #FFFFFF; | ||
| } | ||
| .accordion__content { | ||
| color: #ACB5BD; | ||
| font-family: Inter; | ||
| font-size: 16px; | ||
| line-height: 50px; | ||
| letter-spacing: 0%; | ||
| } | ||
| .accordion__item { | ||
| color: Black; | ||
| font-family: Inter; | ||
| font-size: 16px; | ||
| margin-bottom: 8px; | ||
| } | ||
| .accordion__item:last-child { | ||
| margin-bottom: 0px; | ||
| } | ||
| .accordion__summary { | ||
| padding: 10px; | ||
| background-color: #FFFFFF; | ||
| border: 1px solid #ccc; | ||
| cursor: pointer; | ||
| border-radius: 8px; | ||
| } | ||
| details[open] > summary { | ||
| background-color: #e0e0e0; | ||
| border-bottom: none; | ||
| } | ||
| summary { | ||
| list-style: none; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.