Skip to content

Commit

Permalink
updated to 1.0.36
Browse files Browse the repository at this point in the history
  • Loading branch information
xsburg committed Aug 3, 2016
1 parent 6a64f5e commit 0170733
Show file tree
Hide file tree
Showing 11 changed files with 2,168 additions and 2,175 deletions.
4,090 changes: 2,056 additions & 2,034 deletions dist/core.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core.bundle.js.map

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions dist/core.bundle.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core.bundle.min.js.map

Large diffs are not rendered by default.

126 changes: 49 additions & 77 deletions dist/styles.bundle.css

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

2 changes: 1 addition & 1 deletion dist/styles.bundle.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "comindware.core.ui",
"version": "1.0.35",
"version": "1.0.36",
"license": "MIT",
"description": "Comindware Core UI provides the basic components like editors, lists, dropdowns, popups that we so desperately need while creating Marionette-based single-page applications.",
"homepage": "http://comindware.github.io/core-ui/",
Expand Down Expand Up @@ -29,7 +29,7 @@
},
"author": {
"name": "Stepan Burguchev",
"url": "https://github.com/xSkara"
"url": "https://github.com/xsburg"
},
"maintainers": [
{
Expand All @@ -42,6 +42,7 @@
"babel-core": "^6.4.5",
"babel-loader": "^6.2.1",
"babel-plugin-transform-es2015-modules-commonjs": "^6.4.5",
"babel-plugin-transform-runtime": "^6.4.3",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.5.0",
Expand Down Expand Up @@ -88,7 +89,6 @@
"webpack": "^1.12.12"
},
"dependencies": {
"babel-plugin-transform-runtime": "^6.4.3",
"backbone": "1.1.2",
"backbone-associations": "0.6.2",
"backbone.marionette": "2.2.0",
Expand Down
38 changes: 38 additions & 0 deletions resources/styles/list.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* List/Grid CSS */

.list-item {
height: 34px;
padding: 0 5px;
Expand Down Expand Up @@ -292,3 +293,40 @@
margin-left: -14px;
margin-top: 4px;
}

/* Scrollbar */

.scrollbar-region{
position: absolute;
width: 10px;
right: 0;
bottom: 0;
top: 46px;
}
.scrollbar {
height: 100%;
background-color: #fcfcfc;
z-index: 1;
position: absolute;
width: 12px;
}
.dragger {
position: relative;
top: 0;
height: 10%;
background-color: #d9d7d7;
opacity: 0.3;
}

.scrollbar.hover {
background-color: #F0F0F0;
}

.scrollbar.hover .dragger {
background-color: #B9B9B9;
opacity: 1;
}

.scrollbar .dragger.active {
background-color: #A0A0A0;
}
File renamed without changes.
38 changes: 0 additions & 38 deletions resources/styles/scrollbar.css

This file was deleted.

3 changes: 1 addition & 2 deletions src/coreApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ import '../resources/styles/fonts.css';
import '../resources/styles/common.css';
import '../resources/styles/form.css';
import '../resources/styles/dropdown.css';
import '../resources/styles/pop.out.css';
import '../resources/styles/popout.css';
import '../resources/styles/list.css';
import '../resources/styles/scrollbar.css';

import libApi from './libApi';
import utilsApi from './utils/utilsApi';
Expand Down

0 comments on commit 0170733

Please sign in to comment.