diff --git a/server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js b/server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js index 3f35aec4d52..21aec4ffbc0 100644 --- a/server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js +++ b/server/zanata-frontend/src/frontend/app/components/Modal/Modal.story.js @@ -1,32 +1,34 @@ import React from 'react' import ReactDOM from 'react-dom' import Draggable from 'react-draggable' -import { storiesOf } from '@kadira/storybook' -import { action, decorateAction } from '@kadira/storybook-addon-actions' -import { Button, Panel, Row, Table, Well, Checkbox, InputGroup, Col, +import {storiesOf} from '@kadira/storybook' +import {action, decorateAction} from '@kadira/storybook-addon-actions' +import { + Button, Panel, Row, Table, Well, Checkbox, InputGroup, Col, FormControl, DropdownButton, MenuItem, ListGroup, ListGroupItem, PanelGroup, -OverlayTrigger, Tooltip } + OverlayTrigger, Tooltip +} from 'react-bootstrap' -import { Icon, Modal } from '../../components' +import {Icon, Modal} from '../../components' import Lorem from 'react-lorem-component' -const tooltipSort = ( +const tooltipSort = ( Best match will be chosen based on the priority of selected projects. Exact matches take precendence. ) -const tooltipReadOnly = ( +const tooltipReadOnly = ( Read only ) -const heading1 =

Project A

-const heading2 =

Project B +const heading1 =

Project A

+const heading2 =

Project B - + className='s0 icon-locked'/> +

const currentProject = 'Current project' @@ -34,9 +36,9 @@ const currentVersion = 'Current version' storiesOf('Modal', module) .addDecorator((story) => ( -
- {story()} -
+
+ {story()} +
)) .add('default', () => ( - 2.0 - - - - - - 1.0 - - - + + + + + + + + 2.0 + + + + + + 1.0 + + + diff --git a/server/zanata-frontend/src/frontend/app/styles/style.less b/server/zanata-frontend/src/frontend/app/styles/style.less index 36a1d74578c..23cff0fc5c0 100644 --- a/server/zanata-frontend/src/frontend/app/styles/style.less +++ b/server/zanata-frontend/src/frontend/app/styles/style.less @@ -1549,6 +1549,17 @@ button.btn-link-sort i.fa.fa-sort { color: @color-warning; } +.vmerge-transtxt { + font-weight: 600; + color: @color-success; +} + +.vmerge-apptxt { + font-weight: 600; + color: @color-light; +} + + .vmerge-boxes .list-group-item:last-child { border-bottom-left-radius: 0; border-bottom-right-radius: 0; @@ -1617,7 +1628,7 @@ label .s0.icon-locked { } .modal-body .dropdown .dropdown-menu > li > a { -font-size: 0.6em; +font-size: 0.75em; } .alert { @@ -2179,7 +2190,6 @@ span.infotxt { .checkbox label, .radio label { font-weight: 400; - min-height: 1.85rem; margin-bottom: 0; padding-left: @spacing-re; cursor: pointer;