diff --git a/app/node_controllers/resultsController.js b/app/node_controllers/resultsController.js index 4da4c1c..d1cdb97 100644 --- a/app/node_controllers/resultsController.js +++ b/app/node_controllers/resultsController.js @@ -21,10 +21,6 @@ var resultsController = function(req, res, googleAnalyticsId) { fs.readFile('./app/node_views/results.html', {encoding: 'utf8'}, callback); }, - phantomasMetadata: function(callback) { - fs.readFile('./node_modules/phantomas/lib/metadata/metadata.json', {encoding: 'utf8'}, callback); - }, - phantomasResults: function(callback) { fs.readFile(phantomasResultsPath, {encoding: 'utf8'}, callback); } @@ -40,7 +36,6 @@ var resultsController = function(req, res, googleAnalyticsId) { phantomasResults = phantomasResults.replace(/<\/script>/g, '\\u003c/script>'); var html = results.htmlTemplate; - html = strReplace(html, '%%METADATA%%', results.phantomasMetadata); html = strReplace(html, '%%RESULTS%%', phantomasResults); html = strReplace(html, '%%GA_ID%%', googleAnalyticsId); diff --git a/app/node_views/results.html b/app/node_views/results.html index 3113b2c..65bde25 100644 --- a/app/node_views/results.html +++ b/app/node_views/results.html @@ -23,7 +23,6 @@
New test
Summary
JS Timeline
-
All Metrics
@@ -854,34 +853,6 @@
- -
-

Metrics from Phantomas report

-

Phantomas is a web performance metrics collector. You can find here the (almost) entire list of metrics from Phantomas.

- -
-

{{moduleName}}

-
-
- {{metricName}}: {{phantomasResults.metrics[metricName] | number: 0}} - {{metric.unit}} -
-
- {{metric.desc}} - (unreliable) -
-
-
Show offenders
-
Hide offenders
-
    -
  • - {{offender}} -
    • -
-
-
-
-
@@ -892,8 +863,6 @@ var _phantomas_results = %%RESULTS%%; - var _phantomas_metadata = %%METADATA%%; - var GA_ID = '%%GA_ID%%'; if (GA_ID.length > 0 && window.location.host === 'yellowlab.tools') { (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ diff --git a/app/public/fonts/icons.woff b/app/public/fonts/icons.woff index 51197d5..832a8a8 100644 Binary files a/app/public/fonts/icons.woff and b/app/public/fonts/icons.woff differ diff --git a/app/public/fonts/svg-icons/drawer3.svg b/app/public/fonts/svg-icons/drawer3.svg deleted file mode 100755 index 18e9b46..0000000 --- a/app/public/fonts/svg-icons/drawer3.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/public/scripts/resultsCtrl.js b/app/public/scripts/resultsCtrl.js index 26248a2..ae27f8a 100644 --- a/app/public/scripts/resultsCtrl.js +++ b/app/public/scripts/resultsCtrl.js @@ -3,7 +3,6 @@ var app = angular.module('Results', []); app.controller('ResultsCtrl', function ($scope) { // Grab results from nodeJS served page $scope.phantomasResults = window._phantomas_results; - $scope.phantomasMetadata = window._phantomas_metadata.metrics; $scope.view = 'summary'; @@ -20,7 +19,6 @@ app.controller('ResultsCtrl', function ($scope) { initSummaryView(); initJSTimelineView(); - initMetricsView(); } @@ -173,18 +171,6 @@ app.controller('ResultsCtrl', function ($scope) { $scope.timelineMax = Math.max.apply(Math, $scope.timeline); } - function initMetricsView() { - // Get the Phantomas modules from metadata - $scope.metricsModule = {}; - for (var metricName in $scope.phantomasMetadata) { - var metric = $scope.phantomasMetadata[metricName]; - if (!$scope.metricsModule[metric.module]) { - $scope.metricsModule[metric.module] = {}; - } - $scope.metricsModule[metric.module][metricName] = metric; - } - } - function getDomComplexityScore() { var note = 'A'; diff --git a/app/public/styles/less/icons.less b/app/public/styles/less/icons.less index 3bc4d60..dbdc9f3 100644 --- a/app/public/styles/less/icons.less +++ b/app/public/styles/less/icons.less @@ -1,27 +1,24 @@ -@arrow-left3-font-family: "fontsmith-icons"; -@arrow-left3-value: "\e007"; -@arrow-left3: '"fontsmith-icons"' '"\\e007"'; -@list-font-family: "fontsmith-icons"; -@list-value: "\e002"; -@list: '"fontsmith-icons"' '"\\e002"'; -@warning-font-family: "fontsmith-icons"; -@warning-value: "\e000"; -@warning: '"fontsmith-icons"' '"\\e000"'; @eye-font-family: "fontsmith-icons"; @eye-value: "\e004"; @eye: '"fontsmith-icons"' '"\\e004"'; -@question-font-family: "fontsmith-icons"; -@question-value: "\e001"; -@question: '"fontsmith-icons"' '"\\e001"'; @lab-font-family: "fontsmith-icons"; @lab-value: "\e003"; @lab: '"fontsmith-icons"' '"\\e003"'; @bars-font-family: "fontsmith-icons"; -@bars-value: "\e006"; -@bars: '"fontsmith-icons"' '"\\e006"'; -@drawer3-font-family: "fontsmith-icons"; -@drawer3-value: "\e005"; -@drawer3: '"fontsmith-icons"' '"\\e005"'; +@bars-value: "\e005"; +@bars: '"fontsmith-icons"' '"\\e005"'; +@warning-font-family: "fontsmith-icons"; +@warning-value: "\e000"; +@warning: '"fontsmith-icons"' '"\\e000"'; +@arrow-left3-font-family: "fontsmith-icons"; +@arrow-left3-value: "\e006"; +@arrow-left3: '"fontsmith-icons"' '"\\e006"'; +@question-font-family: "fontsmith-icons"; +@question-value: "\e001"; +@question: '"fontsmith-icons"' '"\\e001"'; +@list-font-family: "fontsmith-icons"; +@list-value: "\e002"; +@list: '"fontsmith-icons"' '"\\e002"'; .icon-font-family(@char) { font-family: ~`@{char}[0]`; diff --git a/app/public/styles/less/main.less b/app/public/styles/less/main.less index 571064a..ef48683 100644 --- a/app/public/styles/less/main.less +++ b/app/public/styles/less/main.less @@ -65,9 +65,6 @@ h1 span { .icon-spaghetti { .icon(@bars); } -.icon-metrics { - .icon(@drawer3); -} .icon-eye { .icon(@eye); } \ No newline at end of file diff --git a/app/public/styles/main.css b/app/public/styles/main.css index e92c2e7..ca72257 100644 --- a/app/public/styles/main.css +++ b/app/public/styles/main.css @@ -95,7 +95,7 @@ h1 span { -webkit-font-smoothing: antialiased; } .icon-back:before { - content: "\e007"; + content: "\e006"; } .icon-summary { font-family: "fontsmith-icons"; @@ -121,19 +121,6 @@ h1 span { -webkit-font-smoothing: antialiased; } .icon-spaghetti:before { - content: "\e006"; -} -.icon-metrics { - font-family: "fontsmith-icons"; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; -} -.icon-metrics:before { content: "\e005"; } .icon-eye {