Fixes #4, also improves responsive layout for mobiles
This commit is contained in:
Torkel Ödegaard committed
1 parent
0c1df4250e
commit
2ee2266865
4 files changed
+18
-4
No files matched your search
@@ -531,8 +531,9 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
|
||||
return;
|
||||
}
|
||||
|
||||
// IE doesn't work without this
|
||||
elem.css({height:scope.height || scope.row.height});
|
||||
try {
|
||||
elem.css({ height:scope.panel.height || scope.row.height });
|
||||
} catch(e) { return; }
|
||||
|
||||
_.each(data, function(series) {
|
||||
series.label = series.info.alias;
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
<div ng-show="rowSpan(row) < 10 && dashboard.panelDragging" class="panel" style="margin:5px;width:30%;background:rgba(100,100,100,0.50)" ng-class="{'dragInProgress':dashboard.panelDragging}" ng-style="{height:row.height}" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:row.panels.length,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver',onOut:'panelMoveOut'}">
|
||||
</div>
|
||||
|
||||
<span bs-modal="'app/partials/roweditor.html'" ng-show="row.editable && !dashboard.panelDragging">
|
||||
<span bs-modal="'app/partials/roweditor.html'" ng-show="!dashboard.panelDragging && !dashboard.current.hideControls">
|
||||
<i ng-hide="rowSpan(row) >= 10" class="pointer icon-plus-sign" ng-click="editor.index = 2" bs-tooltip="'Add a panel to this row'" data-placement="right"></i>
|
||||
</span>
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -6,4 +6,4 @@
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-10px;*zoom:1}.row:before,.row:after{display:table;content:"";line-height:0}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:10px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1190px}.span12{width:1190px}.span11{width:1090px}.span10{width:990px}.span9{width:890px}.span8{width:790px}.span7{width:690px}.span6{width:590px}.span5{width:490px}.span4{width:390px}.span3{width:290px}.span2{width:190px}.span1{width:90px}.offset12{margin-left:1210px}.offset11{margin-left:1110px}.offset10{margin-left:1010px}.offset9{margin-left:910px}.offset8{margin-left:810px}.offset7{margin-left:710px}.offset6{margin-left:610px}.offset5{margin-left:510px}.offset4{margin-left:410px}.offset3{margin-left:310px}.offset2{margin-left:210px}.offset1{margin-left:110px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:.8403361344537815%;*margin-left:.787704555506413%}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:.8403361344537815%}.row-fluid .span12{width:99.99999999999999%;*width:99.94736842105262%}.row-fluid .span11{width:91.59663865546219%;*width:91.54400707651482%}.row-fluid .span10{width:83.19327731092437%;*width:83.140645731977%}.row-fluid .span9{width:74.78991596638656%;*width:74.73728438743919%}.row-fluid .span8{width:66.38655462184875%;*width:66.33392304290138%}.row-fluid .span7{width:57.98319327731092%;*width:57.93056169836355%}.row-fluid .span6{width:49.579831932773104%;*width:49.527200353825734%}.row-fluid .span5{width:41.1764705882353%;*width:41.12383900928793%}.row-fluid .span4{width:32.773109243697476%;*width:32.720477664750106%}.row-fluid .span3{width:24.369747899159663%;*width:24.317116320212293%}.row-fluid .span2{width:15.966386554621849%;*width:15.91375497567448%}.row-fluid .span1{width:7.563025210084033%;*width:7.510393631136665%}.row-fluid .offset12{margin-left:101.68067226890754%;*margin-left:101.5754091110128%}.row-fluid .offset12:first-child{margin-left:100.84033613445376%;*margin-left:100.73507297655902%}.row-fluid .offset11{margin-left:93.27731092436974%;*margin-left:93.172047766475%}.row-fluid .offset11:first-child{margin-left:92.43697478991596%;*margin-left:92.33171163202123%}.row-fluid .offset10{margin-left:84.87394957983193%;*margin-left:84.76868642193719%}.row-fluid .offset10:first-child{margin-left:84.03361344537815%;*margin-left:83.92835028748341%}.row-fluid .offset9{margin-left:76.47058823529412%;*margin-left:76.36532507739938%}.row-fluid .offset9:first-child{margin-left:75.63025210084034%;*margin-left:75.5249889429456%}.row-fluid .offset8{margin-left:68.0672268907563%;*margin-left:67.96196373286156%}.row-fluid .offset8:first-child{margin-left:67.22689075630252%;*margin-left:67.12162759840778%}.row-fluid .offset7{margin-left:59.66386554621848%;*margin-left:59.55860238832374%}.row-fluid .offset7:first-child{margin-left:58.823529411764696%;*margin-left:58.718266253869956%}.row-fluid .offset6{margin-left:51.26050420168067%;*margin-left:51.15524104378593%}.row-fluid .offset6:first-child{margin-left:50.42016806722688%;*margin-left:50.31490490933214%}.row-fluid .offset5{margin-left:42.85714285714286%;*margin-left:42.75187969924812%}.row-fluid .offset5:first-child{margin-left:42.016806722689076%;*margin-left:41.911543564794336%}.row-fluid .offset4{margin-left:34.45378151260504%;*margin-left:34.3485183547103%}.row-fluid .offset4:first-child{margin-left:33.613445378151255%;*margin-left:33.508182220256515%}.row-fluid .offset3{margin-left:26.050420168067227%;*margin-left:25.945157Line truncated
|
||||
*/.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-10px;*zoom:1}.row:before,.row:after{display:table;content:"";line-height:0}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:10px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1190px}.span12{width:1190px}.span11{width:1090px}.span10{width:990px}.span9{width:890px}.span8{width:790px}.span7{width:690px}.span6{width:590px}.span5{width:490px}.span4{width:390px}.span3{width:290px}.span2{width:190px}.span1{width:90px}.offset12{margin-left:1210px}.offset11{margin-left:1110px}.offset10{margin-left:1010px}.offset9{margin-left:910px}.offset8{margin-left:810px}.offset7{margin-left:710px}.offset6{margin-left:610px}.offset5{margin-left:510px}.offset4{margin-left:410px}.offset3{margin-left:310px}.offset2{margin-left:210px}.offset1{margin-left:110px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:.8403361344537815%;*margin-left:.787704555506413%}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:.8403361344537815%}.row-fluid .span12{width:99.99999999999999%;*width:99.94736842105262%}.row-fluid .span11{width:91.59663865546219%;*width:91.54400707651482%}.row-fluid .span10{width:83.19327731092437%;*width:83.140645731977%}.row-fluid .span9{width:74.78991596638656%;*width:74.73728438743919%}.row-fluid .span8{width:66.38655462184875%;*width:66.33392304290138%}.row-fluid .span7{width:57.98319327731092%;*width:57.93056169836355%}.row-fluid .span6{width:49.579831932773104%;*width:49.527200353825734%}.row-fluid .span5{width:41.1764705882353%;*width:41.12383900928793%}.row-fluid .span4{width:32.773109243697476%;*width:32.720477664750106%}.row-fluid .span3{width:24.369747899159663%;*width:24.317116320212293%}.row-fluid .span2{width:15.966386554621849%;*width:15.91375497567448%}.row-fluid .span1{width:7.563025210084033%;*width:7.510393631136665%}.row-fluid .offset12{margin-left:101.68067226890754%;*margin-left:101.5754091110128%}.row-fluid .offset12:first-child{margin-left:100.84033613445376%;*margin-left:100.73507297655902%}.row-fluid .offset11{margin-left:93.27731092436974%;*margin-left:93.172047766475%}.row-fluid .offset11:first-child{margin-left:92.43697478991596%;*margin-left:92.33171163202123%}.row-fluid .offset10{margin-left:84.87394957983193%;*margin-left:84.76868642193719%}.row-fluid .offset10:first-child{margin-left:84.03361344537815%;*margin-left:83.92835028748341%}.row-fluid .offset9{margin-left:76.47058823529412%;*margin-left:76.36532507739938%}.row-fluid .offset9:first-child{margin-left:75.63025210084034%;*margin-left:75.5249889429456%}.row-fluid .offset8{margin-left:68.0672268907563%;*margin-left:67.96196373286156%}.row-fluid .offset8:first-child{margin-left:67.22689075630252%;*margin-left:67.12162759840778%}.row-fluid .offset7{margin-left:59.66386554621848%;*margin-left:59.55860238832374%}.row-fluid .offset7:first-child{margin-left:58.823529411764696%;*margin-left:58.718266253869956%}.row-fluid .offset6{margin-left:51.26050420168067%;*margin-left:51.15524104378593%}.row-fluid .offset6:first-child{margin-left:50.42016806722688%;*margin-left:50.31490490933214%}.row-fluid .offset5{margin-left:42.85714285714286%;*margin-left:42.75187969924812%}.row-fluid .offset5:first-child{margin-left:42.016806722689076%;*margin-left:41.911543564794336%}.row-fluid .offset4{margin-left:34.45378151260504%;*margin-left:34.3485183547103%}.row-fluid .offset4:first-child{margin-left:33.613445378151255%;*margin-left:33.508182220256515%}.row-fluid .offset3{margin-left:26.050420168067227%;*margin-left:25.945157Line truncated
|
||||
@@ -21,3 +21,16 @@
|
||||
// 768px-979px
|
||||
@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
|
||||
@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
|
||||
|
||||
|
||||
// Media queries
|
||||
// ---------------------
|
||||
@media (max-width: 767px) {
|
||||
div.panel {
|
||||
width: 100% !important;
|
||||
padding: 0px !important;
|
||||
}
|
||||
body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user