Permalink
Browse files

merge bui master

  • Loading branch information...
1 parent 37fac34 commit 76ef9758a537103b4238256e8be30d9c3e38c4f9 @xielun xielun committed Mar 24, 2014
Showing with 8,560 additions and 1,628 deletions.
  1. +55 −0 assets/css/bs3/less/base/badges.less
  2. +26 −0 assets/css/bs3/less/base/breadcrumbs.less
  3. +226 −0 assets/css/bs3/less/base/button-groups.less
  4. +159 −0 assets/css/bs3/less/base/buttons.less
  5. 0 assets/css/bs3/less/base/dpl.less
  6. +438 −0 assets/css/bs3/less/base/forms.less
  7. +233 −0 assets/css/bs3/less/base/glyphicons.less
  8. +162 −0 assets/css/bs3/less/base/input-groups.less
  9. +64 −0 assets/css/bs3/less/base/labels.less
  10. +110 −0 assets/css/bs3/less/base/list-group.less
  11. +929 −0 assets/css/bs3/less/base/mixins.less
  12. +139 −0 assets/css/bs3/less/base/modals.less
  13. +55 −0 assets/css/bs3/less/base/pager.less
  14. +88 −0 assets/css/bs3/less/base/pagination.less
  15. +241 −0 assets/css/bs3/less/base/panels.less
  16. +133 −0 assets/css/bs3/less/base/popovers.less
  17. +80 −0 assets/css/bs3/less/base/progress-bars.less
  18. +95 −0 assets/css/bs3/less/base/tooltip.less
  19. +293 −0 assets/css/bs3/less/base/type.less
  20. +56 −0 assets/css/bs3/less/base/utilities.less
  21. +829 −0 assets/css/bs3/less/base/variables.less
  22. +29 −0 assets/css/bs3/less/base/wells.less
  23. +1 −1 assets/css/bui-min.css
  24. +28 −0 assets/css/bui.css
  25. +1 −1 assets/css/calendar-min.css
  26. +3 −0 assets/css/calendar.css
  27. +1 −0 assets/css/less/bui/menu.less
  28. +24 −0 assets/css/less/bui/uploader.less
  29. +4 −0 assets/css/less/single/calendar.less
  30. +1 −1 assets/css/menu-min.css
  31. +1 −0 assets/css/menu.css
  32. +1 −1 build/adapter-min.js
  33. +4 −1 build/adapter.js
  34. +9 −9 build/bui-min.js
  35. +280 −299 build/bui.js
  36. +0 −20 build/calendar.js
  37. +3 −3 build/chart-min.js
  38. +595 −78 build/chart.js
  39. +3 −3 build/common-min.js
  40. +77 −38 build/common.js
  41. +1 −1 build/css/bui-min.css
  42. +28 −0 build/css/bui.css
  43. +1 −1 build/css/calendar-min.css
  44. +3 −0 build/css/calendar.css
  45. +1 −1 build/css/menu-min.css
  46. +1 −0 build/css/menu.css
  47. +4 −26 build/data.js
  48. +1 −1 build/extensions/treepicker-min.js
  49. +3 −0 build/extensions/treepicker.js
  50. +2 −2 build/form-min.js
  51. +36 −29 build/form.js
  52. +4 −4 build/graphic-min.js
  53. +9 −7 build/graphic.js
  54. +2 −2 build/grid-min.js
  55. +74 −56 build/grid.js
  56. +1 −1 build/list-min.js
  57. +45 −19 build/list.js
  58. +4 −8 build/mask.js
  59. +1 −1 build/menu-min.js
  60. +12 −24 build/menu.js
  61. +1 −1 build/module.js
  62. +1 −1 build/overlay-min.js
  63. +18 −8 build/overlay.js
  64. +3 −3 build/seed-min.js
  65. +77 −38 build/seed.js
  66. +5 −17 build/select.js
  67. +1 −17 build/tab.js
  68. +2 −37 build/toolbar.js
  69. +2 −0 build/tree.js
  70. +1 −1 build/uploader-min.js
  71. +290 −214 build/uploader.js
  72. +11 −0 perform/shape.php
  73. +45 −0 perform/specs/shape-spec.js
  74. +1 −9 src/bar/bar.js
  75. +0 −16 src/bar/baritem.js
  76. +0 −4 src/bar/numberpagingbar.js
  77. +1 −8 src/bar/pagingbar.js
  78. +0 −4 src/calendar/calendar.js
  79. +0 −4 src/calendar/datepicker.js
  80. +0 −4 src/calendar/monthpicker.js
  81. +0 −8 src/calendar/panel.js
  82. +3 −0 src/chart/axis/auto.js
  83. +1 −1 src/chart/axis/base.js
  84. +5 −1 src/chart/axis/category.js
  85. +15 −0 src/chart/axis/circle.js
  86. +8 −0 src/chart/axis/grid.js
  87. +1 −0 src/chart/axis/number.js
  88. +118 −5 src/chart/chart.js
  89. +18 −8 src/chart/labels.js
  90. +24 −2 src/chart/mixin/activedgroup.js
  91. +3 −3 src/chart/plotback.js
  92. +53 −2 src/chart/plotitem.js
  93. +33 −4 src/chart/series/base.js
  94. +1 −1 src/chart/series/bubble.js
  95. +4 −22 src/chart/series/column.js
  96. +91 −9 src/chart/series/itemgroup.js
  97. +6 −0 src/chart/series/line.js
  98. +82 −9 src/chart/series/pie.js
  99. +120 −9 src/chart/seriesgroup.js
  100. +9 −2 src/chart/tooltip.js
  101. +4 −1 src/common/adapter.js
  102. +7 −2 src/common/component/controller.js
  103. +3 −0 src/common/component/uibase/base.js
  104. +0 −4 src/common/component/uibase/bindable.js
  105. +6 −1 src/common/component/uibase/decorate.js
  106. +4 −4 src/common/component/uibase/keynav.js
  107. +0 −8 src/common/component/uibase/position.js
  108. +2 −8 src/common/component/uibase/selection.js
  109. +1 −1 src/common/component/uibase/stdmod.js
  110. +36 −1 src/common/observable.js
  111. +18 −9 src/common/util.js
  112. +1 −8 src/data/proxy.js
  113. +1 −8 src/data/sortable.js
  114. +0 −8 src/data/store.js
  115. +2 −2 src/data/treestore.js
  116. +3 −0 src/extensions/treepicker.js
  117. +1 −1 src/form/field.js
  118. +6 −4 src/form/field/date.js
  119. +1 −1 src/form/field/uploader.js
  120. +2 −1 src/form/fieldcontainer.js
  121. +1 −1 src/form/remote.js
  122. +1 −12 src/form/tips.js
  123. +24 −9 src/form/valid.js
  124. +1 −1 src/graphic/canvas.js
  125. +3 −1 src/graphic/canvasitem.js
  126. +3 −3 src/graphic/container.js
  127. +1 −1 src/graphic/raphael/group.js
  128. +1 −1 src/graphic/shape.js
  129. +0 −8 src/grid/column.js
  130. +1 −9 src/grid/header.js
  131. +15 −8 src/grid/plugins/autofit.js
  132. +0 −8 src/grid/plugins/cascade.js
  133. +32 −0 src/grid/plugins/dialog.js
  134. +27 −0 src/grid/plugins/editing.js
  135. +0 −12 src/grid/plugins/selection.js
  136. +0 −8 src/grid/simplegrid.js
  137. +0 −4 src/grid/util.js
  138. +37 −0 src/list/keynav.js
  139. +0 −4 src/list/list.js
  140. +0 −4 src/list/listitem.js
  141. +8 −11 src/list/simplelist.js
  142. +4 −8 src/mask/loadMask.js
  143. +0 −4 src/menu/contextmenu.js
  144. +0 −4 src/menu/menu.js
  145. +12 −8 src/menu/menuitem.js
  146. +0 −8 src/menu/sidemenu.js
  147. +1 −1 src/module/module.js
  148. +0 −4 src/overlay/dialog.js
  149. +18 −4 src/overlay/overlay.js
  150. +3 −4 src/select/combox.js
  151. +0 −4 src/select/select.js
  152. +2 −9 src/select/suggest.js
  153. +1 −9 src/tab/navtab.js
  154. +0 −8 src/tab/navtabitem.js
  155. +1 −0 src/tree/treelist.js
  156. +1 −0 src/tree/treemenu.js
  157. +96 −98 src/uploader/button/base.js
  158. +5 −26 src/uploader/button/htmlButton.js
  159. +2 −13 src/uploader/button/swfButton.js
  160. +19 −0 src/uploader/queue.js
  161. +2 −2 src/uploader/theme.js
  162. +4 −7 src/uploader/type/ajax.js
  163. +0 −1 src/uploader/type/base.js
  164. +1 −4 src/uploader/type/flash.js
  165. +0 −1 src/uploader/type/iframe.js
  166. +161 −62 src/uploader/uploader.js
  167. +7 −0 test/chart/area-series.php
  168. +1 −0 test/chart/bubble.php
  169. +1 −2 test/chart/chart.php
  170. +4 −0 test/chart/column-series.php
  171. +75 −0 test/chart/data-chart.php
  172. +4 −3 test/chart/graphic.php
  173. +2 −2 test/chart/pie.php
  174. +2 −0 test/chart/radar.php
  175. +3 −0 test/chart/scatter.php
  176. +14 −0 test/data/chart.json
  177. +8 −0 test/data/pie.json
  178. +5 −0 test/data/radar.json
  179. +1 −0 test/data/uploader.json
  180. +2 −2 test/editor.php
  181. +4 −1 test/form-panel.php
  182. +6 −0 test/form-submit.php
  183. +4 −3 test/grid-plugin.php
  184. +3 −2 test/index.php
  185. +22 −5 test/issue.php
  186. +2 −3 test/specs/chart/chart-area-spec.js
  187. +520 −0 test/specs/chart/data-chart-spec.js
  188. +5 −3 test/specs/chart/dynamic-spec.js
  189. +112 −1 test/specs/chart/pie-spec.js
  190. +86 −0 test/specs/chart/radar-data-spec.js
  191. +3 −3 test/specs/chart/radar-line-spec.js
  192. +2 −0 test/specs/editor-dialog-spec.js
  193. +10 −0 test/specs/form-field-spec.js
  194. +13 −0 test/specs/form-remote-spec.js
  195. +21 −0 test/specs/issue/issue-100-spec.js
  196. +31 −0 test/specs/issue/issue-102-spec.js
  197. +31 −0 test/specs/issue/issue-109-spec.js
  198. +28 −0 test/specs/issue/issue-117-spec.js
  199. 0 test/specs/{ → issue}/issue-62-spec.js
  200. 0 test/specs/{ → issue}/issue-67-spec.js
  201. +15 −0 test/specs/plugin-editor-dialog-spec.js
  202. +19 −3 test/specs/tooltip-spec.js
  203. +2 −2 test/specs/tree-picker-spec.js
  204. +119 −9 test/specs/uploader-spec.js
  205. +15 −0 test/specs/util-spec.js
  206. +8 −5 test/templates/script.php
  207. +1 −0 test/tips.php
  208. +0 −3 test/uploader.php
