Skip to content

N
nexpie-grafana-theme
Commit 4cd53ce1 by Torkel Ödegaard
Options

Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into… 

Merge branch 'cleanup-generated-files' of github.com:clkao/grafana into clkao-cleanup-generated-files
parents e2283e53 8819d559
Showing with 6 additions and 15 deletions
.gitignore
...@@ -6,6 +6,7 @@ dist ...@@ -6,6 +6,7 @@ dist
# locally required config files # locally required config files
web.config web.config
config.js config.js
src/css/*.min.css
# Editor junk # Editor junk
*.sublime-workspace *.sublime-workspace
......
src/css/bootstrap-responsive.min.css deleted 100644 → 0
/*!
* Bootstrap Responsive v2.3.2
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* 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.945157010172487%}.row-fluid .offset3:first-child{margin-left:25.210084033613445%;*margin-left:25.104820875718705%}.row-fluid .offset2{margin-left:17.647058823529413%;*margin-left:17.541795665634673%}.row-fluid .offset2:first-child{margin-left:16.80672268907563%;*margin-left:16.70145953118089%}.row-fluid .offset1{margin-left:9.243697478991596%;*margin-left:9.13843432109686%}.row-fluid .offset1:first-child{margin-left:8.403361344537815%;*margin-left:8.29809818664308%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:10px}input.span12,textarea.span12,.uneditable-input.span12{width:1176px}input.span11,textarea.span11,.uneditable-input.span11{width:1076px}input.span10,textarea.span10,.uneditable-input.span10{width:976px}input.span9,textarea.span9,.uneditable-input.span9{width:876px}input.span8,textarea.span8,.uneditable-input.span8{width:776px}input.span7,textarea.span7,.uneditable-input.span7{width:676px}input.span6,textarea.span6,.uneditable-input.span6{width:576px}input.span5,textarea.span5,.uneditable-input.span5{width:476px}input.span4,textarea.span4,.uneditable-input.span4{width:376px}input.span3,textarea.span3,.uneditable-input.span3{width:276px}input.span2,textarea.span2,.uneditable-input.span2{width:176px}input.span1,textarea.span1,.uneditable-input.span1{width:76px}.thumbnails{margin-left:-10px}.thumbnails>li{margin-left:10px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.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:734px}.span12{width:734px}.span11{width:672px}.span10{width:610px}.span9{width:548px}.span8{width:486px}.span7{width:424px}.span6{width:362px}.span5{width:300px}.span4{width:238px}.span3{width:176px}.span2{width:114px}.span1{width:52px}.offset12{margin-left:754px}.offset11{margin-left:692px}.offset10{margin-left:630px}.offset9{margin-left:568px}.offset8{margin-left:506px}.offset7{margin-left:444px}.offset6{margin-left:382px}.offset5{margin-left:320px}.offset4{margin-left:258px}.offset3{margin-left:196px}.offset2{margin-left:134px}.offset1{margin-left:72px}.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:1.3623978201634876%;*margin-left:1.3097662412161193%}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:1.3623978201634876%}.row-fluid .span12{width:100.00000000000001%;*width:99.94736842105264%}.row-fluid .span11{width:91.55313351498637%;*width:91.500501936039%}.row-fluid .span10{width:83.10626702997276%;*width:83.05363545102539%}.row-fluid .span9{width:74.65940054495913%;*width:74.60676896601176%}.row-fluid .span8{width:66.21253405994551%;*width:66.15990248099814%}.row-fluid .span7{width:57.76566757493188%;*width:57.71303599598451%}.row-fluid .span6{width:49.31880108991827%;*width:49.2661695109709%}.row-fluid .span5{width:40.87193460490463%;*width:40.81930302595726%}.row-fluid .span4{width:32.42506811989101%;*width:32.37243654094364%}.row-fluid .span3{width:23.978201634877387%;*width:23.925570055930017%}.row-fluid .span2{width:15.53133514986376%;*width:15.478703570916393%}.row-fluid .span1{width:7.084468664850137%;*width:7.031837085902769%}.row-fluid .offset12{margin-left:102.72479564032699%;*margin-left:102.61953248243225%}.row-fluid .offset12:first-child{margin-left:101.36239782016351%;*margin-left:101.25713466226877%}.row-fluid .offset11{margin-left:94.27792915531334%;*margin-left:94.1726659974186%}.row-fluid .offset11:first-child{margin-left:92.91553133514986%;*margin-left:92.81026817725513%}.row-fluid .offset10{margin-left:85.83106267029973%;*margin-left:85.72579951240499%}.row-fluid .offset10:first-child{margin-left:84.46866485013625%;*margin-left:84.36340169224151%}.row-fluid .offset9{margin-left:77.3841961852861%;*margin-left:77.27893302739136%}.row-fluid .offset9:first-child{margin-left:76.02179836512262%;*margin-left:75.91653520722788%}.row-fluid .offset8{margin-left:68.93732970027249%;*margin-left:68.83206654237775%}.row-fluid .offset8:first-child{margin-left:67.574931880109%;*margin-left:67.46966872221427%}.row-fluid .offset7{margin-left:60.490463215258856%;*margin-left:60.385200057364116%}.row-fluid .offset7:first-child{margin-left:59.12806539509537%;*margin-left:59.02280223720063%}.row-fluid .offset6{margin-left:52.04359673024524%;*margin-left:51.9383335723505%}.row-fluid .offset6:first-child{margin-left:50.681198910081754%;*margin-left:50.575935752187014%}.row-fluid .offset5{margin-left:43.596730245231605%;*margin-left:43.491467087336865%}.row-fluid .offset5:first-child{margin-left:42.23433242506812%;*margin-left:42.12906926717338%}.row-fluid .offset4{margin-left:35.14986376021798%;*margin-left:35.04460060232324%}.row-fluid .offset4:first-child{margin-left:33.787465940054496%;*margin-left:33.682202782159756%}.row-fluid .offset3{margin-left:26.70299727520436%;*margin-left:26.59773411730962%}.row-fluid .offset3:first-child{margin-left:25.340599455040874%;*margin-left:25.235336297146134%}.row-fluid .offset2{margin-left:18.256130790190735%;*margin-left:18.150867632296%}.row-fluid .offset2:first-child{margin-left:16.893732970027248%;*margin-left:16.78846981213251%}.row-fluid .offset1{margin-left:9.809264305177113%;*margin-left:9.704001147282376%}.row-fluid .offset1:first-child{margin-left:8.446866485013624%;*margin-left:8.341603327118888%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:10px}input.span12,textarea.span12,.uneditable-input.span12{width:720px}input.span11,textarea.span11,.uneditable-input.span11{width:658px}input.span10,textarea.span10,.uneditable-input.span10{width:596px}input.span9,textarea.span9,.uneditable-input.span9{width:534px}input.span8,textarea.span8,.uneditable-input.span8{width:472px}input.span7,textarea.span7,.uneditable-input.span7{width:410px}input.span6,textarea.span6,.uneditable-input.span6{width:348px}input.span5,textarea.span5,.uneditable-input.span5{width:286px}input.span4,textarea.span4,.uneditable-input.span4{width:224px}input.span3,textarea.span3,.uneditable-input.span3{width:162px}input.span2,textarea.span2,.uneditable-input.span2{width:100px}input.span1,textarea.span1,.uneditable-input.span1{width:38px}}@media(max-width:767px){body{padding-left:20px;padding-right:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-left:-20px;margin-right:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;clear:none;width:auto;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{float:none;display:block;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-left:10px;padding-right:10px}.media .pull-left,.media .pull-right{float:none;display:block;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;left:10px;right:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{margin-top:5px;padding:0}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;float:none;display:none;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{overflow:hidden;height:0}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-left:10px;padding-right:10px}}@media(min-width:979px+1){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}@media(max-width:767px){div.panel{width:100%!important;padding:0!important}body{padding:0}}
\ No newline at end of file
src/css/bootstrap.dark.min.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/css/bootstrap.light.min.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/css/default.min.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/index.html
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<link rel="stylesheet" href="css/bootstrap.light.min.css" ng-if="grafana.style === 'light'"> <link rel="stylesheet" href="css/bootstrap.light.min.css" ng-if="grafana.style === 'light'">
<link rel="stylesheet" href="css/bootstrap-responsive.min.css"> <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="../vendor/font-awesome.min.css">
<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last"> <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last">
<button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button> <button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>
......
tasks/options/concat.js
...@@ -2,10 +2,10 @@ module.exports = function(config) { ...@@ -2,10 +2,10 @@ module.exports = function(config) {
return { return {
css: { css: {
src: [ src: [
'<%= srcDir %>/css/normalize.min.css', '<%= srcDir %>/vendor/normalize.min.css',
'<%= srcDir %>/css/timepicker.css', '<%= srcDir %>/vendor/timepicker.css',
'<%= srcDir %>/css/spectrum.css', '<%= srcDir %>/vendor/spectrum.css',
'<%= srcDir %>/css/animate.min.css', '<%= srcDir %>/vendor/animate.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css' '<%= srcDir %>/css/bootstrap.dark.min.css'
], ],
dest: '<%= srcDir %>/css/default.min.css' dest: '<%= srcDir %>/css/default.min.css'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment