diff --git a/src/api/messages.js b/src/api/messages.js index 7e0aff8e0..c4149a07d 100644 --- a/src/api/messages.js +++ b/src/api/messages.js @@ -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', {}) }) @@ -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, diff --git a/src/components/ActionCard/ActionCard.scss b/src/components/ActionCard/ActionCard.scss index e5cff5a8a..6b8a57410 100644 --- a/src/components/ActionCard/ActionCard.scss +++ b/src/components/ActionCard/ActionCard.scss @@ -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 { diff --git a/src/components/Grid/GridView.scss b/src/components/Grid/GridView.scss index 001d5bf38..64e64a1d1 100644 --- a/src/components/Grid/GridView.scss +++ b/src/components/Grid/GridView.scss @@ -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; + } + } } + } } diff --git a/src/components/Grid/PaginationBar.jsx b/src/components/Grid/PaginationBar.jsx index 1d59c1f0e..b25face23 100644 --- a/src/components/Grid/PaginationBar.jsx +++ b/src/components/Grid/PaginationBar.jsx @@ -2,6 +2,9 @@ import React, { PropTypes } from 'react' import cn from 'classnames' import _ from 'lodash' import { branch, renderComponent } from 'recompose' +import { Tooltip } from 'appirio-tech-react-components' + +const NUMBER_OF_PILLS = 5 const noop = () =>