-
Notifications
You must be signed in to change notification settings - Fork 2
feat(main-page): redesign using new components #24
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
oostap1985
wants to merge
5
commits into
main
Choose a base branch
from
feat/65099006_main-page
base: main
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.
+1,408
−409
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b81a3ff
feat(main-page): redesign using new components
oostap1985 280bf58
fix(main-page): corrections after comments
oostap1985 844ee23
fix(main-page): add key-features, comparison, and installation sections
oostap1985 f19a9ec
Merge branch 'main' into feat/65099006_main-page
oostap1985 c907410
fix(main-page): post-review corrections
oostap1985 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,43 +1,53 @@ | ||
| [ | ||
| { | ||
| "artId":"ghost", | ||
| "bgColor":"Bgc-$artGhost" | ||
| "bgColor":"Bgc-$artGhost", | ||
| "showInMain": true | ||
| }, | ||
| { | ||
| "artId":"flushed-emoji", | ||
| "bgColor":"Bgc-$artFlushedEmoji" | ||
| "bgColor":"Bgc-$artFlushedEmoji", | ||
| "showInMain": true | ||
| }, | ||
| { | ||
| "artId":"penrose-triangle", | ||
| "bgColor":"Bgc-$artPenroseTriangle" | ||
| "bgColor":"Bgc-$artPenroseTriangle", | ||
| "showInMain": true | ||
| }, | ||
| { | ||
| "artId":"exploding-head", | ||
| "bgColor":"Bgc-$artExplodingHead" | ||
| "bgColor":"Bgc-$artExplodingHead", | ||
| "showInMain": true | ||
| }, | ||
| { | ||
| "artId":"clown-emoji", | ||
| "bgColor":"Bgc-$artClownEmoji" | ||
| "bgColor":"Bgc-$artClownEmoji", | ||
| "showInMain": false | ||
| }, | ||
| { | ||
| "artId":"mushroom", | ||
| "bgColor":"Bgc-$artMushroom" | ||
| "bgColor":"Bgc-$artMushroom", | ||
| "showInMain": true | ||
| }, | ||
| { | ||
| "artId":"robot-hare", | ||
| "bgColor":"Bgc-$artRobotHare" | ||
| "bgColor":"Bgc-$artRobotHare", | ||
| "showInMain": true | ||
| }, | ||
| { | ||
| "artId":"funny-cake", | ||
| "bgColor":"Bgc-$artFunnyCake" | ||
| "bgColor":"Bgc-$artFunnyCake", | ||
| "showInMain": false | ||
| }, | ||
| { | ||
| "artId":"cat", | ||
| "bgColor":"Bgc-$artCat" | ||
| "bgColor":"Bgc-$artCat", | ||
| "showInMain": false | ||
| }, | ||
| { | ||
| "artId":"corgi", | ||
| "bgColor":"Bgc-$artCorgi" | ||
| "bgColor":"Bgc-$artCorgi", | ||
| "showInMain": true | ||
| } | ||
|
|
||
| ] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,27 @@ | ||
| [ | ||
| { | ||
| "title": "Short and consistent naming ", | ||
| "text": "The abbreviations are based on the popularity of CSS properties and are compiled according to a single algorithm. If you know CSS, you almost know mlut", | ||
| "img": "lightning", | ||
| "bg": "-Gdl120d,$primary800,$primary750", | ||
| "bgH":"-Gdl120d,$primary700,$primary650_h", | ||
| "imgBg": "-Gdl120d,$primaryBright600,$primaryBright650", | ||
| "headC":"C-$primary300", | ||
| "textC":"C-$primary400" | ||
| }, | ||
| { | ||
| "title": "Rich and native syntax", | ||
| "text": "It is like Vim for CSS. Conveniently create complex styles with a powerful syntax that is conceptually close to CSS", | ||
| "img": "angled-brackets", | ||
| "bg": "-Gdl120d,$secondary800,$secondary750", | ||
| "bgH":"-Gdl120d,$secondary700,$secondary650_h", | ||
| "imgBg": "-Gdl120d,$secondaryBright600,$secondaryBright650", | ||
| "headC":"C-$secondary300", | ||
| "textC":"C-$secondary400" | ||
| }, | ||
| { | ||
| "title": "Written in Sass", | ||
| "text": "Leverage the full power of the preprocessor in your handwritten CSS and easily link it to utility classes", | ||
| "img": "sass", | ||
| "bg": "-Gdl120d,$tertiary800,$tertiary750", | ||
| "bgH":"-Gdl120d,$tertiary700,$tertiary650_h", | ||
| "imgBg": "-Gdl120d,$tertiaryBright600,$tertiaryBright650", | ||
| "headC":"C-$tertiary300", | ||
| "textC":"C-$tertiary400" | ||
| } | ||
| { | ||
| "title": "Rich syntax", | ||
| "text": "Powerful, Vim-like syntax for complex styles. Achieve more with less code while staying conceptually close to native CSS logic.", | ||
| "img": "curly-braces", | ||
| "sizeSVG": "W34 H27 lg_W37 lg_H30", | ||
| "padding": "P4u lg_P36;40", | ||
| "gridPosition": "lg_Gc1 lg_Grs1 lg_Gre3 lg_As-st", | ||
| "extraContent": "rich-syntax" | ||
| }, | ||
| { | ||
| "title": "Easy naming", | ||
| "text": "Abbreviations are generated by a single algorithm based on CSS property popularity. If you know CSS, you already know mlut.", | ||
| "img": "ease-name", | ||
| "sizeSVG": "W30 H30 lg_W32 lg_H32", | ||
| "padding": "P4u lg_P16;20", | ||
| "gridPosition": "lg_Gc2" | ||
| }, | ||
| { | ||
| "title": "Sass availability", | ||
| "text": "Full Sass power at your fingertips. Easily integrate preprocessor logic with utility classes for maximum flexibility.", | ||
| "img": "sass-availability", | ||
| "sizeSVG": "W36 H27 lg_W40 lg_H30", | ||
| "padding": "P4u lg_P16;20", | ||
| "gridPosition": "lg_Gc2" | ||
| } | ||
| ] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,25 @@ | ||
| <% | ||
| const css = { | ||
| buttonShape:"-Sz100p D-f Jc-c Ai-c P1u;3u Fns0.8r Bdrd1u Ts-$shortTs Bd1;s;$brand", | ||
| contentContainer: "D-f Jc-c Ai-c Fld-r Gap3u Fns1.1r ", | ||
| iconContainer: "D Apcr1 W0.9r", | ||
| icon:"D W100p Mxw25u Apcr1 Stw2", | ||
| span:"D Fns0.9r " | ||
| buttonShape:"-Sz100p D-f Jc-c Ai-c P10 Fns4u Lnh100p Lts0 Fnst-n Fnw400 Bdrd8 Ts-$shortTs Bd1;s;$brand", | ||
| } | ||
|
|
||
| href=`href=${it.url}` | ||
|
|
||
| if (it.variant === 'dark'){ | ||
| css.buttonColors = "Bgc-n C-$brand Bgc-$brand200_h"; | ||
| css.svgColors = "Fi-n St-$brand"; | ||
| if (it.variant === 'brand') { | ||
| css.buttonColors = "Bgc-$brand Bgc-$brand500_h Bgc-$brand200_a"; | ||
| css.textColor = "C#fff"; | ||
| } else { | ||
| css.buttonColors = "Bgc-$brand Bgc-$brand500_h C#fff"; | ||
| css.svgColors = " Fi-$brand St#fff"; | ||
| css.buttonColors = "Bgc-$white100 Bgc-$white200_h Bgc-$white300_a"; | ||
| css.textColor = "C#22141A"; | ||
| } | ||
|
|
||
| if (!it.tag) { | ||
| it.tag = 'a' | ||
| } else { | ||
| href = '' | ||
| } | ||
| const isLink = it.url && it.url !== '#0' && it.url !== ''; | ||
| const tag = isLink ? 'a' : 'button'; | ||
| const className = it.className || ''; | ||
| %> | ||
| <<%= it.tag %> <%= href %> | ||
| class="btn <%= css.buttonShape %> <%= css.buttonColors %>"> | ||
| <% if (it.icon) {%> | ||
| <div class=" <%= css.contentContainer %>"> | ||
| <div class="<%= css.iconContainer %>"> | ||
| <svg xmlns="http://www.w3.org/2000/svg" | ||
| viewBox="0 0 24 24" | ||
| class="<%= css.icon %> <%= css.svgColors %>"> | ||
| <use href="/assets/img/icons.svg#<%= it.icon %>"></use> | ||
| </svg> | ||
| </div> | ||
| <span class="<%= css.span %> button-text"> | ||
| <%= it.text %> | ||
| </span> | ||
| </div> | ||
| <% } else { %> | ||
| <div class="<%= css.contentContainer%>"> | ||
| <span class="<%= css.span %> button-text"> | ||
| <%= it.text %> | ||
| </span> | ||
| </div> | ||
| <% } %> | ||
| </<%= it.tag %>> | ||
|
|
||
| <<%= tag %> | ||
| class="btn <%= css.buttonShape %> <%= css.buttonColors %> <%= css.textColor %> <%= className %>" | ||
| <%= isLink ? `href="${it.url}"` : '' %> | ||
| <%= tag === 'button' ? 'type="button"' : '' %> | ||
| > | ||
| <%= it.text %> | ||
| </<%= tag %>> | ||
|
Contributor
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. Не самое подходящее название каталога. Лучше что-то типа |
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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <div class="D-n md_D-g W100p Gtc1fr;17u;1fr"> | ||
| <div class="D-f Fld-c P0;16;16 Bdrd8 Bgc-$core820 Gc1"> | ||
| <div class="P2.5u Txa-c"> | ||
| <span class="Fns4u Fnst-n Fnw600 Lnh140p Lts0 C-$brand">mlut syntax</span> | ||
| </div> | ||
| <div class="D-f Ai-c Jc-c H100p P2.5u Bdrd8 Bgc-$core805"> | ||
| <code class="Fnf-Fira;Code Fns3u Fnst-n Fnw400 Lnh150p Lts0 C-$tertiary750"> | ||
| <span class=""><span class="C#00ac4d">@:ah</span>_<span class="C#f04">0</span>1_<span class="C#9e54ff">h</span></span> | ||
|
Contributor
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. Пустой |
||
| </code> | ||
| </div> | ||
| </div> | ||
| <div class="W20 D-f Ai-c Jc-c Apcr1 Gc2 Js-c As-c"> | ||
| <svg class="C-$brand" width="16" height="12"> | ||
| <use href="/assets/img/icons.svg#arrow-code"></use> | ||
| </svg> | ||
| </div> | ||
| <div class="D-f Fld-c P0;16;16 Bdrd8 Bgc-$core820 Gc3"> | ||
| <div class="P2.5u Txa-c"> | ||
| <span class="Fns4u Fnst-n Fnw600 Lnh140p Lts0 C-$tertiary800">Standard CSS </span> | ||
| </div> | ||
| <div class="D-f Ai-c Jc-c P2.5u Bdrd8 Bgc-$core805"> | ||
| <code class="D-f Fld-c Txwm Fnf-Fira;Code Fns3u Fnst-n Fnw400 Lnh150p Lts0 C-$tertiary750"> | ||
| <span><span class="C#00ac4d">@media (any-hover)</span> {</span> | ||
| <span class="Ml3u">.\@\:ah_01_h<span class="C#9e54ff">:hover</span> {</span> | ||
| <span class="Ml6u"><span class="C#f04">opacity</span>: 1</span> | ||
| <span class="Ml3u">}</span> | ||
| <span>}</span> | ||
| </code> | ||
| </div> | ||
| </div> | ||
| </div> | ||
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,24 +1,23 @@ | ||
| <% if (it.icon != 'github') {%> | ||
| <a href="<%= it.link %>" alt="Link to the project's GitHub" target="_blank" | ||
| class="-Ctx-logo D Ps Bxs-cb H100p Apcr1"> | ||
| <svg | ||
| viewBox="0 0 100 100" | ||
| class="W100p Mxw25u Apcr1 Fi-$accent850 Fio1 ^logo:h:_Fi-$brand Ts-$shortTs"> | ||
| <use href="/assets/img/icons.svg#<%= it.icon %>"></use> | ||
| </svg> | ||
| </a> | ||
| <% } else { %> | ||
| <a href="<%= it.link %>" alt="Link to the project's GitHub" target="_blank" | ||
| class="-Ctx-logo D-f Jc-sb Ai-c Ps Txd-n Ts-$shortTs H100p W50p Mxw15u md_Mxw12u Bd1;s;$accent850 Bdc-$brand_h Bdrd10u Bdl-n"> | ||
| <svg | ||
| viewBox="0 0 100 100" | ||
| class="H100p Mxw25u Apcr1 Fi-$accent850 Fio1 ^logo:h:_Fi-$brand Ts-$shortTs"> | ||
| <use class="-Sz100p" href="/assets/img/icons.svg#<%= it.icon %>"></use> | ||
| </svg> | ||
| <svg | ||
| viewBox="0 0 100 100" | ||
| class="W40p Pr10p Mxw25u Apcr1 Fi-$accent850 Fio1 ^logo:h:_Fi#ffd700 Ts-$shortTs"> | ||
| <use href="/assets/img/icons.svg#star"></use> | ||
| </svg> | ||
| </a> | ||
| <% } %> | ||
| <% | ||
| if(it.name === "X") { | ||
| css.width = "24", | ||
| css.height = "24" | ||
| } else { | ||
| css.width = "26", | ||
| css.height = "26" | ||
| } | ||
| %> | ||
|
|
||
| <a | ||
| href="<%= it.link %>" | ||
| target="_blank" | ||
| class="-Ctx-logo Ps -Sz32 D-f Jc-c Ai-c" | ||
| > | ||
| <svg | ||
| class="Fi-$accent900 Fio1 ^logo:h:_Fi-$brand Ts-$shortTs" | ||
| width="<%= css.width %>" | ||
| height="<%= css.height %>" | ||
| > | ||
| <use href="/assets/img/icons.svg#<%= it.icon %>"></use> | ||
| </svg> | ||
| </a> |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it.url !== ''- лишнее, ведь пустая строка и такfalse