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

Develop #668

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
16 changes: 16 additions & 0 deletions .bemlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"elementDivider": "__",
"modifierDivider": "_",
"ignore": [
"node_modules",
"dist"
],
"rules": {
"one-block": true,
"one-element": true,
"element-inside-parent-block": true,
"no-double-element": true,
"no-neighbour-parent-block": true,
"modifiable-class": true
}
}
8 changes: 7 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm install
- run: npm start & sleep 5 && npm test
- name: Upload HTML report(backstop data)
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: report
path: backstop_data
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ node_modules
# Generated files
backstop_data
dist
.cache
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@mate-academy/bemlint": "^0.1.1",
"@mate-academy/eslint-config": "*",
"@mate-academy/linthtml-config": "0.0.1",
"@mate-academy/scripts": "^0.2.0",
"@mate-academy/scripts": "^0.8.4",
"@mate-academy/stylelint-config": "*",
"backstopjs": "^5.0.1",
"eslint": "^5.16.0",
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Enclosures
1. Replace `<your_account>` with your Github username in the links
- [DEMO LINK](https://<your_account>.github.io/layout_enclosures/) <br>
- [TEST REPORT LINK](https://<your_account>.github.io/layout_enclosures/report/html_report/)
- [DEMO LINK](https://Namart.github.io/layout_enclosures/) <br>
- [TEST REPORT LINK](https://Namart.github.io/layout_enclosures/report/html_report/)
2. Follow [this instructions](https://mate-academy.github.io/layout_task-guideline/)
___

Expand Down
37 changes: 26 additions & 11 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Enclosures</title>
<link rel="stylesheet" href="./style.css">
</head>
<body>
<h1>Enclosures</h1>
</body>
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Enclosures</title>
<link rel="stylesheet" href="./style.css">
</head>
<body>
<!-- <h1>Enclosures</h1> -->
<div id="qa-block" class ="outer">
<div class="med">
<div class="inner">In programming languages, a closure is a technique for implementing lexically scoped name binding in a language with first-class functions. Operationally, a closure is a record storing a function together with an environment.</div>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't make lines longer than 80 symbols

</div>
</div >
<div class ="outer">
<div class="med">
<div class="inner">У програмуванні замиканням називають підпрограму, що виконується в середовищі, яке містить одну або більше зв’язаних змінних. Підпрограма має доступ до цих змінних під час виконання.</div>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div class="inner">У програмуванні замиканням називають підпрограму, що виконується в середовищі, яке містить одну або більше зв’язаних змінних. Підпрограма має доступ до цих змінних під час виконання.</div>
<div class="inner">
У програмуванні замиканням називають підпрограму, що виконується в середовищі, яке містить одну
або більше зв’язаних змінних. Підпрограма має доступ до цих змінних під час виконання.
</div>

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix it like this everywhere

</div>
</div>
<div class ="outer">
<div class="med">
<div class="inner">Замыкание в программировании — функция первого класса, в теле которой присутствуют ссылки на переменные, объявленные вне тела этой функции в окружающем коде и не являющиеся её параметрами.</div>
</div>
</div>
</body>
</html>
32 changes: 32 additions & 0 deletions src/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
body {
margin: 0;
background-color: #000;
font-size: 16px;
}

.outer {
box-sizing: border-box;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set box-sizing: border-box to all the elements with "*" selector

width: 350px;
padding: 10px;
margin: 40px 20px;
background-color: #0090c2;
border: 1px solid #e95d49;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if border is the same for all the containers, then why not create another class for all the containers and write border there?

}

.med {
box-sizing: border-box;
padding: 10px;
border: 1px solid #e95d49;
background-color: #ffa100;
}

.inner {
box-sizing: border-box;
padding: 10px;
border: 1px solid #e95d49;
background-color: #dedede;
}

.outer:first-child {
margin-top: 20px;
}