Skip to content

Commit dffa293

Browse files
authored
Merge pull request realstoman#19 from NangialaiStoman/dark-mode
Projects grid and design touches
2 parents aea8303 + 752d882 commit dffa293

File tree

8 files changed

+56
-50
lines changed

8 files changed

+56
-50
lines changed

src/assets/css/app.css

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
/*==
2-
* Vuejs & TailwindCSS Portfolio Main Styling CSS File
2+
* Vuejs & TailwindCSS Portfolio Main CSS File
33
* Powered by: @NangialaiStoman
44
*/
55

6+
@tailwind base;
7+
8+
@tailwind components;
9+
10+
@tailwind utilities;
11+
12+
/* Custom Styles Below */
13+
614
body {
715
font-family: 'Poppins', sans-serif !important;
816
}
@@ -14,3 +22,5 @@ h4 {
1422
font-family: 'Poppins', sans-serif !important;
1523
font-weight: 500 !important;
1624
}
25+
26+
/* Theme Colors */

src/assets/css/tailwind.css

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/components/AboutClientSingle.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<img
44
:src="client.img"
55
:alt="client.title"
6-
class="w-64 py-5 px-10 border border-ternary-light dark:border-ternary-dark shadow-sm rounded-xl mb-8 cursor-pointer"
6+
class="w-64 py-5 px-10 border border-ternary-light dark:border-ternary-dark shadow-sm rounded-xl mb-8 cursor-pointer dark:bg-secondary-light"
77
/>
88
</div>
99
</template>

src/components/AppHeader.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div
55
class="z-10 max-w-screen-lg xl:max-w-screen-xl block sm:flex sm:justify-between sm:items-center my-6"
66
>
7-
<!-- Header menu links and small screen humberger menu start -->
7+
<!-- Header menu links and small screen hamburger menu start -->
88
<div class="flex justify-between items-center px-4 sm:px-0">
99
<!-- Header logos start -->
1010
<div>
@@ -33,13 +33,13 @@
3333
/>
3434
<!-- Theme switcher small screen end -->
3535

36-
<!-- Small screen humberger menu start -->
36+
<!-- Small screen hamburger menu start -->
3737
<div class="sm:hidden">
3838
<button
3939
@click="isOpen = !isOpen"
40-
type="buttom"
40+
type="button"
4141
class="focus:outline-none"
42-
aria-label="Humberger Menu"
42+
aria-label="Hamburger Menu"
4343
>
4444
<svg
4545
xmlns="http://www.w3.org/2000/svg"
@@ -60,9 +60,9 @@
6060
</svg>
6161
</button>
6262
</div>
63-
<!-- Small screen humberger menu end -->
63+
<!-- Small screen hamburger menu end -->
6464
</div>
65-
<!-- Header menu links and small screen humberger menu end -->
65+
<!-- Header menu links and small screen hamburger menu end -->
6666

6767
<!-- Header links start -->
6868
<div
@@ -117,15 +117,15 @@
117117
</div>
118118
<!-- Hire me button end -->
119119

120-
<!-- Theme switcher largr screen start -->
120+
<!-- Theme switcher large screen start -->
121121
<theme-switcher
122122
:theme="theme"
123123
@themeChanged="updateTheme"
124124
class="ml-8 bg-primary-light dark:bg-ternary-dark px-3 py-2 shadow-sm rounded-xl cursor-pointer"
125125
/>
126-
<!-- Theme switcher largr screen end -->
126+
<!-- Theme switcher large screen end -->
127127
</div>
128-
<!-- Header right section buttons stendart -->
128+
<!-- Header right section buttons end -->
129129
</div>
130130
<!-- Header end -->
131131

