diff options
| author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
| commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
| tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js | |
| parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js')
121 files changed, 3090 insertions, 1588 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css index 67497e10..dcfd471c 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.css +++ b/js/components/layout/bread-crumb.reel/bread-crumb.css | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | background-color: #282828; | 8 | background-color: #282828; |
| 9 | border-style: double; | 9 | border-style: double; |
| 10 | height: 26px; | 10 | height: 26px; |
| 11 | 11 | position:relative; | |
| 12 | -webkit-box-flex: 0; | 12 | -webkit-box-flex: 0; |
| 13 | } | 13 | } |
| 14 | 14 | ||
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index f2368e9a..413f588d 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -60,6 +60,20 @@ | |||
| 60 | "oneway": true | 60 | "oneway": true |
| 61 | } | 61 | } |
| 62 | } | ||