Skip to content

Commit

Permalink
Merge pull request #36 from rdai10/dev
Browse files Browse the repository at this point in the history 
2.4.3
  • Loading branch information
@rdai10
rdai10 authored Feb 1, 2019
2 parents ae07253 + e7b86b5 commit 33c3fe1
Show file tree
Hide file tree
Showing 30 changed files with 1,041 additions and 271 deletions.
12 changes: 12 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
language: node_js

node_js:
- "node"

before_install:
- cd theme

script:
- npm test
- npm run build
- npm run zip
2 changes: 1 addition & 1 deletion theme/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Zendesk Theme for Liferay
# Zendesk Theme for Liferay [![Build Status](https://travis-ci.org/rdai10/zendesk.svg?branch=master)](https://travis-ci.org/rdai10/zendesk)

## Getting Started
1. [Install node](https://nodejs.org/en/).
Expand Down
30 changes: 19 additions & 11 deletions theme/dynamic_content/en-US.csv
View file

Large diffs are not rendered by default.

64 changes: 36 additions & 28 deletions theme/dynamic_content/es.csv
View file

Large diffs are not rendered by default.

90 changes: 49 additions & 41 deletions theme/dynamic_content/ja.csv
View file

Large diffs are not rendered by default.

62 changes: 35 additions & 27 deletions theme/dynamic_content/pt.csv
View file

Large diffs are not rendered by default.

74 changes: 41 additions & 33 deletions theme/dynamic_content/zh-cn.csv
View file

Large diffs are not rendered by default.

56 changes: 42 additions & 14 deletions theme/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions theme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
"dependencies": {
"classnames": "^2.2.6",
"es6-promise": "^4.2.5",
"liferay-help-center-megamenu": "github:rdai10/liferay-help-center-megamenu#v1.1.5"
"liferay-help-center-megamenu": "github:rdai10/liferay-help-center-megamenu#v1.1.5",
"lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1",
"lodash.times": "^4.3.2"
},
"devDependencies": {
"@babel/core": "^7.1.2",
Expand All @@ -39,7 +42,6 @@
"glob-all": "^3.1.0",
"jest": "^23.6.0",
"jest-serializer-html-string": "^1.0.1",
"lodash.throttle": "^4.1.1",
"mini-css-extract-plugin": "^0.4.0",
"node-sass": "^4.9.3",
"optimize-css-assets-webpack-plugin": "^4.0.1",
Expand Down Expand Up @@ -109,5 +111,5 @@
"test": "jest",
"zip": "zip -r Liferay-Help-Center.zip dist -x *.zat*"
},
"version": "1.4.3"
"version": "2.4.3"
}
16 changes: 4 additions & 12 deletions theme/src/css/_zendesk-pagination.scss
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
%active {
background-color: $color-active;
color: $color-primary;
}

.pagination {
margin: $pagination-margin-bottom 0;

a,
button,
span {
color: $color-default;
display: block;
Expand All @@ -21,16 +16,12 @@
border-radius: 10%;
}

&:active {
@extend %active;
}

&:hover {
background-color: $color-hover;
}

&:focus {
background-color: $color-focus;
outline: none;
}
}

Expand All @@ -42,6 +33,7 @@
}

.pagination-current span {
@extend %active;
background-color: $color-active;
color: $color-primary;
}
}
66 changes: 32 additions & 34 deletions theme/src/css/_zendesk-requests.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,38 @@
}
}

.custom-suggestion-list {
background-color: $color-active;
border-radius: $input-border-radius;
margin-top: $margin-sm;
padding: $padding-default;

a {
font-size: $h5-font-size;
line-height: 2;
text-decoration: none;
}

label {
background-image: clay-svg-url(
'<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><circle fill="#2E5AAC" cx="10" cy="10" r="10"/><path d="M11.562 13.61v.546c0 .104-.029.196-.087.274a.543.543 0 0 1-.225.175v.176c0 .13-.046.241-.137.332a.452.452 0 0 1-.332.137H9.22a.452.452 0 0 1-.332-.137.452.452 0 0 1-.137-.332v-.176a.543.543 0 0 1-.225-.175.443.443 0 0 1-.088-.274v-.547c0-.065.023-.12.069-.166a.226.226 0 0 1 .166-.068h2.656c.065 0 .12.023.166.068.046.046.068.101.068.166zm-2.792-.86a.481.481 0 0 1-.274-.078.374.374 0 0 1-.156-.215 5.496 5.496 0 0 0-.508-.996 8.252 8.252 0 0 0-.488-.664c-.274-.339-.462-.612-.567-.82-.143-.339-.215-.769-.215-1.29 0-.624.153-1.2.46-1.728a3.386 3.386 0 0 1 1.25-1.25A3.383 3.383 0 0 1 10 5.25c.625 0 1.201.153 1.729.459.527.306.944.723 1.25 1.25.305.527.458 1.104.458 1.729 0 .52-.071.95-.214 1.289-.105.208-.293.481-.567.82-.208.26-.37.482-.488.664-.195.3-.365.631-.508.996a.374.374 0 0 1-.156.215.481.481 0 0 1-.274.078H8.77zm-.333-4.062c0-.43.153-.798.46-1.104A1.505 1.505 0 0 1 10 7.125c.091 0 .166-.03.225-.088a.304.304 0 0 0 .087-.224.304.304 0 0 0-.087-.225A.304.304 0 0 0 10 6.5c-.39 0-.755.098-1.094.293a2.148 2.148 0 0 0-.8.8 2.152 2.152 0 0 0-.294 1.095c0 .09.03.166.088.224A.304.304 0 0 0 8.125 9c.091 0 .166-.03.225-.088a.304.304 0 0 0 .087-.224z" fill="#FFF"/></svg>'
);
background-position: left 0 center;
background-repeat: no-repeat;
background-size: 1em auto;
color: $color-info;
font-size: $font-size-default;
font-weight: $font-weight-semi-bold;
padding-left: 2rem;
}

ul {
list-style: none;
margin: 0;
padding-left: 2rem;
}
}

