Skip to content

Promoting to prod #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 16 commits into from
Dec 29, 2016
Merged

Promoting to prod #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7bdbaad
Github issue #372, [Pagination] - keep fixed pagination option displa…
Dec 15, 2016
790bab3
Merge branch 'dev' into feature/pagination_bar_reduce_number_of_pages
Dec 15, 2016
83cde52
Github issue #372, [Pagination] - keep fixed pagination option displa…
Dec 22, 2016
fa0ea5c
Merge pull request #594 from appirio-tech/feature/pagination_bar_redu…
Dec 22, 2016
702ac00
Github issue #593, Increase timeout when posting topics / comments to…
Dec 22, 2016
03e6402
Github issue #596, Status update: a comment post remains in the compo…
Dec 26, 2016
3285250
Merge pull request #597 from appirio-tech/feature/sticky_new_comment_…
Dec 26, 2016
17b97aa
Github issue #372, [Pagination] - keep fixed pagination option displa…
Dec 27, 2016
cbc36c5
Merge pull request #598 from appirio-tech/feature/pagination_bar_redu…
Dec 27, 2016
9dd0261
Merge pull request #595 from appirio-tech/feature/increase_timeout_cr…
parthshah Dec 27, 2016
652884c
Github issue #596, Status update: a comment post remains in the compo…
Dec 28, 2016
a29e45e
Merge pull request #600 from appirio-tech/feature/sticky_new_post_aft…
Dec 28, 2016
7c9b069
Github issue #372, [Pagination] - keep fixed pagination option displa…
Dec 28, 2016
4d8ad20
Merge pull request #601 from appirio-tech/feature/pagination_bar_redu…
Dec 28, 2016
f05e166
link color classes; fixes #599
Dec 29, 2016
b11517a
Merge pull request #604 from appirio-tech/fix-link-color
Dec 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/api/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function getTopicPosts(topicId, postIds) {
}

