diff --git a/site/client/app/views/lobby.html b/site/client/app/views/lobby.html index 09ff912..f2d69b4 100644 --- a/site/client/app/views/lobby.html +++ b/site/client/app/views/lobby.html @@ -1,6 +1,6 @@
- Gwent + Gwent diff --git a/site/client/assets/sass/_inner.scss b/site/client/assets/sass/_inner.scss index aa12417..6bdef57 100644 --- a/site/client/assets/sass/_inner.scss +++ b/site/client/assets/sass/_inner.scss @@ -18,12 +18,9 @@ main { padding: 20px; height: calc(100vh - 300px); min-height: 400px; + clear: both; - background: -moz-linear-gradient(top, rgba(8,13,20,1) 17%, rgba(8,13,20,0.65) 46%, rgba(239,239,239,0) 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(17%,rgba(8,13,20,1)), color-stop(46%,rgba(8,13,20,0.65)), color-stop(100%,rgba(239,239,239,0))); - background: -webkit-linear-gradient(top, rgba(8,13,20,1) 17%,rgba(8,13,20,0.65) 46%,rgba(239,239,239,0) 100%); - background: -o-linear-gradient(top, rgba(8,13,20,1) 17%,rgba(8,13,20,0.65) 46%,rgba(239,239,239,0) 100%); - background: -ms-linear-gradient(top, rgba(8,13,20,1) 17%,rgba(8,13,20,0.65) 46%,rgba(239,239,239,0) 100%); - background: linear-gradient(to bottom, rgba(8,13,20,1) 17%,rgba(8,13,20,0.65) 46%,rgba(239,239,239,0) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#080d14', endColorstr='#00efefef',GradientType=0 ); + color: #fff; + + @include contentGradient(); } \ No newline at end of file diff --git a/site/client/assets/sass/_mixins.scss b/site/client/assets/sass/_mixins.scss index a9aa8b6..72adc31 100644 --- a/site/client/assets/sass/_mixins.scss +++ b/site/client/assets/sass/_mixins.scss @@ -22,6 +22,17 @@ $main: #d96f1f; filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#243141', endColorstr='#334152',GradientType=1 ); } +@mixin contentGradient() { + background: #080d14; + background: -moz-linear-gradient(top, rgba(8,13,20,1) 4%, rgba(8,13,20,0.56) 46%, rgba(239,239,239,0) 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(4%,rgba(8,13,20,1)), color-stop(46%,rgba(8,13,20,0.56)), color-stop(100%,rgba(239,239,239,0))); + background: -webkit-linear-gradient(top, rgba(8,13,20,1) 4%,rgba(8,13,20,0.56) 46%,rgba(239,239,239,0) 100%); + background: -o-linear-gradient(top, rgba(8,13,20,1) 4%,rgba(8,13,20,0.56) 46%,rgba(239,239,239,0) 100%); + background: -ms-linear-gradient(top, rgba(8,13,20,1) 4%,rgba(8,13,20,0.56) 46%,rgba(239,239,239,0) 100%); + background: linear-gradient(to bottom, rgba(8,13,20,1) 4%,rgba(8,13,20,0.56) 46%,rgba(239,239,239,0) 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#080d14', endColorstr='#00efefef',GradientType=0 ); +} + @mixin transition($type: all) { transition: $type .3s ease-in-out 0s; } diff --git a/site/client/assets/sass/_nav.scss b/site/client/assets/sass/_nav.scss index 65a03be..5eeb284 100644 --- a/site/client/assets/sass/_nav.scss +++ b/site/client/assets/sass/_nav.scss @@ -20,6 +20,7 @@ nav { font-weight: 300; padding: 12px 25px; float: left; + cursor: pointer; @include transition(color); @@ -30,7 +31,7 @@ nav { &.active { color: $main; text-shadow: none; - background: rgba(#080d14, .9); + background: #080d14; } } } \ No newline at end of file diff --git a/site/client/views/app.blade.php b/site/client/views/app.blade.php index aa3623e..b7c9479 100644 --- a/site/client/views/app.blade.php +++ b/site/client/views/app.blade.php @@ -23,7 +23,7 @@ // todo: extract to vue setTimeout(function() { $('.container-form-landing').addClass('active') - }, 400); + }, 300); // todo: extract to vue $('.btn-guest').on('click', function() { diff --git a/site/public/assets/img/logo-medium.png b/site/public/assets/img/logo-medium.png index 24911ac..a51bec7 100644 Binary files a/site/public/assets/img/logo-medium.png and b/site/public/assets/img/logo-medium.png differ