diff options
Diffstat (limited to 'web/src')
| -rw-r--r-- | web/src/css/vendor.less | 2 | ||||
| -rw-r--r-- | web/src/fonts/FontAwesome.otf (renamed from web/src/fontawesome/FontAwesome.otf) | bin | 85908 -> 85908 bytes | |||
| -rw-r--r-- | web/src/fonts/README (renamed from web/src/fontawesome/README) | 0 | ||||
| -rw-r--r-- | web/src/fonts/font-awesome.css (renamed from web/src/fontawesome/font-awesome.css) | 0 | ||||
| -rw-r--r-- | web/src/fonts/fontawesome-webfont.eot (renamed from web/src/fontawesome/fontawesome-webfont.eot) | bin | 56006 -> 56006 bytes | |||
| -rw-r--r-- | web/src/fonts/fontawesome-webfont.svg (renamed from web/src/fontawesome/fontawesome-webfont.svg) | 0 | ||||
| -rw-r--r-- | web/src/fonts/fontawesome-webfont.ttf (renamed from web/src/fontawesome/fontawesome-webfont.ttf) | bin | 112160 -> 112160 bytes | |||
| -rw-r--r-- | web/src/fonts/fontawesome-webfont.woff (renamed from web/src/fontawesome/fontawesome-webfont.woff) | bin | 65452 -> 65452 bytes | |||
| -rw-r--r-- | web/src/js/components/eventlog.js | 1 | ||||
| -rw-r--r-- | web/src/js/filt/filt.js | 2 |
10 files changed, 3 insertions, 2 deletions
diff --git a/web/src/css/vendor.less b/web/src/css/vendor.less index 13c72299..e91ae3a8 100644 --- a/web/src/css/vendor.less +++ b/web/src/css/vendor.less @@ -1,3 +1,3 @@ // Bootstrap @import 'vendor-bootstrap.less'; -@import (less) '../fontawesome/font-awesome.css'; +@import (less) '../fonts/font-awesome.css'; diff --git a/web/src/fontawesome/FontAwesome.otf b/web/src/fonts/FontAwesome.otf Binary files differindex 81c9ad94..81c9ad94 100644 --- a/web/src/fontawesome/FontAwesome.otf +++ b/web/src/fonts/FontAwesome.otf diff --git a/web/src/fontawesome/README b/web/src/fonts/README index 218a78e1..218a78e1 100644 --- a/web/src/fontawesome/README +++ b/web/src/fonts/README diff --git a/web/src/fontawesome/font-awesome.css b/web/src/fonts/font-awesome.css index 9eb5d5b7..9eb5d5b7 100644 --- a/web/src/fontawesome/font-awesome.css +++ b/web/src/fonts/font-awesome.css diff --git a/web/src/fontawesome/fontawesome-webfont.eot b/web/src/fonts/fontawesome-webfont.eot Binary files differindex 84677bc0..84677bc0 100644 --- a/web/src/fontawesome/fontawesome-webfont.eot +++ b/web/src/fonts/fontawesome-webfont.eot diff --git a/web/src/fontawesome/fontawesome-webfont.svg b/web/src/fonts/fontawesome-webfont.svg index d907b25a..d907b25a 100644 --- a/web/src/fontawesome/fontawesome-webfont.svg +++ b/web/src/fonts/fontawesome-webfont.svg diff --git a/web/src/fontawesome/fontawesome-webfont.ttf b/web/src/fonts/fontawesome-webfont.ttf Binary files differindex 96a3639c..96a3639c 100644 --- a/web/src/fontawesome/fontawesome-webfont.ttf +++ b/web/src/fonts/fontawesome-webfont.ttf diff --git a/web/src/fontawesome/fontawesome-webfont.woff b/web/src/fonts/fontawesome-webfont.woff Binary files differindex 628b6a52..628b6a52 100644 --- a/web/src/fontawesome/fontawesome-webfont.woff +++ b/web/src/fonts/fontawesome-webfont.woff diff --git a/web/src/js/components/eventlog.js b/web/src/js/components/eventlog.js index 4c6dafb1..fea7b247 100644 --- a/web/src/js/components/eventlog.js +++ b/web/src/js/components/eventlog.js @@ -108,6 +108,7 @@ var ToggleFilter = React.createClass({ }); var EventLog = React.createClass({ + mixins: [common.Navigation], getInitialState: function () { return { filter: { diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js index 02a04c66..45b42f3a 100644 --- a/web/src/js/filt/filt.js +++ b/web/src/js/filt/filt.js @@ -1771,4 +1771,4 @@ module.exports = (function() { SyntaxError: SyntaxError, parse: parse }; -})(); +})();
\ No newline at end of file |
