-
Notifications
You must be signed in to change notification settings - Fork 1
add solution for Buttons #10
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
JSPandaDev
wants to merge
6
commits into
js-tasks-ru:master
Choose a base branch
from
JSPandaDev:lection-1_Buttons
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
6 commits
Select commit
Hold shift + click to select a range
eb2e2c8
add solution for Buttons
ZhPavelA adef15c
correction solution buttons
ZhPavelA e89c400
correction solution for the buttons
ZhPavelA 44e415d
Merge branch 'master' into lection-1_Buttons
JSPandaDev 1930623
Исправление замечаний
ZhPavelA cff15ff
Merge remote changes
ZhPavelA 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
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,47 @@ | ||
| /* Стилизация кнопки */ | ||
|
|
||
| .button:disabled { | ||
| pointer-events: none; | ||
| opacity: 0.5; | ||
| } | ||
|
|
||
| .button { | ||
| height: 48px; | ||
| color: var(--white); | ||
| border-radius: 8px; | ||
| font-family: Roboto, sans-serif; | ||
| font-weight: 500; | ||
JSPandaDev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| font-size: 16px; | ||
| line-height: 100%; | ||
| padding: 15px 0 14px 0; | ||
| } | ||
|
|
||
| .button_primary { | ||
| background-color: var(--primary); | ||
| border: 1px solid var(--primary); | ||
| } | ||
|
|
||
| .button_secondary { | ||
| background-color: var(--secondary); | ||
| border: 1px solid var(--secondary); | ||
| transition: background 200ms ease-in-out; | ||
| } | ||
|
|
||
| .button_primary:hover { | ||
| background-color: var(--dark-blue); | ||
| } | ||
|
|
||
| .button_secondary:hover { | ||
| background-color: var(--dark-purple); | ||
| } | ||
|
|
||
| .button_alternate { | ||
| background-color: transparent; | ||
| border: 1px solid #ACB5BD; | ||
JSPandaDev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| color: var(--black); | ||
| } | ||
|
|
||
| .button_alternate:hover { | ||
| border: 1px solid var(--black); | ||
| color: var(--black); | ||
| } | ||
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,21 @@ | ||
| <!DOCTYPE html> | ||
| <!-- Страница с кнопкой --> | ||
| <html lang="ru"> | ||
| <head> | ||
| <link rel="stylesheet" href="../../assets/css/main.css"> | ||
| <link rel="stylesheet" href="./button.css"> | ||
| </head> | ||
| <body> | ||
|
|
||
| </body> | ||
| </html> | ||
| <head> | ||
| <link rel="stylesheet" href="../../assets/css/main.css"> | ||
| <link rel="stylesheet" href="./button.css"> | ||
| </head> | ||
|
|
||
| <body> | ||
| <div class="container"> | ||
| <button class="button button_primary">Primary</button> | ||
| <button class="button button_primary" disabled>Primary</button> | ||
| <button class="button button_secondary">Secondary</button> | ||
| <button class="button button_secondary" disabled>Secondary</button> | ||
| <button class="button button_alternate">Alternate</button> | ||
| <button class="button button_alternate" disabled>Alternate</button> | ||
| </div> | ||
| </body> | ||
|
|
||
| </html> |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.