Skip to content

Commit 3ae749b

Browse files
committed
Merge branch 'dev'
2 parents c6d197f + 016a458 commit 3ae749b

File tree

4 files changed

+42
-36
lines changed

4 files changed

+42
-36
lines changed

src/App.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
<template>
22
<!-- portfolio vue x scss -->
33

4-
<MyHeader />
4+
<MyHeader ref="header" />
55
<MyMain :scrollValue="scrollValue" />
6+
<!-- <button id="myButton" ref="myButton">button</button> -->
67

78
<footer>
8-
<p>Built by Muhammad ©2023</p>
9+
<p>
10+
{{
11+
store.lang != "AR"
12+
? "Built by Muhammad Fadll ©2023"
13+
: "بناه محمد فضل ©2023"
14+
}}
15+
</p>
916
</footer>
1017
</template>
1118

@@ -29,6 +36,7 @@ export default {
2936
created() {
3037
window.addEventListener("scroll", this.scroll);
3138
},
39+
3240
methods: {
3341
scroll() {
3442
this.scrollValue = window.pageYOffset;
@@ -105,8 +113,6 @@ h4 {
105113
&.AR-lang {
106114
// font untuk bahasa arab
107115
font-family: "Droid Arabic Naskh", sans-serif !important;
108-
text-align: right;
109-
flex-direction: row-reverse;
110116
}
111117
112118
footer {

src/components/MyNavbar.vue

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,14 @@ export default {
138138
"store.lang"(newValue) {
139139
// jika store.lang berupa "AR" maka ubah font tersebut ke "Droid Arabic Naskh"
140140
const app = document.getElementById("app");
141-
newValue == "AR"
142-
? app.classList.add("AR-lang")
143-
: app.classList.remove("AR-lang");
141+
const root = document.querySelector("html");
142+
if (newValue == "AR") {
143+
app.classList.add("AR-lang");
144+
root.setAttribute("dir", "rtl");
145+
} else {
146+
app.classList.remove("AR-lang");
147+
root.removeAttribute("dir");
148+
}
144149
},
145150
},
146151
};
@@ -162,6 +167,7 @@ header {
162167
z-index: 999;
163168
164169
.main-logo {
170+
flex-grow: 2;
165171
.img-logo {
166172
width: 96px;
167173
}
@@ -246,40 +252,37 @@ header {
246252
}
247253
}
248254
}
249-
.select {
250-
flex-grow: 2;
251-
select {
252-
// remove arrow select
253-
-webkit-appearance: none;
254-
-moz-appearance: none;
255-
//
255+
.select select {
256+
// remove arrow select
257+
-webkit-appearance: none;
258+
-moz-appearance: none;
259+
//
256260
257-
padding: 0.4rem 0.8rem;
258-
font-size: inherit;
259-
font-family: inherit;
260-
border: transparent;
261-
color: $white;
262-
background-color: $secondary;
261+
padding: 0.4rem 0.8rem;
262+
font-size: inherit;
263+
font-family: inherit;
264+
border: transparent;
265+
color: $white;
266+
background-color: $secondary;
263267
264-
&:focus {
265-
color: $primary;
266-
267-
option {
268-
color: $white;
269-
}
270-
}
268+
&:focus {
269+
color: $primary;
271270
272271
option {
273-
background-color: $secondary;
272+
color: $white;
274273
}
275274
}
275+
276+
option {
277+
background-color: $secondary;
278+
}
276279
}
277280
}
278281
279282
@media (min-width: 768px) {
280283
.navbar {
281284
.main-logo {
282-
// flex-grow: 0;
285+
flex-grow: 0;
283286
}
284287
285288
.button-bars {
@@ -288,9 +291,6 @@ header {
288291
nav.navbar-header {
289292
display: block;
290293
}
291-
.select {
292-
flex-grow: 0;
293-
}
294294
}
295295
}
296296
}

src/components/MyProject.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ export default {
179179
margin: 0 4px 0;
180180
}
181181
}
182+
.desc {
183+
padding-top: 2rem;
184+
}
182185
.project-buttons {
183186
display: flex;
184187
column-gap: 6px;
@@ -247,9 +250,6 @@ export default {
247250
.project-meta-stack p {
248251
font-size: 0.8rem;
249252
}
250-
.desc {
251-
padding-top: 2rem;
252-
}
253253
}
254254
}
255255
}

src/view/MyHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<div id="banner">
5858
<h1 class="personal-intro">
5959
<span class="greeting"
60-
>{{ store.lang != "AR" ? "Hi im" : "مرحباً" }}
60+
>{{ store.lang != "AR" ? "Hi im" : "مرحباً أنا" }}
6161
</span>
6262
<span class="main-name"
6363
>{{ store.lang != "AR" ? "Muhammad Fadll" : "محمد فضل" }} </span

0 commit comments

Comments
 (0)