Skip to content

Commit

Permalink
Merge pull request #145 from readingdancer/Issue-89
Browse files Browse the repository at this point in the history
Fixing issue #89
  • Loading branch information
readingdancer authored Apr 18, 2020
2 parents 34cbb69 + b717f5e commit 5c349a6
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 7 deletions.
15 changes: 9 additions & 6 deletions covid-19-support/src/components/SearchFilter.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="bg-light border-right" id="search-filter-wrapper">
<div class="tab bg-light border-right border-top border-bottom" @click="$emit('toggle')">
<div class="tab bg-light border-right border-top border-bottom" @click="$emit('toggle')" v-b-tooltip.hover.right :title="tabtitle">
<i class="fas fa-caret-down" />
</div>

Expand Down Expand Up @@ -91,6 +91,9 @@ export default {
value: i.pos,
text: this.$t(`dayofweek.${i.day}`)
}))
},
tabtitle() {
return this.isFilterOpen ? this.$t('sidebar.close-panel') : this.$t('sidebar.open-panel')
}
},
methods: {
Expand Down Expand Up @@ -173,7 +176,7 @@ export default {
.tab {
font-size: 0.8rem;
width: 20px;
width: 30px;
height: 60px;
position: absolute;
top: 169px;
Expand All @@ -182,11 +185,11 @@ export default {
background: #fff;
transition: left 0.25s ease-out;
cursor: pointer;
box-shadow: 0px 0px 14px 0px rgba(0, 0, 0, 0.3);
box-shadow: 0px 0px 14px 0px rgba(0, 0, 0, 0.4);
}
#wrapper.toggled .tab {
box-shadow: 12px 0px 14px 0px rgba(0, 0, 0, 0.3);
box-shadow: 12px 0px 14px 0px rgba(0, 0, 0, 0.4);
left: 300px;
}
Expand All @@ -195,10 +198,10 @@ export default {
}
.tab i {
font-size: 1.5rem;
color: #b5bfca;
color: #ee8842;
transform: rotate(-90deg);
margin-top: 18px;
margin-left: 2px;
margin-left: 7px;
}
@media (min-width: 768px) {
Expand Down
84 changes: 83 additions & 1 deletion covid-19-support/src/locales/BabelEdit.babel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<babeledit_project be_version="2.6.1" version="1.2">
<babeledit_project version="1.2" be_version="2.6.1">
<!--

BabelEdit project file
Expand Down Expand Up @@ -3502,6 +3502,47 @@
<folder_node>
<name>sidebar</name>
<children>
<concept_node>
<name>close-panel</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>ar-AE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>ms-MY</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CN</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>info-about-us</name>
<definition_loaded>false</definition_loaded>
Expand Down Expand Up @@ -3625,6 +3666,47 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>open-panel</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>ar-AE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>ms-MY</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CN</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>shopsafe</name>
<definition_loaded>false</definition_loaded>
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "الصينية المبسطة"
},
"sidebar": {
"close-panel": "أغلق لوحة البحث",
"info-about-us": "حاليا ، يدعم هذا الموقع مقاطعة أورانج ، نورث كارولاينا. مع",
"info-end-text": "، يمكننا توسيع تغطيتنا.",
"info-link-text": "مساعدتك",
"open-panel": "افتح لوحة البحث",
"shopsafe": "من فضلك ، تسوق آمن!",
"sixfeet": "ابق على مسافة 6 أقدام عند التسوق.",
"stayhome": "إذا كنت مريضًا ، ابق في المنزل.",
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "Simplified Chinese"
},
"sidebar": {
"close-panel": "Close search panel",
"info-about-us": "Currently, this site supports Orange County, NC. With",
"info-end-text": ", we can expand our coverage.",
"info-link-text": "your help",
"open-panel": "Open search panel",
"shopsafe": "Please, SHOP SAFE!",
"sixfeet": "Stay 6 ft. apart when shopping.",
"stayhome": "If you are sick, stay home.",
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "Chino simplificado"
},
"sidebar": {
"close-panel": "Cerrar panel de búsqueda",
"info-about-us": "Actualmente, este sitio admite el Condado de Orange, Carolina del Norte. Con",
"info-end-text": ", podemos ampliar nuestra cobertura.",
"info-link-text": "tu ayuda",
"open-panel": "Abrir panel de búsqueda",
"shopsafe": "Por favor, ¡TIENDA SEGURO!",
"sixfeet": "Manténgase a 6 pies de distancia cuando vaya de compras.",
"stayhome": "Si está enfermo, quédese en casa.",
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "Chinois simplifié"
},
"sidebar": {
"close-panel": "Fermer le panneau de recherche",
"info-about-us": "Actuellement, ce site prend en charge Orange County, NC. Avec",
"info-end-text": ", nous pouvons étendre notre couverture.",
"info-link-text": "ton aide",
"open-panel": "Ouvrir le panneau de recherche",
"shopsafe": "S'il vous plaît, achetez en toute sécurité!",
"sixfeet": "Restez à 6 pieds de distance lorsque vous magasinez.",
"stayhome": "Si vous êtes malade, restez à la maison.",
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "簡体字中国語"
},
"sidebar": {
"close-panel": "検索パネルを閉じる",
"info-about-us": "現在、このサイトはノースカロライナ州オレンジ郡をサポートしています。と",
"info-end-text": "、範囲を拡大できます。",
"info-link-text": "あなたの助け",
"open-panel": "検索パネルを開く",
"shopsafe": "安全なショップをどうぞ!",
"sixfeet": "ショッピングをするときは6フィート離してください。",
"stayhome": "病気のときは家にいてください。",
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "중국어"
},
"sidebar": {
"close-panel": "검색 창 닫기",
"info-about-us": "현재 이 사이트는 노스캐롤라이나 주 오랜지 카운티를 지원합니다.",
"info-end-text": "웹사이트를 확장시킬 수 있습니다.",
"info-link-text": "당신의 도움으로",
"open-panel": "검색 창 열기",
"shopsafe": "안전한 쇼핑을 기원합니다!",
"sixfeet": "밖에선 사람들과 6피트 (2미터) 정도 떨어져 있으세요.",
"stayhome": "아프면 집에 계세요.",
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/ms.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "Bahasa Cina Ringkas"
},
"sidebar": {
"close-panel": "Tutup panel carian",
"info-about-us": "Pada masa ini, laman web ini menyokong Orange County, NC. Dengan",
"info-end-text": ", kami boleh mengembangkan liputan kami.",
"info-link-text": "pertolongan anda",
"open-panel": "Buka panel carian",
"shopsafe": "Tolong, selamatkan!",
"sixfeet": "Tinggal 6 kaki apabila membeli-belah.",
"stayhome": "Sekiranya anda sakit, tinggal di rumah.",
Expand Down
2 changes: 2 additions & 0 deletions covid-19-support/src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@
"zh": "简体中文"
},
"sidebar": {
"close-panel": "关闭搜索面板",
"info-about-us": "当前,此站点支持北卡罗来纳州奥兰治县。用",
"info-end-text": ",我们可以扩大覆盖范围。",
"info-link-text": "你的帮助",
"open-panel": "打开搜索面板",
"shopsafe": "请安全!",
"sixfeet": "购物时,相隔6英尺。",
"stayhome": "如果您生病了,请待在家里。",
Expand Down

0 comments on commit 5c349a6

Please sign in to comment.