diff --git a/gulpfile.js b/gulpfile.js index 961a9c1c..e9ea2c87 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -48,7 +48,7 @@ gulp.task('fonts', function() { gulp.task('images', function() { var imagesPath = 'src/img/*'; var patternFlyImagesPath = 'node_modules/patternfly/dist/img/*'; - return gulp.src([imagesPath, patternFlyImagesPath]) + return gulp.src([patternFlyImagesPath, imagesPath]) .pipe(gulp.dest('./dist/img')); }); diff --git a/src/img/bg-login-2.png b/src/img/bg-login-2.png new file mode 100644 index 00000000..3056b41c Binary files /dev/null and b/src/img/bg-login-2.png differ diff --git a/src/img/bg-login.png b/src/img/bg-login.png new file mode 100644 index 00000000..a95213e1 Binary files /dev/null and b/src/img/bg-login.png differ diff --git a/src/img/brand.svg b/src/img/brand.svg index aeb96114..46b3234e 100644 --- a/src/img/brand.svg +++ b/src/img/brand.svg @@ -1,87 +1,72 @@ - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/src/img/logo.svg b/src/img/logo.svg old mode 100755 new mode 100644 index a04f0f9b..245a6882 --- a/src/img/logo.svg +++ b/src/img/logo.svg @@ -1,22 +1,367 @@ - + + width="132px" height="126px" viewBox="0 0 132 126" enable-background="new 0 0 132 126" xml:space="preserve"> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/nav-brand.svg b/src/img/nav-brand.svg new file mode 100755 index 00000000..f9ad08dc --- /dev/null +++ b/src/img/nav-brand.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/js/components/NavBar.js b/src/js/components/NavBar.js index fe250b2a..48e4b663 100644 --- a/src/js/components/NavBar.js +++ b/src/js/components/NavBar.js @@ -24,7 +24,7 @@ export default class NavBar extends React.Component { - RDO Director + RDO Director
diff --git a/src/less/base.less b/src/less/base.less index 3f9df9a6..a537ea7a 100644 --- a/src/less/base.less +++ b/src/less/base.less @@ -7,6 +7,7 @@ @import "utils/variables"; +@import "utils/patternflyOverrides"; @import "forms/Forms"; @import "components/EnvironmentConfiguration"; @import "components/NodeStack"; diff --git a/src/less/utils/patternflyOverrides.less b/src/less/utils/patternflyOverrides.less new file mode 100644 index 00000000..f70afc5d --- /dev/null +++ b/src/less/utils/patternflyOverrides.less @@ -0,0 +1,52 @@ +// +// Login +// -------------------------------------------------- + +.login-pf { + background-color: @login-bg-color; + @media (min-width: @screen-sm-min) { + background-image: url("@{img-path}/@{img-bg-login-2}"); + background-position: 100% 100%; + background-repeat: no-repeat; + background-size: 30%; + } + @media (min-width: @screen-md-min) { + background-size: auto; + } + #badge { + margin-bottom: 50px; + } + body { + background: transparent; + @media (min-width: @screen-sm-min) { + background-image: url("@{img-path}/@{img-bg-login}"); + background-repeat: no-repeat; + background-size: 30%; + height: 100%; + } + @media (min-width: @screen-md-min) { + background-size: auto; + } + } + #brand { + top: -30px; + @media (min-width: @screen-sm-min) { + top: -40px; + + .alert { + margin-top: -20px; + } + } + } + .container { + padding-top: 0; + color: #333; + @media (min-width: @screen-md-min) { + bottom: 20%; + padding-right: 120px; + } + + [class^='alert'] { + color: #333333; + } + } +} \ No newline at end of file diff --git a/src/less/utils/variables.less b/src/less/utils/variables.less index 5ab1b080..ad1aeee6 100644 --- a/src/less/utils/variables.less +++ b/src/less/utils/variables.less @@ -6,3 +6,7 @@ @header-height: 72px; @footer-height: 37px; + +@login-bg-color: #f1f1f1; +@img-bg-login: "bg-login.png"; +@img-bg-login-2: "bg-login-2.png";