@@ -164,7 +164,7 @@ export default {
164164
{
165165
id: 2,
166166
value: 'mobile',
167-
name: 'Mobile Applicaiton',
167+
name: 'Mobile Application',
168168
},
169169
{
170170
id: 3,

src/components/ProjectsFilter.vue

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
:name="select"
66
:id="select"
77
class="
8-
px-4
9-
sm:px-6
10-
py-2
11-
border-1 border-gray-200
12-
dark:border-secondary-dark
13-
rounded-lg
14-
text-sm
15-
sm:text-md
16-
dark:font-medium
17-
bg-secondary-light
18-
dark:bg-ternary-dark
19-
text-primary-dark
20-
dark:text-ternary-light
21-
"
8+
px-4
9+
sm:px-6
10+
py-2
11+
border-1 border-gray-200
12+
dark:border-secondary-dark
13+
rounded-lg
14+
text-sm
15+
sm:text-md
16+
dark:font-medium
17+
bg-secondary-light
18+
dark:bg-ternary-dark
19+
text-primary-dark
20+
dark:text-ternary-light
21+
"
2222
>
2323
<option value class="text-sm sm:text-md">All Projects</option>
2424
<option
@@ -46,7 +46,7 @@ export default {
4646
'Web Application',
4747
'Mobile Application',
4848
'UI/UX Design',
49-
'Branding',
49+
'Branding & Animations',
5050
],
5151
},
5252
},

src/components/ProjectsGrid.vue

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@
5959
<input
6060
v-model="searchProject"
6161
class="
62-
pl-3
63-
pr-1
64-
sm:px-4
65-
py-2
66-
border-1 border-gray-200
67-
dark:border-secondary-dark
68-
rounded-lg
69-
text-sm
70-
sm:text-md
71-
bg-secondary-light
72-
dark:bg-ternary-dark
73-
text-primary-dark
74-
dark:text-ternary-light
75-
"
62+
pl-3
63+
pr-1
64+
sm:px-4
65+
py-2
66+
border-1 border-gray-200
67+
dark:border-secondary-dark
68+
rounded-lg
69+
text-sm
70+
sm:text-md
71+
bg-secondary-light
72+
dark:bg-ternary-dark
73+
text-primary-dark
74+
dark:text-ternary-light
75+
"
7676
id="name"
7777
name="name"
7878
type="search"
@@ -122,7 +122,7 @@ export default {
122122
},
123123
{
124124
id: 2,
125-
title: 'Pheonix Digital Agenncy',
125+
title: 'Phoenix Digital Agency',
126126
category: 'Mobile Application',
127127
img: require('@/assets/images/mobile-project-2.jpg'),
128128
},
@@ -151,10 +151,10 @@ export default {
151151
img: require('@/assets/images/web-project-1.jpg'),
152152
},
153153
],
154-
// publicPath: process.env.BASE_URL,
155154
};
156155
},
157156
computed: {
157+
// Get the filtered projects
158158
filteredProjects() {
159159
if (this.selectedProject) {
160160
return this.filterProjectsByCategory();
@@ -165,6 +165,7 @@ export default {
165165
},
166166
},
167167
methods: {
168+
// Filter projects by category
168169
filterProjectsByCategory() {
169170
return this.projects.filter((item) => {
170171
let category =
@@ -173,6 +174,7 @@ export default {
173174
return category.includes(this.selectedProject);
174175
});
175176
},
177+
// Filter projects by title search
176178
filterProjectsBySearch() {
177179
let project = new RegExp(this.searchProject, 'i');
178180
return this.projects.filter((el) => el.title.match(project));

src/components/ThemeSwitcher.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<a href="#" @click="toggleTheme" aria-label="Theme Switcher">
2+
<a href="#" @click.prevent="toggleTheme" aria-label="Theme Switcher">
33
<i
44
v-if="theme === 'light'"
55
data-feather="moon"

src/main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { createApp } from 'vue';
22
import App from './App.vue';
33
import router from './router';
4-
import './assets/css/tailwind.css';
54
import './assets/css/app.css';
65
import BackToTop from 'vue-backtotop';
76

0 commit comments

Comments
 (0)