mirror of
https://github.com/grafana/grafana.git
synced 2024-11-21 16:38:03 -06:00
move vendor css intor appropriate places and remove generated files from version control
This commit is contained in:
parent
966ba97b2c
commit
8819d559b7
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,6 +5,7 @@ dist
|
||||
# locally required config files
|
||||
web.config
|
||||
config.js
|
||||
src/css/*.min.css
|
||||
|
||||
# Editor junk
|
||||
*.sublime-workspace
|
||||
|
9
src/css/bootstrap-responsive.min.css
vendored
9
src/css/bootstrap-responsive.min.css
vendored
File diff suppressed because one or more lines are too long
9
src/css/bootstrap.dark.min.css
vendored
9
src/css/bootstrap.dark.min.css
vendored
File diff suppressed because one or more lines are too long
9
src/css/bootstrap.light.min.css
vendored
9
src/css/bootstrap.light.min.css
vendored
File diff suppressed because one or more lines are too long
4223
src/css/default.min.css
vendored
4223
src/css/default.min.css
vendored
File diff suppressed because one or more lines are too long
@ -22,7 +22,7 @@
|
||||
|
||||
<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/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">
|
||||
<button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">×</button>
|
||||
|
@ -2,10 +2,10 @@ module.exports = function(config) {
|
||||
return {
|
||||
css: {
|
||||
src: [
|
||||
'<%= srcDir %>/css/normalize.min.css',
|
||||
'<%= srcDir %>/css/timepicker.css',
|
||||
'<%= srcDir %>/css/spectrum.css',
|
||||
'<%= srcDir %>/css/animate.min.css',
|
||||
'<%= srcDir %>/vendor/normalize.min.css',
|
||||
'<%= srcDir %>/vendor/timepicker.css',
|
||||
'<%= srcDir %>/vendor/spectrum.css',
|
||||
'<%= srcDir %>/vendor/animate.min.css',
|
||||
'<%= srcDir %>/css/bootstrap.dark.min.css'
|
||||
],
|
||||
dest: '<%= srcDir %>/css/default.min.css'
|
||||
|
Loading…
Reference in New Issue
Block a user