.request-container {
padding-right: 6rem;

Expand Down Expand Up @@ -238,40 +270,6 @@
color: $secondary-text-color;
}

.suggestion-list {
background-color: $color-active;
border-radius: $input-border-radius;

a {
font-size: $h5-font-size;
line-height: 2;
text-decoration: none;
}

label {
background-image: clay-svg-url(
'<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><circle fill="#2E5AAC" cx="10" cy="10" r="10"/><path d="M11.562 13.61v.546c0 .104-.029.196-.087.274a.543.543 0 0 1-.225.175v.176c0 .13-.046.241-.137.332a.452.452 0 0 1-.332.137H9.22a.452.452 0 0 1-.332-.137.452.452 0 0 1-.137-.332v-.176a.543.543 0 0 1-.225-.175.443.443 0 0 1-.088-.274v-.547c0-.065.023-.12.069-.166a.226.226 0 0 1 .166-.068h2.656c.065 0 .12.023.166.068.046.046.068.101.068.166zm-2.792-.86a.481.481 0 0 1-.274-.078.374.374 0 0 1-.156-.215 5.496 5.496 0 0 0-.508-.996 8.252 8.252 0 0 0-.488-.664c-.274-.339-.462-.612-.567-.82-.143-.339-.215-.769-.215-1.29 0-.624.153-1.2.46-1.728a3.386 3.386 0 0 1 1.25-1.25A3.383 3.383 0 0 1 10 5.25c.625 0 1.201.153 1.729.459.527.306.944.723 1.25 1.25.305.527.458 1.104.458 1.729 0 .52-.071.95-.214 1.289-.105.208-.293.481-.567.82-.208.26-.37.482-.488.664-.195.3-.365.631-.508.996a.374.374 0 0 1-.156.215.481.481 0 0 1-.274.078H8.77zm-.333-4.062c0-.43.153-.798.46-1.104A1.505 1.505 0 0 1 10 7.125c.091 0 .166-.03.225-.088a.304.304 0 0 0 .087-.224.304.304 0 0 0-.087-.225A.304.304 0 0 0 10 6.5c-.39 0-.755.098-1.094.293a2.148 2.148 0 0 0-.8.8 2.152 2.152 0 0 0-.294 1.095c0 .09.03.166.088.224A.304.304 0 0 0 8.125 9c.091 0 .166-.03.225-.088a.304.304 0 0 0 .087-.224z" fill="#FFF"/></svg>'
);
background-position: left 0 center;
background-repeat: no-repeat;
background-size: 1em auto;
color: $color-info;
font-size: $font-size-default;
font-weight: $font-weight-semi-bold;
padding-left: 2rem;
}

ul {
list-style: none;
margin: 0;
padding-left: 2rem;
}

.searchbox {
padding: $padding-default;
}
}

.upload-dropzone {
a,
span {
Expand Down
19 changes: 16 additions & 3 deletions theme/src/css/_zendesk-search.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
.search-results {
section {
margin-top: 2.5rem;
}
margin-top: 2.5rem;

.breadcrumbs {
margin-bottom: 0;
Expand Down Expand Up @@ -30,6 +28,21 @@
margin-bottom: $margin-md;
}

.search-filter {
align-items: baseline;
display: flex;
margin: $margin-default 0;

label {
font-size: $font-size-default;
}

select {
border-width: 0;
margin-left: $margin-md;
}
}

.search-result-description {
font-weight: $font-weight-normal;
margin-bottom: 0;
Expand Down
Loading

0 comments on commit 33c3fe1

Please sign in to comment.