@@ -0,0 +1,55 @@
+//
+// Badges
+// --------------------------------------------------
+
+
+// Base classes
+.badge {
+ display: inline-block;
+ min-width: 10px;
+ padding: 3px 7px;
+ font-size: @font-size-small;
+ font-weight: @badge-font-weight;
+ color: @badge-color;
+ line-height: @badge-line-height;
+ vertical-align: baseline;
+ white-space: nowrap;
+ text-align: center;
+ background-color: @badge-bg;
+ border-radius: @badge-border-radius;
+
+ // Empty badges collapse automatically (not available in IE8)
+ &:empty {
+ display: none;
+ }
+
+ // Quick fix for badges in buttons
+ .btn & {
+ position: relative;
+ top: -1px;
+ }
+ .btn-xs & {
+ top: 0;
+ padding: 1px 5px;
+ }
+}
+
+// Hover state, but only for links
+a.badge {
+ &:hover,
+ &:focus {
+ color: @badge-link-hover-color;
+ text-decoration: none;
+ cursor: pointer;
+ }
+}
+
+// Account for counters in navs
+a.list-group-item.active > .badge,
+.nav-pills > .active > a > .badge {
+ color: @badge-active-color;
+ background-color: @badge-active-bg;
+}
+.nav-pills > li > a > .badge {
+ margin-left: 3px;
+}
@@ -0,0 +1,26 @@
+//
+// Breadcrumbs
+// --------------------------------------------------
+
+
+.breadcrumb {
+ padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;
+ margin-bottom: @line-height-computed;
+ list-style: none;
+ background-color: @breadcrumb-bg;
+ border-radius: @border-radius-base;
+
+ > li {
+ display: inline-block;
+
+ + li:before {
+ content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
+ padding: 0 5px;
+ color: @breadcrumb-color;
+ }
+ }
+
+ > .active {
+ color: @breadcrumb-active-color;
+ }
+}
@@ -0,0 +1,226 @@
+//
+// Button groups
+// --------------------------------------------------
+
+// Make the div behave like a button
+.btn-group,
+.btn-group-vertical {
+ position: relative;
+ display: inline-block;
+ vertical-align: middle; // match .btn alignment given font-size hack above
+ > .btn {
+ position: relative;
+ float: left;
+ // Bring the "active" button to the front
+ &:hover,
+ &:focus,
+ &:active,
+ &.active {
+ z-index: 2;
+ }
+ &:focus {
+ // Remove focus outline when dropdown JS adds it after closing the menu
+ outline: none;
+ }
+ }
+}
+
+// Prevent double borders when buttons are next to each other
+.btn-group {
+ .btn + .btn,
+ .btn + .btn-group,
+ .btn-group + .btn,
+ .btn-group + .btn-group {
+ margin-left: -1px;
+ }
+}
+
+// Optional: Group multiple button groups together for a toolbar
+.btn-toolbar {
+ margin-left: -5px; // Offset the first child's margin
+ &:extend(.clearfix all);
+
+ .btn-group,
+ .input-group {
+ float: left;
+ }
+ > .btn,
+ > .btn-group,
+ > .input-group {
+ margin-left: 5px;
+ }
+}
+
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+ border-radius: 0;
+}
+
+// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
+.btn-group > .btn:first-child {
+ margin-left: 0;
+ &:not(:last-child):not(.dropdown-toggle) {
+ .border-right-radius(0);
+ }
+}
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+ .border-left-radius(0);
+}
+
+// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)
+.btn-group > .btn-group {
+ float: left;
+}
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+ border-radius: 0;
+}
+.btn-group > .btn-group:first-child {
+ > .btn:last-child,
+ > .dropdown-toggle {
+ .border-right-radius(0);
+ }
+}
+.btn-group > .btn-group:last-child > .btn:first-child {
+ .border-left-radius(0);
+}
+
+// On active and open, don't show outline
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+ outline: 0;
+}
+
+
+// Sizing
+//
+// Remix the default button sizing classes into new ones for easier manipulation.
+
+.btn-group-xs > .btn { &:extend(.btn-xs); }
+.btn-group-sm > .btn { &:extend(.btn-sm); }
+.btn-group-lg > .btn { &:extend(.btn-lg); }
+
+
+// Split button dropdowns
+// ----------------------
+
+// Give the line between buttons some depth
+.btn-group > .btn + .dropdown-toggle {
+ padding-left: 8px;
+ padding-right: 8px;
+}
+.btn-group > .btn-lg + .dropdown-toggle {
+ padding-left: 12px;
+ padding-right: 12px;
+}
+
+// The clickable button for toggling the menu
+// Remove the gradient and set the same inset shadow as the :active state
+.btn-group.open .dropdown-toggle {
+ .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+
+ // Show no shadow for `.btn-link` since it has no other button styles.
+ &.btn-link {
+ .box-shadow(none);
+ }
+}
+
+
+// Reposition the caret
+.btn .caret {
+ margin-left: 0;
+}
+// Carets in other button sizes
+.btn-lg .caret {
+ border-width: @caret-width-large @caret-width-large 0;
+ border-bottom-width: 0;
+}
+// Upside down carets for .dropup
+.dropup .btn-lg .caret {
+ border-width: 0 @caret-width-large @caret-width-large;
+}
+
+
+// Vertical button groups
+// ----------------------
+
+.btn-group-vertical {
+ > .btn,
+ > .btn-group,
+ > .btn-group > .btn {
+ display: block;
+ float: none;
+ width: 100%;
+ max-width: 100%;
+ }
+
+ // Clear floats so dropdown menus can be properly placed
+ > .btn-group {
+ &:extend(.clearfix all);
+ > .btn {
+ float: none;
+ }
+ }
+
+ > .btn + .btn,
+ > .btn + .btn-group,
+ > .btn-group + .btn,
+ > .btn-group + .btn-group {
+ margin-top: -1px;
+ margin-left: 0;
+ }
+}
+
+.btn-group-vertical > .btn {
+ &:not(:first-child):not(:last-child) {
+ border-radius: 0;
+ }
+ &:first-child:not(:last-child) {
+ border-top-right-radius: @border-radius-base;
+ .border-bottom-radius(0);
+ }
+ &:last-child:not(:first-child) {
+ border-bottom-left-radius: @border-radius-base;
+ .border-top-radius(0);
+ }
+}
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+ border-radius: 0;
+}
+.btn-group-vertical > .btn-group:first-child:not(:last-child) {
+ > .btn:last-child,
+ > .dropdown-toggle {
+ .border-bottom-radius(0);
+ }
+}
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
+ .border-top-radius(0);
+}
+
+
+
+// Justified button groups
+// ----------------------
+
+.btn-group-justified {
+ display: table;
+ width: 100%;
+ table-layout: fixed;
+ border-collapse: separate;
+ > .btn,
+ > .btn-group {
+ float: none;
+ display: table-cell;
+ width: 1%;
+ }
+ > .btn-group .btn {
+ width: 100%;
+ }
+}
+
+
+// Checkbox and radio options
+[data-toggle="buttons"] > .btn > input[type="radio"],
+[data-toggle="buttons"] > .btn > input[type="checkbox"] {
+ display: none;
+}
Oops, something went wrong.

0 comments on commit 76ef975

Please sign in to comment.