Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@seogi1004
seogi1004 committed Dec 16, 2015
2 parents c757e2c + 1377574 commit 9c7aece
Show file tree
Hide file tree
Showing 89 changed files with 5,784 additions and 7,534 deletions.
4 changes: 3 additions & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module.exports = function(grunt) {

var chart_src = [
// chart (core)
"js/chart/vector.js",
"js/chart/draw.js",
"js/chart/axis.js",
"js/chart/map.js",
Expand All @@ -75,7 +76,7 @@ module.exports = function(grunt) {

// chart.polygon
"js/chart/polygon/core.js",
"js/chart/polygon/face.js",
"js/chart/polygon/grid.js",
"js/chart/polygon/line.js",
"js/chart/polygon/point.js",
"js/chart/polygon/cube.js",
Expand Down Expand Up @@ -166,6 +167,7 @@ module.exports = function(grunt) {
"js/chart/brush/polygon.core.js",
"js/chart/brush/polygon.scatter.js",
"js/chart/brush/polygon.column.js",
"js/chart/brush/polygon.line.js",

// chart.widget
"js/chart/widget/core.js",
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jui",
"version": "1.4.2",
"version": "1.4.3",
"main": "jui.min.js",
"ignore": [
".jshintrc",
Expand Down
93 changes: 62 additions & 31 deletions dist/dark.theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
color: transparent;
}
.jui .datepicker > table.body td.now {
color: #a870fc;
color: #a47afe;
font-weight: bold;
}
.jui .datepicker > table.body td.active {
Expand Down Expand Up @@ -248,7 +248,7 @@
color: transparent;
}
.jui .calendar > table.body td.now {
color: #a870fc;
color: #a47afe;
}
.jui .calendar > table.body td.active {
background-color: #333333;
Expand Down Expand Up @@ -464,7 +464,7 @@
.jui ul.tree li.active > a,
.jui ul.tree li.active > span,
.jui ul.tree li.active > div {
color: #a870fc;
color: #a47afe;
font-weight: bold;
}
.jui ul.tree .drag.on {
Expand Down Expand Up @@ -860,7 +860,7 @@
color: inherit;
}
.jui .vmenu > *.submenu > li.active {
color: #a870fc;
color: #a47afe;
}
.jui .vmenu > *.submenu > li.active > * {
color: inherit;
Expand Down Expand Up @@ -892,7 +892,7 @@
background-image: -ms-linear-gradient(top, #1d1d1d 0%, #1d1d1d 100%) !important;
}
.jui .vmenu.flat > *.active {
color: #a870fc !important;
color: #a47afe !important;
}
.jui .vmenu.flat > *:hover:not(.active):not(.submenu) {
background-color: #2c2c2c !important;
Expand All @@ -917,7 +917,7 @@
color: inherit;
}
.jui .vmenu.flat > *.submenu > li.active {
color: #a870fc;
color: #a47afe;
}
.jui .vmenu.flat > *.submenu > li.active > * {
color: inherit;
Expand All @@ -942,6 +942,11 @@
width: 10px;
height: 10px;
}
.jui .msgbox > .body::-webkit-scrollbar-corner {
background: transparent;
border-right: 1px solid #404040;
border-bottom: 1px solid #404040;
}
.jui .msgbox > .body::-webkit-scrollbar-track {
background-color: #000000;
background-image: -moz-linear-gradient(left, #000000 0%, #272727 100%);
Expand Down Expand Up @@ -1020,19 +1025,19 @@
.jui .window {
color: #d5d5d5;
background-color: #222222;
border: none;
-webkit-box-shadow: 1px 1px 10px 1px rgba(0, 0, 0, 0.8);
-moz-box-shadow: 1px 1px 10px 1px rgba(0, 0, 0, 0.8);
box-shadow: 1px 1px 10px 1px rgba(0, 0, 0, 0.8);
border: 1px solid rgba(255, 255, 255, 0.05);
-webkit-box-shadow: 1px 1px 15px 1px rgba(0, 0, 0, 0.8);
-moz-box-shadow: 1px 1px 15px 1px rgba(0, 0, 0, 0.8);
box-shadow: 1px 1px 15px 1px rgba(0, 0, 0, 0.8);
}
.jui .window > .head {
color: #d5d5d5;
background-color: #242424;
background-image: -moz-linear-gradient(top, #242424 0%, #111111 100%);
background-image: linear-gradient(top, #242424 0%, #111111 100%);
background-image: -webkit-linear-gradient(top, #242424 0%, #111111 100%);
background-image: -o-linear-gradient(top, #242424 0%, #111111 100%);
background-image: -ms-linear-gradient(top, #242424 0%, #111111 100%);
background-color: #1f1f1f;
background-image: -moz-linear-gradient(top, #1f1f1f 0%, #111111 100%);
background-image: linear-gradient(top, #1f1f1f 0%, #111111 100%);
background-image: -webkit-linear-gradient(top, #1f1f1f 0%, #111111 100%);
background-image: -o-linear-gradient(top, #1f1f1f 0%, #111111 100%);
background-image: -ms-linear-gradient(top, #1f1f1f 0%, #111111 100%);
}
.jui .window > .body {
background-color: #222222;
Expand All @@ -1042,6 +1047,11 @@
width: 10px;
height: 10px;
}
.jui .window > .body::-webkit-scrollbar-corner {
background: transparent;
border-right: 1px solid #404040;
border-bottom: 1px solid #404040;
}
.jui .window > .body::-webkit-scrollbar-track {
background-color: #000000;
background-image: -moz-linear-gradient(left, #000000 0%, #272727 100%);
Expand All @@ -1063,18 +1073,18 @@
border: 1px solid #737373;
}
.jui .window > .foot {
background-color: #242424;
background-image: -moz-linear-gradient(top, #242424 0%, #111111 100%);
background-image: linear-gradient(top, #242424 0%, #111111 100%);
background-image: -webkit-linear-gradient(top, #242424 0%, #111111 100%);
background-image: -o-linear-gradient(top, #242424 0%, #111111 100%);
background-image: -ms-linear-gradient(top, #242424 0%, #111111 100%);
border-top: 1px solid #404040;
background-color: #1a1a1a;
background-image: -moz-linear-gradient(top, #1a1a1a 0%, #111111 100%);
background-image: linear-gradient(top, #1a1a1a 0%, #111111 100%);
background-image: -webkit-linear-gradient(top, #1a1a1a 0%, #111111 100%);
background-image: -o-linear-gradient(top, #1a1a1a 0%, #111111 100%);
background-image: -ms-linear-gradient(top, #1a1a1a 0%, #111111 100%);
border-top: 1px solid #2d2d2d;
}
.jui .input {
color: #d5d5d5;
background-color: #1a1a1a;
border: 1px solid #6c6c6c;
border: 1px solid #606060;
text-shadow: none;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
Expand All @@ -1086,7 +1096,7 @@
.jui .input:focus {
color: #d5d5d5;
border-color: #a870fc;
background-color: #NANNAN0A;
background-color: none;
outline: 0;
-webkit-box-shadow: inset 0 4px 5px -5px rgba(0,0,0,0.3), 0 0 1px 1px rgba(136,74,228,.095);
-moz-box-shadow: inset 0 4px 5px -5px rgba(0,0,0,0.3), 0 0 1px 1px rgba(136,74,228,.095);
Expand Down Expand Up @@ -1317,6 +1327,11 @@
width: 10px;
height: 10px;
}
.jui table.table > tbody::-webkit-scrollbar-corner {
background: transparent;
border-right: 1px solid #404040;
border-bottom: 1px solid #404040;
}
.jui table.table > tbody::-webkit-scrollbar-track {
background-color: #000000;
background-image: -moz-linear-gradient(left, #000000 0%, #272727 100%);
Expand All @@ -1338,7 +1353,7 @@
border: 1px solid #737373;
}
.jui .table.classic {
border-bottom: 1px solid #404040 !important;
border-bottom: 1px solid #404040;
}
.jui .table.classic > thead th {
color: #d5d5d5;
Expand Down Expand Up @@ -1434,7 +1449,7 @@
background: #393939;
}
.jui .table.expand {
border-bottom: 1px solid #404040 !important;
border-bottom: 1px solid #404040;
}
.jui .table.expand > thead th {
color: #d5d5d5;
Expand Down Expand Up @@ -1667,13 +1682,24 @@
-o-transition: border linear .2s, box-shadow linear .2s;
transition: border linear .2s, box-shadow linear .2s;
}
.jui .xtable > .body {
border-bottom: 1px solid #404040 !important;
.jui .table > tbody td > .edit[disabled],
.jui .table > tbody td > .edit[readonly] {
cursor: not-allowed;
background-color: #2a2a2a;
color: #d5d5d5;
}
.jui .xtable > .loading {
background-image: url("img/theme/dark/xtable-loading.gif");
}
.jui .xtable > .body::-webkit-scrollbar {
width: 10px;
height: 10px;
}
.jui .xtable > .body::-webkit-scrollbar-corner {
background: transparent;
border-right: 1px solid #404040;
border-bottom: 1px solid #404040;
}
.jui .xtable > .body::-webkit-scrollbar-track {
background-color: #000000;
background-image: -moz-linear-gradient(left, #000000 0%, #272727 100%);
Expand All @@ -1694,8 +1720,13 @@
background: #8a8a8a;
border: 1px solid #737373;
}
.jui .xtable > .loading {
background-image: url("img/theme/dark/xtable-loading.gif");
.jui .xtable.scroll > .head {
border-left: 1px solid #5d5d5d;
border-right: 1px solid #5d5d5d;
}
.jui .xtable.scroll > .body {
border-left: 1px solid #5d5d5d;
border-bottom: 1px solid #5d5d5d;
}
.jui .combo > ul {
background-color: #181818;
Expand Down
2 changes: 1 addition & 1 deletion dist/dark.theme.min.css
View file

Large diffs are not rendered by default.

Binary file modified dist/img/icon-list.eot
View file
Binary file not shown.
Loading

0 comments on commit 9c7aece

Please sign in to comment.