diff -Nru horizon-9.0.0/debian/changelog horizon-9.0.0/debian/changelog --- horizon-9.0.0/debian/changelog 2016-04-18 21:23:50.000000000 +0000 +++ horizon-9.0.0/debian/changelog 2016-05-26 09:48:59.000000000 +0000 @@ -1,3 +1,10 @@ +horizon (2:9.0.0-0ubuntu2.16.04.1) xenial; urgency=medium + + * d/theme/ubuntu/*: Refresh with misc fixes from the Canonical design + team (LP: #1585948). + + -- James Page Thu, 26 May 2016 10:48:47 +0100 + horizon (2:9.0.0-0ubuntu2) xenial; urgency=medium * d/openstack-dashboard.[preinst|postrm]: Remove any static files from diff -Nru horizon-9.0.0/debian/gbp.conf horizon-9.0.0/debian/gbp.conf --- horizon-9.0.0/debian/gbp.conf 2016-04-18 19:05:36.000000000 +0000 +++ horizon-9.0.0/debian/gbp.conf 2016-05-26 09:48:59.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = master +debian-branch = stable/mitaka pristine-tar = True [buildpackage] diff -Nru horizon-9.0.0/debian/theme/ubuntu/_styles.scss horizon-9.0.0/debian/theme/ubuntu/_styles.scss --- horizon-9.0.0/debian/theme/ubuntu/_styles.scss 2016-04-18 19:05:36.000000000 +0000 +++ horizon-9.0.0/debian/theme/ubuntu/_styles.scss 2016-05-26 09:48:59.000000000 +0000 @@ -8,12 +8,32 @@ font-weight: 300; } +p { + margin: 10px 0; +} + a, a:link, a:visited { color: $brand-color; } +.row { + margin-bottom: 20px; + margin-top: 20px; +} + +table { + background-color: $table-bg; + border: 1px solid #ddd; +} + +.table_actions { + margin-bottom: 10px; +} + + + .topbar, .topbar .switcher_bar .btn.btn-topnav, .navbar-default { @@ -123,10 +143,15 @@ box-shadow: 0px 1px 3px 1px rgba(51,51,51,0.2); -moz-box-shadow: 0px 1px 3px 1px rgba(51,51,51,0.2); -webkit-box-shadow: 0px 1px 3px 1px rgba(51,51,51,0.2); - padding-bottom: 40px; - padding-top: 80px; + max-width: 500px; + padding-bottom: 20px; + padding-top: 60px; position: relative; + .splash-logo { + display: none; + } + &:after { background-image: url("/static/themes/ubuntu/img/logo-ubuntu-orange.svg"); background-repeat: no-repeat; @@ -139,8 +164,13 @@ line-height: 1.7em; position: absolute; text-indent: 115px; - top: 20px; + top: 25px; width: 100%; } + + .horizontal-center { + margin: 0; + width: auto; + } } } diff -Nru horizon-9.0.0/debian/theme/ubuntu/_variables.scss horizon-9.0.0/debian/theme/ubuntu/_variables.scss --- horizon-9.0.0/debian/theme/ubuntu/_variables.scss 2016-04-18 19:05:36.000000000 +0000 +++ horizon-9.0.0/debian/theme/ubuntu/_variables.scss 2016-05-26 09:48:59.000000000 +0000 @@ -12,3 +12,6 @@ $nav-active-color: #b83a10; $nav-hover-color: #e1662f; + +$table-bg: #efefef; +//$table-border-color: