Merge pull request 'chore: add SCSS build and watch scripts, update theme colors, and comment out text-transform properties in various styles' (#36) from fix/thanh-23032026-style-scss into main

Reviewed-on: UKSOURCE/hailearning.edu.vn#36
This commit is contained in:
2026-03-23 13:24:50 +00:00
15 changed files with 226 additions and 1265 deletions

View File

@@ -204,7 +204,7 @@
font-weight: 600; font-weight: 600;
color: var(--header); color: var(--header);
text-decoration: none; text-decoration: none;
text-transform: capitalize; /* text-transform: capitalize; */
transition: color 0.3s ease; transition: color 0.3s ease;
} }

View File

@@ -6,7 +6,9 @@
"dev": "next dev", "dev": "next dev",
"build": "next build", "build": "next build",
"start": "next start", "start": "next start",
"lint": "eslint" "lint": "eslint",
"scss:build": "sass public/assets/scss/main.scss public/assets/css/main.css --style=expanded --source-map",
"scss:watch": "sass --watch public/assets/scss/main.scss:public/assets/css/main.css --style=expanded --source-map"
}, },
"dependencies": { "dependencies": {
"axios": "^1.13.4", "axios": "^1.13.4",
@@ -21,6 +23,7 @@
"@types/react-dom": "^19", "@types/react-dom": "^19",
"eslint": "^9", "eslint": "^9",
"eslint-config-next": "16.1.6", "eslint-config-next": "16.1.6",
"sass": "^1.98.0",
"tailwindcss": "^4", "tailwindcss": "^4",
"typescript": "^5" "typescript": "^5"
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -44,7 +44,7 @@
.link-btn { .link-btn {
color: $theme-color-2; color: $theme-color-2;
text-transform: capitalize; // text-transform: capitalize;
font-weight: 500; font-weight: 500;
font-family: "Space Grotesk", sans-serif; font-family: "Space Grotesk", sans-serif;

View File

@@ -59,7 +59,7 @@
padding-bottom: 10px; padding-bottom: 10px;
padding-top: 20px; padding-top: 20px;
font-size: 16px; font-size: 16px;
text-transform: capitalize; // text-transform: capitalize;
border-radius: 0; border-radius: 0;
background-color: transparent; background-color: transparent;
border: none; border: none;

View File

@@ -103,7 +103,7 @@
span{ span{
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
text-transform: capitalize; // text-transform: capitalize;
color: $white; color: $white;
} }
@@ -1063,7 +1063,7 @@
li { li {
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
text-transform: capitalize; // text-transform: capitalize;
@include breakpoint (max-sm) { @include breakpoint (max-sm) {
font-size: 14px; font-size: 14px;

View File

@@ -438,7 +438,7 @@ html.lenis, html.lenis body {
background: $bg-color; background: $bg-color;
margin-top: 16px; margin-top: 16px;
width: 100%; width: 100%;
text-transform: capitalize; // text-transform: capitalize;
color: $text-color; color: $text-color;
} }
@@ -446,7 +446,7 @@ html.lenis, html.lenis body {
background: $bg-color; background: $bg-color;
outline: none; outline: none;
color: $text-color; color: $text-color;
text-transform: capitalize; // text-transform: capitalize;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
border: none; border: none;

View File

@@ -35,7 +35,7 @@
font-weight: 600; font-weight: 600;
line-height: 2; line-height: 2;
font-weight: 700; font-weight: 700;
text-transform: capitalize; // text-transform: capitalize;
border-bottom: 1px solid rgba(0, 0, 0, 0.20) !important; border-bottom: 1px solid rgba(0, 0, 0, 0.20) !important;
border: none; border: none;

View File

@@ -600,7 +600,7 @@
background: $white; background: $white;
border-radius: 100px; border-radius: 100px;
margin-right: 5px; margin-right: 5px;
text-transform: capitalize; // text-transform: capitalize;
margin-bottom: 10px; margin-bottom: 10px;
color: $text-color; color: $text-color;
@include transition; @include transition;
@@ -723,7 +723,7 @@
line-height: 1; line-height: 1;
background: $bg-color; background: $bg-color;
margin-right: 8px; margin-right: 8px;
text-transform: capitalize; // text-transform: capitalize;
color: $text-color; color: $text-color;
font-weight: 400; font-weight: 400;
@include transition; @include transition;

View File

@@ -151,7 +151,7 @@
sub { sub {
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
text-transform: capitalize; // text-transform: capitalize;
margin-left: -10px; margin-left: -10px;
} }
} }

View File

@@ -16,7 +16,7 @@
color: $theme-color-2; color: $theme-color-2;
font-family: $heading-font; font-family: $heading-font;
margin-bottom: 20px; margin-bottom: 20px;
text-transform: capitalize; // text-transform: capitalize;
line-height: 1; line-height: 1;
padding: 8px 16px; padding: 8px 16px;
border-radius: 100px; border-radius: 100px;

View File

@@ -80,7 +80,7 @@
font-weight: 500; font-weight: 500;
color: $theme-color; color: $theme-color;
font-family: $heading-font; font-family: $heading-font;
text-transform: capitalize; // text-transform: capitalize;
opacity: 0; opacity: 0;
visibility: hidden; visibility: hidden;
transition: all 0.3s ease; transition: all 0.3s ease;

View File

@@ -21,7 +21,7 @@ body {
padding: 0; padding: 0;
margin: 0; margin: 0;
overflow-x: hidden; overflow-x: hidden;
text-transform: capitalize; // // text-transform: capitalize;
} }
ul { ul {
@@ -56,7 +56,7 @@ h6 {
padding: 0; padding: 0;
color: $header-color; color: $header-color;
@include transition; @include transition;
text-transform: capitalize; // text-transform: capitalize;
} }
h1 { h1 {

View File

@@ -359,7 +359,7 @@
h4 { h4 {
font-size: 14px; font-size: 14px;
font-weight: 800; font-weight: 800;
text-transform: capitalize; // text-transform: capitalize;
text-align: center; text-align: center;
color: $white; color: $white;
} }