Repository: aurora Updated Branches: refs/heads/master c5254c74b -> 335cf88f5
Fix flickering of the Aurora logo on refresh. Refreshing a subpage of /scheduler in Chrome temporarily resize the Aurora logo. This seems to be due to us loading the styles in the <body> after first rending the logo. Moving the styles to the header fixes this. Reviewed at https://reviews.apache.org/r/45055/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/335cf88f Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/335cf88f Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/335cf88f Branch: refs/heads/master Commit: 335cf88f55b58dd625625bcac437ae2ac0722a9c Parents: c5254c7 Author: Stephan Erb <s...@apache.org> Authored: Tue Mar 22 10:44:09 2016 +0100 Committer: Stephan Erb <step...@dev.static-void.de> Committed: Tue Mar 22 10:44:09 2016 +0100 ---------------------------------------------------------------------- src/main/resources/scheduler/assets/scheduler/index.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/335cf88f/src/main/resources/scheduler/assets/scheduler/index.html ---------------------------------------------------------------------- diff --git a/src/main/resources/scheduler/assets/scheduler/index.html b/src/main/resources/scheduler/assets/scheduler/index.html index 383ca43..98e465a 100644 --- a/src/main/resources/scheduler/assets/scheduler/index.html +++ b/src/main/resources/scheduler/assets/scheduler/index.html @@ -18,6 +18,11 @@ <meta name='google' value='notranslate'> <link rel='icon' href='/assets/images/aurora.png' type='image/png'/> <title>Aurora</title> + + <!-- Load our css at the end so we can override bootstrap css properties as needed --> + <link href='/assets/bower_components/bootstrap/dist/css/bootstrap.min.css' rel='stylesheet'> + <link rel='stylesheet' href='/assets/css/app.css'/> + </head> <body class='ng-cloak'> @@ -56,7 +61,6 @@ <!-- Bootstrap --> <script src='/assets/bower_components/jquery/dist/jquery.js'></script> <script src='/assets/bower_components/bootstrap/dist/js/bootstrap.min.js'></script> -<link href='/assets/bower_components/bootstrap/dist/css/bootstrap.min.css' rel='stylesheet'> <!-- Angular bootstrap --> <script src='/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js'></script> @@ -70,7 +74,5 @@ <!-- moment.js --> <script src='/assets/bower_components/momentjs/moment.js'></script> -<!-- Load our css at the end so we can override bootstrap css properties as needed --> -<link rel='stylesheet' href='/assets/css/app.css'/> </body> </html>