From 849173093f589ae7df491cffd3933e7d7ee940a7 Mon Sep 17 00:00:00 2001 From: Hannes Verschore Date: Fri, 10 Apr 2015 09:48:32 -0700 Subject: [PATCH] Move the change of machine into the subheader --- website/overview/Gemfile | 0 website/overview/INSTALL | 0 website/overview/config.rb | 0 website/overview/css/main.css | 637 ++++++++---------- website/overview/css/nv.d3.css | 0 .../css/partials/components/pages/main.css | 0 website/overview/css/style.css | 2 - website/overview/data-suite.php | 0 website/overview/data.php | 0 website/overview/img/firefox.png | Bin website/overview/img/tail.png | Bin website/overview/index.html | 7 +- website/overview/js/app.js | 79 +-- website/overview/js/controllers.js | 80 ++- website/overview/js/d3.v3.js | 0 website/overview/js/nv.d3.js | 0 website/overview/js/overview.js | 0 website/overview/js/persona.js | 0 website/overview/partials/overview.html | 20 +- website/overview/sass/main.scss | 0 website/overview/sass/partials/_base.scss | 0 .../overview/sass/partials/_components.scss | 0 .../overview/sass/partials/base/_base.scss | 59 +- .../overview/sass/partials/base/_forms.scss | 0 .../overview/sass/partials/base/_header.scss | 0 .../overview/sass/partials/base/_icons.scss | 0 .../overview/sass/partials/base/_lists.scss | 0 .../overview/sass/partials/base/_media.scss | 0 .../overview/sass/partials/base/_tables.scss | 0 .../sass/partials/base/_typography.scss | 0 .../sass/partials/components/pages/_main.scss | 0 .../overview/sass/utility/_abstractions.scss | 0 website/overview/sass/utility/_variables.scss | 0 .../sass/utility/abstractions/_assoc.scss | 0 .../sass/utility/abstractions/_box.scss | 0 .../sass/utility/abstractions/_select.scss | 0 .../sass/utility/variables/_breakpoints.scss | 0 .../sass/utility/variables/_colors.scss | 0 .../sass/utility/variables/_forms.scss | 0 .../sass/utility/variables/_grid.scss | 0 .../sass/utility/variables/_icons.scss | 0 .../sass/utility/variables/_legacy.scss | 0 .../sass/utility/variables/_typography.scss | 0 43 files changed, 417 insertions(+), 467 deletions(-) mode change 100644 => 100755 website/overview/Gemfile mode change 100644 => 100755 website/overview/INSTALL mode change 100644 => 100755 website/overview/config.rb mode change 100644 => 100755 website/overview/css/main.css mode change 100644 => 100755 website/overview/css/nv.d3.css mode change 100644 => 100755 website/overview/css/partials/components/pages/main.css mode change 100644 => 100755 website/overview/css/style.css mode change 100644 => 100755 website/overview/data-suite.php mode change 100644 => 100755 website/overview/data.php mode change 100644 => 100755 website/overview/img/firefox.png mode change 100644 => 100755 website/overview/img/tail.png mode change 100644 => 100755 website/overview/index.html mode change 100644 => 100755 website/overview/js/app.js mode change 100644 => 100755 website/overview/js/controllers.js mode change 100644 => 100755 website/overview/js/d3.v3.js mode change 100644 => 100755 website/overview/js/nv.d3.js mode change 100644 => 100755 website/overview/js/overview.js mode change 100644 => 100755 website/overview/js/persona.js mode change 100644 => 100755 website/overview/partials/overview.html mode change 100644 => 100755 website/overview/sass/main.scss mode change 100644 => 100755 website/overview/sass/partials/_base.scss mode change 100644 => 100755 website/overview/sass/partials/_components.scss mode change 100644 => 100755 website/overview/sass/partials/base/_base.scss mode change 100644 => 100755 website/overview/sass/partials/base/_forms.scss mode change 100644 => 100755 website/overview/sass/partials/base/_header.scss mode change 100644 => 100755 website/overview/sass/partials/base/_icons.scss mode change 100644 => 100755 website/overview/sass/partials/base/_lists.scss mode change 100644 => 100755 website/overview/sass/partials/base/_media.scss mode change 100644 => 100755 website/overview/sass/partials/base/_tables.scss mode change 100644 => 100755 website/overview/sass/partials/base/_typography.scss mode change 100644 => 100755 website/overview/sass/partials/components/pages/_main.scss mode change 100644 => 100755 website/overview/sass/utility/_abstractions.scss mode change 100644 => 100755 website/overview/sass/utility/_variables.scss mode change 100644 => 100755 website/overview/sass/utility/abstractions/_assoc.scss mode change 100644 => 100755 website/overview/sass/utility/abstractions/_box.scss mode change 100644 => 100755 website/overview/sass/utility/abstractions/_select.scss mode change 100644 => 100755 website/overview/sass/utility/variables/_breakpoints.scss mode change 100644 => 100755 website/overview/sass/utility/variables/_colors.scss mode change 100644 => 100755 website/overview/sass/utility/variables/_forms.scss mode change 100644 => 100755 website/overview/sass/utility/variables/_grid.scss mode change 100644 => 100755 website/overview/sass/utility/variables/_icons.scss mode change 100644 => 100755 website/overview/sass/utility/variables/_legacy.scss mode change 100644 => 100755 website/overview/sass/utility/variables/_typography.scss diff --git a/website/overview/Gemfile b/website/overview/Gemfile old mode 100644 new mode 100755 diff --git a/website/overview/INSTALL b/website/overview/INSTALL old mode 100644 new mode 100755 diff --git a/website/overview/config.rb b/website/overview/config.rb old mode 100644 new mode 100755 diff --git a/website/overview/css/main.css b/website/overview/css/main.css old mode 100644 new mode 100755 index c9bbc1c..9ce880a --- a/website/overview/css/main.css +++ b/website/overview/css/main.css @@ -20,7 +20,6 @@ /* Tips and source from: */ /* http://hugogiraudel.com/2013/08/12/sass-functions/#mapping */ /**********************************************************************/ -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\000032}} .box { border: 1px SOLID #dddddd; background-color: #f2f2f2; @@ -29,394 +28,312 @@ float: left; width: 32%; margin-right: 2%; - margin-bottom: 30px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000312}} -.box:nth-child(3n) { - margin-right: 0%; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000316}} -.box .header { - text-transform: uppercase; - padding-left: 12px; - font-weight: bold; - padding-top: 6px; - padding-bottom: 12px; - text-align: center; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000325}} -.box h3 { - color: #AAAAAA; - font-size: 15px; - font-weight: normal; - text-align: center; - margin-top: 6px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000333}} -.box .content { - background-color: white; - padding: 12px; - color: #42637b; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000345}} -.box .legend { - text-align: right; - font-size: 9px; - text-transform: uppercase; - margin-top: 18px; - color: #AAAAAA; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000353}} -.box .score { - float: right; - font-size: 1.4em; - margin-top: -0.2em; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000359}} -.box .title { - text-transform: uppercase; - margin-top: 0.4em; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000364}} -.box .stamp { - display: block; - font-size: 12px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000369}} -.box progress { - width: 100%; - height: 6px; - appearance: none; - -moz-appearance: none; - -webkit-appearance: none; - margin-bottom: 18px; - margin-top: 6px; - border: none; - background: #f2f2f2; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000362}} -.box progress::-moz-progress-bar { - background-color: #42637b; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000365}} -.box progress::-webkit-progress-value { - background-color: #42637b; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000387}} -.box progress::-webkit-progress-bar { - background: #f2f2f2; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000393}} -.box progress.ff::-moz-progress-bar { - background-color: #f39c32; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000374}} -.box progress.ff::-webkit-progress-value { - background-color: #f39c32; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000379}} -.box .footer { - text-align: center; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000382}} -.box .footer a, .box .footer button { - display: inline-block; - width: 49%; - margin: 0px; - background-color: transparent; - border: 0px SOLID #FFFFFF; - padding-top: 18px; - padding-bottom: 12px; - cursor: pointer; - text-align: center; - color: #222222; - text-decoration: none; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\0000395}} -.box .footer a.history:before, .box .footer button.history:before { - display: inline-block; - vertical-align: middle; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - margin-left: 6px; - margin-right: 6px; - content: "\e023"; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_box\.scss}line{font-family:\00003106}} -.box .footer a.subtests:before, .box .footer button.subtests:before { - display: inline-block; - vertical-align: middle; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - margin-left: 6px; - margin-right: 6px; - content: "\e137"; -} + margin-bottom: 30px; } + .box:nth-child(3n) { + margin-right: 0%; } + .box .header { + text-transform: uppercase; + padding-left: 12px; + font-weight: bold; + padding-top: 6px; + padding-bottom: 12px; + text-align: center; } + .box h3 { + color: #AAAAAA; + font-size: 15px; + font-weight: normal; + text-align: center; + margin-top: 6px; } + .box .content { + background-color: white; + padding: 12px; + color: #42637b; } + .box .legend { + text-align: right; + font-size: 9px; + text-transform: uppercase; + margin-top: 18px; + color: #AAAAAA; } + .box .score { + float: right; + font-size: 1.4em; + margin-top: -0.2em; } + .box .title { + text-transform: uppercase; + margin-top: 0.4em; } + .box .stamp { + display: block; + font-size: 12px; } + .box progress { + width: 100%; + height: 6px; + appearance: none; + -moz-appearance: none; + -webkit-appearance: none; + margin-bottom: 18px; + margin-top: 6px; + border: none; + background: #f2f2f2; } + .box progress::-moz-progress-bar { + background-color: #42637b; } + .box progress::-webkit-progress-value { + background-color: #42637b; } + .box progress.ff::-moz-progress-bar { + background-color: #f39c32; } + .box progress.ff::-webkit-progress-value { + background-color: #f39c32; } + .box .footer { + text-align: center; } + .box .footer a, .box .footer button { + display: inline-block; + width: 49%; + margin: 0px; + background-color: transparent; + border: 0px SOLID #FFFFFF; + padding-top: 18px; + padding-bottom: 12px; + cursor: pointer; + text-align: center; + color: #222222; + text-decoration: none; } + .box .footer a.history:before, .box .footer button.history:before { + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + margin-left: 6px; + margin-right: 6px; + content: "\e023"; } + .box .footer a.subtests:before, .box .footer button.subtests:before { + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + margin-left: 6px; + margin-right: 6px; + content: "\e137"; } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_base\.scss}line{font-family:\000031}} html { - overflow-y: scroll; -} + overflow-y: scroll; } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_base\.scss}line{font-family:\000035}} * { - box-sizing: border-box; -} + box-sizing: border-box; } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_base\.scss}line{font-family:\000039}} .container.content { position: relative; - padding-top: 0px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_base\.scss}line{font-family:\0000313}} -body.ff .container.content:after { - position: absolute; - content: ""; - display: block; - top: -260px; - left: -130px; - background-image: url("../img/tail.png"); - background-size: 90%; - background-repeat: no-repeat; - background-position: 0px 0px; - width: 500px; - height: 900px; - transform: rotate(-35deg); - z-index: -1; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_base\.scss}line{font-family:\0000329}} -.container.content h2 { - line-height: 48px; - font-weight: normal; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_base\.scss}line{font-family:\0000333}} -.container.content h2 a { - color: #000000; - text-decoration: none; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_base\.scss}line{font-family:\0000338}} -.container.content h2:after { - content: ""; - display: block; - clear: both; -} + padding-top: 0px; } + body.ff .container.content:after { + position: absolute; + content: ""; + display: block; + top: -260px; + left: -130px; + background-image: url("../img/tail.png"); + background-size: 90%; + background-repeat: no-repeat; + background-position: 0px 0px; + width: 500px; + height: 900px; + transform: rotate(-35deg); + z-index: -1; } + .container.content h2 { + font-weight: normal; } + .container.content h2 .machine select { + vertical-align: top; + -moz-appearance: none; + -webkit-appearance: none; + text-overflow: ''; + background-color: #F2F2F2; + border: 1px solid #DDD; + padding-left: 18px; + padding-right: 18px; + padding-top: 18px; + padding-bottom: 36px; + display: inline-block; + color: #222; + padding-right: 36px; + font-weight: bold; + min-width: 300px; } + .container.content h2 .machine select::-ms-expand { + display: none; } + .container.content h2 .machine:after { + position: absolute; + content: "\e114"; + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + font-size: 0.5em; + height: 2.0em; + margin-left: -30px; + line-height: 2.0em; + pointer-events: none; + padding-top: 18px; + padding-bottom: 36px; } + .container.content h2 .extra { + line-height: 75px; } + .container.content h2 a { + color: #000000; + text-decoration: none; } + .container.content #dates { + color: #222222; + margin-top: -54px; + margin-bottom: 36px; + margin-left: 20px; + font-style: italic; } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\000032}} header { background-color: #42637b; color: white; -webkit-box-shadow: 0px 0px 15px 0px black; -moz-box-shadow: 0px 0px 15px 0px black; - box-shadow: 0px 0px 15px 0px black; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000310}} -header .container { - display: table; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000314}} -header select { - color: white; - background-color: #42637b; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000319}} -header #machines, header #types, header #dates { - margin-left: 6px; - margin-right: 6px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_select\.scss}line{font-family:\000037}} -header #machines select, header #machines input, header #machines div, header #types select, header #types input, header #types div, header #dates select, header #dates input, header #dates div { - -moz-appearance: toolbox; - -webkit-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - display: inline-block; - vertical-align: middle; - padding-right: 18px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_select\.scss}line{font-family:\0000316}} -header #machines select::-ms-expand, header #machines input::-ms-expand, header #machines div::-ms-expand, header #types select::-ms-expand, header #types input::-ms-expand, header #types div::-ms-expand, header #dates select::-ms-expand, header #dates input::-ms-expand, header #dates div::-ms-expand { - display: none; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/utility\/abstractions\/_select\.scss}line{font-family:\0000321}} -header #machines:after, header #types:after, header #dates:after { - position: absolute; - content: "\e114"; - display: inline-block; - vertical-align: middle; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - font-size: 0.5em; - height: 2.0em; - margin-left: -12px; - line-height: 2.0em; - pointer-events: none; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000323}} -header #dates:after { - display: none; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000328}} -header div { - display: inline-block; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000332}} -header h1 { - position: relative; - text-transform: uppercase; - font-size: 18px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000337}} -body.ff header h1:after { - background-image: url("../img/firefox.png"); - background-size: 75%; - background-repeat: no-repeat; - background-position: 0px -35px; - width: 250px; - top: -15px; - bottom: -15px; - content: ""; - display: block; - left: -180px; - position: absolute; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000352}} -header h1, header .rightSide { - display: table-cell; - vertical-align: middle; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000357}} -header .rightSide { - text-align: right; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000361}} -header .query { - margin-right: 24px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000365}} -header a { - text-decoration: none; - color: white; -} + box-shadow: 0px 0px 15px 0px black; } + header .container { + display: table; } + header select { + color: white; + background-color: #42637b; } + header #machines, header #types, header #dates { + margin-left: 6px; + margin-right: 6px; } + header #machines select, header #machines input, header #machines div, header #types select, header #types input, header #types div, header #dates select, header #dates input, header #dates div { + -moz-appearance: toolbox; + -webkit-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + display: inline-block; + vertical-align: middle; + padding-right: 18px; } + header #machines select::-ms-expand, header #machines input::-ms-expand, header #machines div::-ms-expand, header #types select::-ms-expand, header #types input::-ms-expand, header #types div::-ms-expand, header #dates select::-ms-expand, header #dates input::-ms-expand, header #dates div::-ms-expand { + display: none; } + header #machines:after, header #types:after, header #dates:after { + position: absolute; + content: "\e114"; + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + font-size: 0.5em; + height: 2.0em; + margin-left: -12px; + line-height: 2.0em; + pointer-events: none; } + header #dates:after { + display: none; } + header div { + display: inline-block; } + header h1 { + position: relative; + text-transform: uppercase; + font-size: 18px; } + body.ff header h1:after { + background-image: url("../img/firefox.png"); + background-size: 75%; + background-repeat: no-repeat; + background-position: 0px -35px; + width: 250px; + top: -15px; + bottom: -15px; + content: ""; + display: block; + left: -180px; + position: absolute; } + header h1, header .rightSide { + display: table-cell; + vertical-align: middle; } + header .rightSide { + text-align: right; } + header .query { + margin-right: 24px; } + header a { + text-decoration: none; + color: white; } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000371}} .subheader { float: right; vertical-align: bottom; - text-align: right; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000376}} -.subheader .container { - padding-top: 0px; - padding-bottom: 0px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000381}} -.subheader .history { - color: #222222; - text-decoration: none; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000385}} -.subheader .history:before { - display: inline-block; - vertical-align: middle; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - margin-left: 6px; - margin-right: 6px; - content: "\e023"; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\0000397}} -.subheader .up { - color: #222222; - text-decoration: none; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003101}} -.subheader .up:before { - display: inline-block; - vertical-align: middle; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - margin-left: 6px; - margin-right: 6px; - content: "\e113"; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003113}} -.subheader .button { - background-color: #f2f2f2; - border: 1px SOLID #dddddd; - padding: 12px 18px; - display: inline-block; - color: #222222; - margin-left: 12px; - margin-right: 12px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003122}} -.subheader .button:last-child { - margin-right: 0px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003126}} -.subheader .button .title, .subheader .button .result { - display: inline-block; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003130}} -.subheader .button .title { - text-transform: uppercase; - font-size: 15px; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003135}} -.subheader .button .result { - color: #222222; - font-weight: bold; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003139}} -.subheader .button .result:before { - display: inline-block; - vertical-align: middle; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - margin-left: 6px; - margin-right: 6px; - content: "\2212"; - color: #b67525; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003151}} -.subheader .button .result.bad:before { - content: "\e114"; - color: #d12600; -} -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_header\.scss}line{font-family:\00003156}} -.subheader .button .result.good:before { - content: "\e113"; - color: #2f7836; -} + text-align: right; } + .subheader .container { + padding-top: 0px; + padding-bottom: 0px; } + .subheader .history { + color: #222222; + text-decoration: none; } + .subheader .history:before { + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + margin-left: 6px; + margin-right: 6px; + content: "\e023"; } + .subheader .up { + color: #222222; + text-decoration: none; } + .subheader .up:before { + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + margin-left: 6px; + margin-right: 6px; + content: "\e113"; } + .subheader .button { + background-color: #f2f2f2; + border: 1px SOLID #dddddd; + padding: 12px 18px; + display: inline-block; + color: #222222; + margin-left: 12px; + margin-right: 12px; } + .subheader .button:last-child { + margin-right: 0px; } + .subheader .button .title, .subheader .button .result { + display: inline-block; } + .subheader .button .title { + text-transform: uppercase; + font-size: 15px; } + .subheader .button .result { + color: #222222; + font-weight: bold; } + .subheader .button .result:before { + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + margin-left: 6px; + margin-right: 6px; + content: "\2212"; + color: #b67525; } + .subheader .button .result.bad:before { + content: "\e114"; + color: #d12600; } + .subheader .button .result.good:before { + content: "\e113"; + color: #2f7836; } @font-face { font-family: 'Glyphicons Halflings'; src: url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.eot"); - src: url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.woff") format("woff"), url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.ttf") format("truetype"), url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.svg") format("svg"); -} + src: url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.woff") format("woff"), url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.ttf") format("truetype"), url("http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/fonts/glyphicons-halflings-regular.svg") format("svg"); } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/base\/_typography\.scss}line{font-family:\0000311}} body { font-family: lato; - background-color: #e6e6e6; -} + background-color: #e6e6e6; } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/components\/pages\/_main\.scss}line{font-family:\000031}} html, body { margin: 0px; - padding: 0px; -} + padding: 0px; } -@media -sass-debug-info{filename{font-family:file\:\/\/\/vagrant\/public\/arewefastyet\.firefox\.local\/arewefastyet\/website\/overview\/sass\/partials\/components\/pages\/_main\.scss}line{font-family:\000036}} .container { padding: 15px; width: 1200px; margin-left: auto; - margin-right: auto; -} + margin-right: auto; } diff --git a/website/overview/css/nv.d3.css b/website/overview/css/nv.d3.css old mode 100644 new mode 100755 diff --git a/website/overview/css/partials/components/pages/main.css b/website/overview/css/partials/components/pages/main.css old mode 100644 new mode 100755 diff --git a/website/overview/css/style.css b/website/overview/css/style.css old mode 100644 new mode 100755 index db23cd1..e69de29 --- a/website/overview/css/style.css +++ b/website/overview/css/style.css @@ -1,2 +0,0 @@ -svg { -} diff --git a/website/overview/data-suite.php b/website/overview/data-suite.php old mode 100644 new mode 100755 diff --git a/website/overview/data.php b/website/overview/data.php old mode 100644 new mode 100755 diff --git a/website/overview/img/firefox.png b/website/overview/img/firefox.png old mode 100644 new mode 100755 diff --git a/website/overview/img/tail.png b/website/overview/img/tail.png old mode 100644 new mode 100755 diff --git a/website/overview/index.html b/website/overview/index.html old mode 100644 new mode 100755 index b8000f4..0a1e520 --- a/website/overview/index.html +++ b/website/overview/index.html @@ -10,6 +10,7 @@ + @@ -26,12 +27,6 @@

AreWeFastYet

-
- -
-
-
tested on {{date | date:'dd MMM yy HH:mm'}}
-
Login diff --git a/website/overview/js/app.js b/website/overview/js/app.js old mode 100644 new mode 100755 index 44e98a6..10ae068 --- a/website/overview/js/app.js +++ b/website/overview/js/app.js @@ -25,83 +25,16 @@ awfyApp.controller('pageCtrl', ['$scope', '$http', '$q', '$location', // Get master data $q.all([ - $http.get('../data.php?file=master.js'), $http.get('../auth.php?persona&check'), ]).then(function(data) { - $scope.currentUser = data[1].data + $scope.currentUser = data[0].data - // Extract master data into JSON data. - var offset = data[0].data.indexOf("{"); - var endOffset = data[0].data.lastIndexOf("}"); - master = data[0].data.substring(offset, endOffset+1); - master = JSON.parse(master); - - // Add all machines (remove key) - var createMachines = function(frontpage) { - $scope.machines = []; - for(var i in master["machines"]) { - if(!frontpage || master["machines"][i]["frontpage"]) { - master["machines"][i]["id"] += ""; - $scope.machines.push(master["machines"][i]); - } - } - } - createMachines(true); - - // Watch on location change - var locationChangeSuccess = function(event) { - var path = $location.path().split("/"); - if(!$scope.selectedMachine || path[2] != $scope.selectedMachine.id) { - if(path[2].indexOf(",") == -1) { - // Check if machine is in full set or in frontpage set - createMachines(master["machines"][parseInt(path[2])]["frontpage"]); - - } else { - - // Check if "multiple machine" has already been made - var has = false; - for(var i in $scope.machines) { - if($scope.machines[i].id == path[2]) { - has = true; - } - } - - // Create "multiple machine" - if(!has) { - $scope.machines.push({ - id: path[2], - description: "Multipe machines", - }); - } - } - - $scope.selectedMachine = {id: path[2]}; - } - }; - $scope.$on('$locationChangeSuccess', locationChangeSuccess); - locationChangeSuccess(); - - - // Watch for changes of selection - $scope.$watch('selectedMachine', function (machine, id) { - if(!machine) { - return; - } - - if(machine.id) { - machine = machine.id; - } - - // Update location - var path = $location.path().split("/"); - if(machine != path[2]) { - path[2] = machine; - $location.path(path.join("/")); - } - }); }); - - }]); + +awfyApp.factory('MasterService', function() { + return AWFYMaster; +}); + diff --git a/website/overview/js/controllers.js b/website/overview/js/controllers.js old mode 100644 new mode 100755 index f0e7e98..21f8438 --- a/website/overview/js/controllers.js +++ b/website/overview/js/controllers.js @@ -13,15 +13,75 @@ var isFF = function(name) { return false; } -awfyCtrl.controller('overviewCtrl', ['$scope', '$http', '$routeParams', '$q', - function ($scope, $http, $routeParams, $q) { +awfyCtrl.controller('overviewCtrl', ['$scope', '$http', '$routeParams', '$q', '$location', 'MasterService', + function ($scope, $http, $routeParams, $q, $location, master) { + // Add all machines (remove key) + var createMachines = function(frontpage) { + $scope.machines = []; + for(var i in master["machines"]) { + if(!frontpage || master["machines"][i]["frontpage"]) { + master["machines"][i]["id"] += ""; + $scope.machines.push(master["machines"][i]); + } + } + } + createMachines(true); - var dataRequests = []; + // Watch on location change + var locationChangeSuccess = function(event) { + var path = $location.path().split("/"); + if(!$scope.selectedMachine || path[2] != $scope.selectedMachine.id) { + if(path[2].indexOf(",") == -1) { + // Check if machine is in full set or in frontpage set + createMachines(master["machines"][parseInt(path[2])]["frontpage"]); + + } else { + + // Check if "multiple machine" has already been made + var has = false; + for(var i in $scope.machines) { + if($scope.machines[i].id == path[2]) { + has = true; + } + } + + // Create "multiple machine" + if(!has) { + $scope.machines.push({ + id: path[2], + description: "Multipe machines", + }); + } + } + + $scope.selectedMachine = {id: path[2]}; + } + }; + $scope.$on('$locationChangeSuccess', locationChangeSuccess); + locationChangeSuccess(); - // Get master data - dataRequests.push($http.get('../data.php?file=master.js')); + // Watch for changes of selection + $scope.$watch('selectedMachine', function (machine, id) { + if(!machine) { + return; + } + + if(machine.id) { + machine = machine.id; + } + + // Update location + var path = $location.path().split("/"); + if(machine != path[2]) { + path[2] = machine; + $location.path(path.join("/")); + } + }); + + // Get machine data + var dataRequests = []; var machines = $routeParams.machine.split(","); for(var i=0; i!=machines.length; i++) { if(!$routeParams.suite) { @@ -33,15 +93,9 @@ awfyCtrl.controller('overviewCtrl', ['$scope', '$http', '$routeParams', '$q', $q.all(dataRequests).then(function(data) { - // Extract master data into JSON data. - var offset = data[0].data.indexOf("{"); - var endOffset = data[0].data.lastIndexOf("}"); - master = data[0].data.substring(offset, endOffset+1); - master = JSON.parse(master); - // Extract machine data var machines = []; - for(var i=1; i!=data.length; i++) { + for(var i=0; i!=data.length; i++) { var offset = data[i].data.indexOf("{"); var endOffset = data[i].data.lastIndexOf("}"); machine = data[i].data.substring(offset, endOffset+1); @@ -50,7 +104,7 @@ awfyCtrl.controller('overviewCtrl', ['$scope', '$http', '$routeParams', '$q', } // Show date - $scope.$parent.date = machines[0].stamp*1000; + $scope.date = machines[0].stamp*1000; if($routeParams.suite) { $scope.name = master["suiteversions"][$routeParams.suite]["name"]; diff --git a/website/overview/js/d3.v3.js b/website/overview/js/d3.v3.js old mode 100644 new mode 100755 diff --git a/website/overview/js/nv.d3.js b/website/overview/js/nv.d3.js old mode 100644 new mode 100755 diff --git a/website/overview/js/overview.js b/website/overview/js/overview.js old mode 100644 new mode 100755 diff --git a/website/overview/js/persona.js b/website/overview/js/persona.js old mode 100644 new mode 100755 diff --git a/website/overview/partials/overview.html b/website/overview/partials/overview.html old mode 100644 new mode 100755 index 1b3cfb6..7d04b0e --- a/website/overview/partials/overview.html +++ b/website/overview/partials/overview.html @@ -23,13 +23,19 @@
-->
-

- Overview -

- -

- Overview > {{name}} +

+ + + + > Overview + > {{name}}

+
+
tested on {{date | date:'dd MMM yy HH:mm'}}
+
@@ -57,4 +63,4 @@
-
\ No newline at end of file +
diff --git a/website/overview/sass/main.scss b/website/overview/sass/main.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/_base.scss b/website/overview/sass/partials/_base.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/_components.scss b/website/overview/sass/partials/_components.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/base/_base.scss b/website/overview/sass/partials/base/_base.scss old mode 100644 new mode 100755 index f79c529..1753345 --- a/website/overview/sass/partials/base/_base.scss +++ b/website/overview/sass/partials/base/_base.scss @@ -27,19 +27,66 @@ html { } h2 { - line-height: $unit*8; + font-weight: normal; + .machine { + select { + vertical-align: top; + -moz-appearance: none; + -webkit-appearance: none; + text-overflow: ''; + &::-ms-expand { + display: none; + } + + background-color: #F2F2F2; + border: 1px solid #DDD; + padding-left: 18px; + padding-right: 18px; + padding-top: $unit*3; + padding-bottom: $unit*6; + display: inline-block; + color: #222; + padding-right: $unit*3 + 18; + font-weight: bold; + min-width: 300px; + } + + &:after { + position: absolute; + content: "\e114"; + display: inline-block; + vertical-align: middle; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + font-size: 0.5em; + height: 2.0em; + margin-left: -$unit*2 - 18px; + line-height: 2.0em; + pointer-events: none; + padding-top: $unit*3; + padding-bottom: $unit*6; + } + } + + .extra { + line-height:75px; + } a { color: #000000; text-decoration: none; } - &:after { - content: ""; - display: block; - clear: both; - } + } + + #dates { + color: $_darkgrey; + margin-top: -$unit*9; + margin-bottom: $unit*6; + margin-left: 20px; + font-style:italic } } diff --git a/website/overview/sass/partials/base/_forms.scss b/website/overview/sass/partials/base/_forms.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/base/_header.scss b/website/overview/sass/partials/base/_header.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/base/_icons.scss b/website/overview/sass/partials/base/_icons.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/base/_lists.scss b/website/overview/sass/partials/base/_lists.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/base/_media.scss b/website/overview/sass/partials/base/_media.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/base/_tables.scss b/website/overview/sass/partials/base/_tables.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/base/_typography.scss b/website/overview/sass/partials/base/_typography.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/partials/components/pages/_main.scss b/website/overview/sass/partials/components/pages/_main.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/_abstractions.scss b/website/overview/sass/utility/_abstractions.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/_variables.scss b/website/overview/sass/utility/_variables.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/abstractions/_assoc.scss b/website/overview/sass/utility/abstractions/_assoc.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/abstractions/_box.scss b/website/overview/sass/utility/abstractions/_box.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/abstractions/_select.scss b/website/overview/sass/utility/abstractions/_select.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/variables/_breakpoints.scss b/website/overview/sass/utility/variables/_breakpoints.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/variables/_colors.scss b/website/overview/sass/utility/variables/_colors.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/variables/_forms.scss b/website/overview/sass/utility/variables/_forms.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/variables/_grid.scss b/website/overview/sass/utility/variables/_grid.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/variables/_icons.scss b/website/overview/sass/utility/variables/_icons.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/variables/_legacy.scss b/website/overview/sass/utility/variables/_legacy.scss old mode 100644 new mode 100755 diff --git a/website/overview/sass/utility/variables/_typography.scss b/website/overview/sass/utility/variables/_typography.scss old mode 100644 new mode 100755