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 #19

Merged
merged 9 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
Binary file added .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ cách 2: npm run scss
- Đọc trong file package.json > scripts > và thực thi lên scss
Dọc trong file package.json > scripts > đọc lệnh

Compile build
npm install grunt-cli > grunt

# menu mobile
1/ nằm bên trái width 80%, height 100%
2/ nút danh sách nằm cạnh logo
Expand Down
7,007 changes: 3,633 additions & 3,374 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
"grunt-contrib-uglify": "^5.2.2",
"grunt-contrib-watch": "^1.1.0",
"grunt-sass": "^3.1.0",
"gulp": "^3.9.1",
"gulp": "^4.0.2",
"gulp-uglify": "^3.0.2",
"node-sass": "^7.0.3",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0"
},
Expand Down Expand Up @@ -51,11 +50,12 @@
"mime-types": "^2.1.35",
"neo-async": "^2.6.2",
"node-releases": "^2.0.5",
"node-sass": "^9.0.0",
"picocolors": "^1.0.0",
"punycode": "^2.1.1",
"randombytes": "^2.1.0",
"safe-buffer": "^5.2.1",
"sass": "^1.54.3",
"sass": "^1.65.1",
"schema-utils": "^3.1.1",
"serialize-javascript": "^6.0.0",
"source-map": "^0.6.1",
Expand All @@ -72,7 +72,7 @@
"scripts": {
"test": "test",
"scss": "sass --watch ./src/assets/scss/index.scss ./src/dist/css/index.css",
"scssbuild": "sass --watch ./src/assets/scss/index.scss ./src/dist/css/index.css --style compressed",
"scssbuild": "sass --watch ./src/assets/scss/index.scss ./src/dist/css/index.min.css --style compressed",
"build": "webpack --config webpack.config.js",
"watch": "webpack --watch"
},
Expand Down
Binary file added src/.DS_Store
Binary file not shown.
Binary file added src/assets/img/logo-sangsofa-23.03.18.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ $(document).ready(function () {
{
breakpoint: 1024,
settings: {
slidesToShow: 3,
slidesToShow: 2,
slidesToScroll: 1,
arrows: false
}
Expand Down
36 changes: 27 additions & 9 deletions src/assets/scss/components/_base.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url('https://fonts.googleapis.com/css2?family=Edu+NSW+ACT+Foundation:wght@400;500;600&family=Lato:ital,wght@0,400;0,700;0,900;1,300;1,700&family=Mukta:wght@200;400;500;800&family=Roboto+Condensed:ital,wght@0,300;0,700;1,300;1,400&family=Sono:wght@300;400;500;600;700;800&display=swap');

* {
box-sizing: border-box;
margin: 0;
Expand All @@ -6,18 +8,27 @@

html {
font-size: 62.5%;
font-family: 'Lato', sans-serif, 'arial';
}

font-family: 'Roboto', Times, serif, sans-serif;
body {
background-color: #ffffff;
}

.single-post {
font-size: 14px;
}

a {
text-decoration: none;
}

img {
object-fit: cover;
}

.space-top {
margin-top: 80px;
margin-top: 60px;
}

.grid {
Expand All @@ -34,7 +45,8 @@ img {
.gutter-top {
margin-top: 12px;
}
.no-gutter{

.no-gutter {
padding-left: 0;
padding-right: 0;
}
Expand All @@ -45,19 +57,23 @@ img {
margin-left: -8px;
margin-right: -8px
}

@import './_grid';

.btn {
width: 118px;
background-color: $primari-color;
background-color: #FF6922;
outline: none;
border: none;
padding: 15px;
padding: 20px;
text-align: center;
color: $white-color;
font-size: 1.6em;
color: #fff;
font-size: 1.6rem;
font-weight: 600;
cursor: pointer;
border-radius: 30px;
padding-left: 30px;
padding-right: 30px;
margin-top: 20px;

&:hover {
background-color: $btn-hover;
Expand All @@ -69,7 +85,7 @@ img {
}

.line-height {
line-height: 1.6;
line-height: 1.5;
}

.max-width {
Expand All @@ -82,6 +98,7 @@ img {
display: none;

}

@keyframes opacity {
from {

Expand Down Expand Up @@ -145,6 +162,7 @@ img {
.hide {
display: none !important;
}

.show {
display: block !important;
}
Loading
Loading