Skip to content

Commit

Permalink
Merge branch 'master' into dependencies.io-update-build-342.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Leonya
Leonya authored Aug 21, 2018
2 parents 20ae68d + c00e29c commit f6f9b69
Show file tree
Hide file tree
Showing 1,179 changed files with 446,571 additions and 106 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ In case boilerplate generators are not your thing and you prefer to understand t

### Links

- [Living style guide](https://www.jetbrains.org/ring-ui/)
- [Living style guide](https://jetbrains.github.io/ring-ui)
- [GitHub repository](https://github.com/JetBrains/ring-ui)
- [Issues in YouTrack](https://youtrack.jetbrains.com/issues/RG)
- [Code review in Upsource](https://upsource.jetbrains.com/ring-ui/view)
Expand Down
86 changes: 84 additions & 2 deletions components/button/button.css
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@value unit, font-smaller-lower, border-radius, border-radius-small, icon-color, icon-disabled-color, borders-color, border-hover-color, content-background-color, dark-text-color, navigation-background-color, text-color, dark-secondary-color, selected-background-color, dark-selected-background-color, main-color, main-hover-color, error-color, icon-error-color, secondary-color, link-hover-color, disabled-color, dark-line-color, ease, font-size-smaller, font-size, font-family from "../global/global.css";
@value unit, font-smaller-lower, border-radius, border-radius-small, icon-color, icon-disabled-color, borders-color, border-hover-color, content-background-color, dark-text-color, navigation-background-color, text-color, dark-secondary-color, selected-background-color, dark-selected-background-color, main-color, main-hover-color, error-color, icon-error-color, secondary-color, link-hover-color, disabled-color, dark-line-color, ease, font-size-smaller, font-size, font-family, darcula-content-background-color, darcula-borders-color, darcula-main-color, darcula-border-hover-color, darcula-dark-text-color, darcula-main-hover-color, darcula-main-button-color, darcula-main-button-hover-color from "../global/global.css";
@value button-shadow: inset 0 0 0 1px;
@value height: calc(unit * 3);
@value loaderWidth: calc(unit * 8);
Expand Down Expand Up @@ -119,6 +119,88 @@
}
}

.darcula {
color: dark-secondary-color;
background-color: darcula-content-background-color;
box-shadow: button-shadow darcula-borders-color;

&:hover {
box-shadow: button-shadow darcula-border-hover-color;
}

&:active,
&.active {
color: dark-text-color;
box-shadow: button-shadow darcula-border-hover-color;
}

&[disabled],
&[disabled].primary,
&[disabled].withIcon {
color: text-color;
background-color: darcula-content-background-color;
box-shadow: button-shadow darcula-borders-color;
}

&[disabled] .icon {
color: #424242;
}

& .loaderBackground::before {
background-image:
linear-gradient(
to right,
darcula-content-background-color,
#424242 40%,
darcula-content-background-color 80%
);
}

&.primary {
background-color: darcula-main-button-color;

&:active,
&.active {
background-color: darcula-main-button-hover-color;
box-shadow: button-shadow darcula-main-button-color;
}

&:hover,
&:focus {
background-color: darcula-main-button-hover-color;
}

/* stylelint-disable */
& .loaderBackground::before {
background-image:
linear-gradient(
to right,
darcula-content-background-color,
#496b8b 40%,
darcula-content-background-color 80%
);
}
/* stylelint-enable */
}

&.danger:active,
&.danger.active {
color: error-color;
background-color: #26080a;
}

&.danger:active,
&.danger.active,
&.danger:focus,
&.danger:hover {
box-shadow: button-shadow #db5860;
}

&.text {
color: darcula-main-color;
}
}

.button {
composes: button from "../button-group/button-group.css";
composes: button from "../button-set/button-set.css";
Expand Down Expand Up @@ -158,7 +240,7 @@

transition: none;

box-shadow: inset 0 0 0 1px border-hover-color, 0 0 0 1px border-hover-color;
box-shadow: button-shadow border-hover-color, 0 0 0 1px border-hover-color;
}

&[disabled] {
Expand Down
9 changes: 9 additions & 0 deletions components/global/global.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
@value icon-warning-color: #eda200;
@value icon-success-color: #59a869;
@value popup-border-color: rgba(0, 42, 76, 0.1);
@value darcula-borders-color: #4c4c4c;
@value darcula-main-color: #71a0c8;
@value darcula-main-hover-color: #5f8db4;
@value darcula-main-button-color: #426583;
@value darcula-main-button-hover-color: #3c5b76;
@value darcula-border-hover-color: #aaa;

/* Text */
@value search-color: #669ecc;
Expand All @@ -30,6 +36,7 @@
@value dark-secondary-color: #888;
@value disabled-color: #bbb;
@value dark-active-color: #ccc;
@value darcula-dark-text-color: #777;

/* Background */
@value content-background-color: #fff;
Expand All @@ -38,6 +45,8 @@
@value dark-selected-background-color: #001526;
@value message-background-color: rgba(0, 21, 38, 0.9);
@value navigation-background-color: #000;
@value darcula-background-color: #2d2e2f;
@value darcula-content-background-color: rgba(70, 70, 70, 0.2);

/* Deprecated, use referenced values instead */
@value black-color: navigation-background-color;
Expand Down
3 changes: 2 additions & 1 deletion components/global/theme.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const Theme = {
LIGHT: 'light',
DARK: 'dark'
DARK: 'dark',
DARCULA: 'darcula'
};

function applyTheme(params) {
Expand Down
2 changes: 2 additions & 0 deletions components/popup/popup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export default class Popup extends Component {

directions: PropTypes.arrayOf(PropTypes.string),
autoPositioning: PropTypes.bool,
autoCorrectTopOverflow: PropTypes.bool,
left: PropTypes.number,
top: PropTypes.number,
maxHeight: PropTypes.number,
Expand Down Expand Up @@ -101,6 +102,7 @@ export default class Popup extends Component {

directions: DEFAULT_DIRECTIONS,
autoPositioning: true,
autoCorrectTopOverflow: true,
left: 0,
top: 0,
offset: 0,
Expand Down
22 changes: 13 additions & 9 deletions components/popup/position.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ function horizontalOverflow(styles, scrollingCoordinates, attrs) {
export const positionPropKeys = [
'directions',
'autoPositioning',
'autoCorrectTopOverflow',
'sidePadding',
'top',
'left',
Expand Down Expand Up @@ -227,7 +228,8 @@ export default function position(attrs) {
left,
offset,
maxHeight,
minWidth
minWidth,
autoCorrectTopOverflow = true
} = attrs;

let styles = {
Expand Down Expand Up @@ -274,14 +276,16 @@ export default function position(attrs) {
styles.maxHeight = maxHeight;
}

styles = handleTopOffScreen({
sidePadding,
styles,
anchorRect,
maxHeight,
direction: chosenDirection,
popupScrollHeight: popup.scrollHeight
});
if (autoCorrectTopOverflow) {
styles = handleTopOffScreen({
sidePadding,
styles,
anchorRect,
maxHeight,
direction: chosenDirection,
popupScrollHeight: popup.scrollHeight
});
}

if (minWidth === MinWidth.TARGET || minWidth === 'target') {
styles.minWidth = anchorRect.width;
Expand Down
1 change: 1 addition & 0 deletions components/select/select__popup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ export default class SelectPopup extends Component {
left={this.props.left}
onMouseDown={this.mouseDownHandler}
target={this.props.ringPopupTarget}
autoCorrectTopOverflow={false}
>
{this.state.shortcuts &&
(
Expand Down
1 change: 1 addition & 0 deletions docs/113ce9c5d5c91cd0174e368b01c65cef.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/213eb920172d11f29220c39dfd9ae65d.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/36864f7857dc1fb2277f7bc4fae393db.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions docs/CHANGELOG.data.js
View file

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions docs/CHANGELOG.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="favicon.ico?v=2" type="image/x-icon" sizes="16x16 32x32"/>
<title>Changelog — Ring UI</title>
<meta name="description" content="">
<!-- Google Tag Manager -->
<script>(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
var f = d.getElementsByTagName(s)[0], j = d.createElement(s),
dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-5P98');
</script>
<!-- End Google Tag Manager -->
</head>
<body>
<!-- Google Tag Manager (noscript) -->
<noscript>
<iframe src="https://www.googletagmanager.com/ns.html?id=GTM­5P98" height="0" width="0"
style="display:none;visibility:hidden"></iframe>
</noscript>
<!-- End Google Tag Manager (noscript) -->
<div id="app">
<script src="CHANGELOG.data.js"></script>
<script src="nav.js"></script>
<script src="version.js"></script>
<script src="dll-development/vendor.dll.js"></script>
<script src="docs-app.js"></script>
</div>
</body>
</html>
78 changes: 78 additions & 0 deletions docs/CHANGELOG.md.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // identity function for calling harmony imports with the correct context
/******/ __webpack_require__.i = function(value) { return value; };
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "/";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1025);
/******/ })
/************************************************************************/
/******/ ({

/***/ 1025:
/***/ (function(module, exports) {

eval("// empty (null-loader)//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMTAyNS5qcyIsInNvdXJjZXMiOlsid2VicGFjazovLy8uL0NIQU5HRUxPRy5tZD83ZTAwIl0sInNvdXJjZXNDb250ZW50IjpbIi8vIGVtcHR5IChudWxsLWxvYWRlcilcblxuXG4vLy8vLy8vLy8vLy8vLy8vLy9cbi8vIFdFQlBBQ0sgRk9PVEVSXG4vLyAuL34vbnVsbC1sb2FkZXIhLi9DSEFOR0VMT0cubWRcbi8vIG1vZHVsZSBpZCA9IDEwMjVcbi8vIG1vZHVsZSBjaHVua3MgPSA1Il0sIm1hcHBpbmdzIjoiQUFBQSIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///1025\n");

/***/ })

/******/ });
Loading

0 comments on commit f6f9b69

Please sign in to comment.