export function createTopic(topicProps) {
return axios.post(`${TC_API_URL}/v4/topics/`, topicProps)
return axios.post(`${TC_API_URL}/v4/topics/`, topicProps, { timeout: 1.5 * 60 * 1000 })
.then( resp => {
return _.get(resp.data, 'result.content', {})
})
Expand All @@ -54,7 +54,7 @@ export function createTopic(topicProps) {
// ignore resp
/*eslint-disable no-unused-vars */
export function addTopicPost(topicId, post) {
return axios.post(`${TC_API_URL}/v4/topics/${topicId}/posts`, { post: post.content } )
return axios.post(`${TC_API_URL}/v4/topics/${topicId}/posts`, { post: post.content }, { timeout: 1.5 * 60 * 1000 } )
.then( resp => {
return {
topicId,
Expand Down
12 changes: 11 additions & 1 deletion src/components/ActionCard/ActionCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,18 @@
border-radius: $corner-radius;
}

a {

// Link colors
a:link,
a:visited {
color: $tc-dark-blue;
text-decoration: none;
}

a:hover,
a:active {
color: $tc-dark-blue-70;
text-decoration: underline;
}

input {
Expand Down
265 changes: 145 additions & 120 deletions src/components/Grid/GridView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,133 +410,158 @@

/* .pages */
.pages {
background: $tc-gray-neutral-light;
min-height: 70px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
.right-page {
background: $tc-gray-neutral-light;
min-height: 70px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
.right-page {
background: $tc-white;
border: 1px solid $tc-gray-30;
border-radius: 2px;
height: 30px;
margin: 20px 20px 0 0;
float: right;
display: flex;
ul {
display: flex;
}
ul,
li,
.btn-prev,
.btn-next {
text-align: center;
// float: left;
}
li {
border-right: 1px solid $tc-gray-30;
position: relative;
&.active a {
background: $tc-gray-20;
box-shadow: inset -1px 1px 2px 0px rgba(71,71,79,0.20);
}
.down-layer {
background: $tc-white;
border: 1px solid $tc-gray-30;
border-radius: 2px;
height: 30px;
margin: 20px 20px 0 0;
float: right;
ul,
li,
.btn-prev,
.btn-next {
text-align: center;
float: left;
border-radius: 5px;
text-align: left;
min-width: 140px;
min-height: 55px;
margin-bottom: 15px;
position: absolute;
top: 40px;
left: 50%;
margin-left: -70px;
box-shadow: 0 0 10px rgba(10, 10, 10, 0.2);
z-index: 99;
&::before {
font-size: 0;
line-height: 0;
width: 0;
height: 0;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #fff;
content: "";
display: block;
position: absolute;
top: -7px;
left: 50%;
margin-left: -7px;
}
li {
border-right: 1px solid $tc-gray-30;
position: relative;
&.active a {
background: $tc-gray-20;
box-shadow: inset -1px 1px 2px 0px rgba(71,71,79,0.20);
}
.down-layer {
background: $tc-white;
border-radius: 5px;
text-align: left;
min-width: 140px;
min-height: 55px;
margin-bottom: 15px;
position: absolute;
top: 40px;
left: 50%;
margin-left: -70px;
box-shadow: 0 0 10px rgba(10, 10, 10, 0.2);
z-index: 99;
&::before {
font-size: 0;
line-height: 0;
width: 0;
height: 0;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #fff;
content: "";
display: block;
position: absolute;
top: -7px;
left: 50%;
margin-left: -7px;
}
.txt {
@include roboto;
font-size: $tc-label-md;
color: #394146;
line-height: $base-unit * 6;
padding: 13px 0 0 13px;
display: block;
float: left;
}
.inputs {
width: 34px;
height: 30px;
display: block;
margin: 13px 0 0 90px;
input {
@include roboto;
font-size: $tc-label-md;
color: #394146;
background: $tc-gray-neutral-light;
line-height: $base-unit * 4;
text-align: center;
height: 30px;
padding: 2px 0 0 0;
margin: 0;
}
}
}
.txt {
@include roboto;
font-size: $tc-label-md;
color: #394146;
line-height: $base-unit * 6;
padding: 13px 0 0 13px;
display: block;
float: left;
}
a {
.inputs {
width: 34px;
height: 30px;
display: block;
margin: 13px 0 0 90px;
input {
@include roboto;
font-size: $tc-label-md;
color: $tc-gray-80;
height: 28px;
min-width: 27px;
padding: 1px 8px;
line-height: $base-unit + 23;
display: block;
&.btn-prev {
border-right: 1px solid $tc-gray-30;
min-width: 70px;
padding-left: 24px;
position: relative;
&:before {
font-size: 0;
line-height: 0;
background: url("./images/arrow-left.svg") no-repeat 0 0;
width: 12px;
height: 12px;
content: "";
display: block;
position: absolute;
top: 9px;
left: 12px;
}
}
&.btn-next {
min-width: 70px;
padding-right: 24px;
position: relative;
&:after {
font-size: 0;
line-height: 0;
background: url("./images/arrow-right.svg") no-repeat 0 0;
width: 12px;
height: 12px;
content: "";
display: block;
position: absolute;
top: 9px;
right: 12px;
}
}
color: #394146;
background: $tc-gray-neutral-light;
line-height: $base-unit * 4;
text-align: center;
height: 30px;
padding: 2px 0 0 0;
margin: 0;
}
}
}

&.go-to-page-pill {
.tooltip-target {
min-width: 27px;
height: 28px;
}

.go-to-page-tooltip {
display: flex;
align-items: center;
@include tc-label-md;
line-height: $base-unit * 6;

input[type="number"] {
width: 50px;
height: $base-unit * 6;
margin-bottom: 0px;
margin-left: $base-unit * 2;
}
}
}
}
a {
@include roboto;
font-size: $tc-label-md;
color: $tc-gray-80;
height: 28px;
min-width: 27px;
padding: 1px 8px;
line-height: $base-unit + 23;
display: block;
&.btn-prev {
border-right: 1px solid $tc-gray-30;
min-width: 70px;
padding-left: 24px;
position: relative;
&:before {
font-size: 0;
line-height: 0;
background: url("./images/arrow-left.svg") no-repeat 0 0;
width: 12px;
height: 12px;
content: "";
display: block;
position: absolute;
top: 9px;
left: 12px;
}
}
&.btn-next {
min-width: 70px;
padding-right: 24px;
position: relative;
&:after {
font-size: 0;
line-height: 0;
background: url("./images/arrow-right.svg") no-repeat 0 0;
width: 12px;
height: 12px;
content: "";
display: block;
position: absolute;
top: 9px;
right: 12px;
}
}
}
}
}


Expand Down
Loading