jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

Create new css _login.scss for authSignIn and authSignUp and import _login.scss to file common.scss, and undo changes to files inject.js, index.html and auth.scss.

pull/312/head
lwazevedo 2017-06-30 14:50:28 -03:00
parent c21905bfc6
commit eae59492c7
5 changed files with 159 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gulp/inject.js
View File

@ -18,7 +18,7 @@ gulp.task('inject-reload', ['inject'], function() {
gulp.task('inject', ['scripts', 'styles', 'injectAuth', 'inject404', 'copyVendorImages'], function() { gulp.task('inject', ['scripts', 'styles', 'injectAuth', 'inject404', 'copyVendorImages'], function() {
var injectStyles = gulp.src([ var injectStyles = gulp.src([
path.join(conf.paths.tmp, '/serve/app/main.css'), path.join(conf.paths.tmp, '/serve/app/main.css'),
path.join(conf.paths.tmp, '/serve/app/auth.css'), //path.join(conf.paths.tmp, '/serve/app/auth.css'),
path.join('!' + conf.paths.tmp, '/serve/app/vendor.css') path.join('!' + conf.paths.tmp, '/serve/app/vendor.css')
], { read: false }); ], { read: false });
@ -47,7 +47,8 @@ gulp.task('inject', ['scripts', 'styles', 'injectAuth', 'inject404', 'copyVendor
gulp.task('injectAuth', ['stylesAuth'], function() { gulp.task('injectAuth', ['stylesAuth'], function() {
return injectAlone({ return injectAlone({
css: [path.join('!' + conf.paths.tmp, '/serve/app/vendor.css'), path.join(conf.paths.tmp, '/serve/app/auth.css')], css: [path.join('!' + conf.paths.tmp, '/serve/app/vendor.css'), path.join(conf.paths.tmp, '/serve/app/auth.css')],
paths: [path.join(conf.paths.src, '/auth.html'), path.join(conf.paths.src, '/reg.html'), path.join(conf.paths.src, '/app/pages/authSigIn/authSignIn.html'), path.join(conf.paths.src, '/app/pages/authSigIn/authSignUp.html')] paths: [path.join(conf.paths.src, '/auth.html'), path.join(conf.paths.src, '/reg.html')]
// paths: [path.join(conf.paths.src, '/auth.html'), path.join(conf.paths.src, '/reg.html'), path.join(conf.paths.src, '/app/pages/authSigIn/authSignIn.html'), path.join(conf.paths.src, '/app/pages/authSigIn/authSignUp.html')]
}) })
}); });

5
src/index.html
View File

@ -25,11 +25,6 @@
<!-- endinject --> <!-- endinject -->
<!-- endbuild --> <!-- endbuild -->
<!-- build:css({.tmp/serve,src}) styles/auth.css -->
<!-- inject:css -->
<!-- css files will be automatically insert here -->
<!-- endinject -->
<!-- endbuild -->
</head> </head>
<body> <body>

28
src/sass/auth.scss
View File

@ -1,29 +1,29 @@
@import "common.scss"; @import "common.scss";
// @import "theme/_socicon.scss"; @import "theme/_socicon.scss";
// @import "theme/_layout.scss"; @import "theme/_layout.scss";
// @import 'theme/buttons.scss'; @import 'theme/buttons.scss';
// @import 'app/form.scss'; @import 'app/form.scss';
// html { html {
// min-height: 520px;
// height: 100%;
// }
.login {
min-height: 520px; min-height: 520px;
height: 100%;
}
body {
@include main-background(); @include main-background();
height: 100%; height: 100%;
} }
$text-color: #ffffff; $text-color: #ffffff;
.login .form-control, .form-control,
.login .form-control:focus { .form-control:focus {
@include placeholderStyle($text-color, 0.9); @include placeholderStyle($text-color, 0.9);
background-color: rgba(0, 0, 0, .4); background-color: rgba(0, 0, 0, .4);
border-radius: 5px; border-radius: 5px;
color: $text-color; color: $text-color;
} }
.login .form-control[disabled], .form-control[disabled],
.login .form-control[readonly], .form-control[readonly],
fieldset[disabled] .form-control { fieldset[disabled] .form-control {
@include placeholderStyle($text-color, 0.6); @include placeholderStyle($text-color, 0.6);
} }
@ -37,7 +37,7 @@ fieldset[disabled] .form-control {
.auth-block { .auth-block {
width: 540px; width: 540px;
margin: 150px auto; margin: 0 auto;
border-radius: 5px; border-radius: 5px;
@include bg-translucent-dark(0.55); @include bg-translucent-dark(0.55);
color: #fff; color: #fff;

1
src/sass/common.scss
View File

@ -1,3 +1,4 @@
@import 'theme/conf/mixins'; @import 'theme/conf/mixins';
@import 'theme/conf/colorScheme/mint'; @import 'theme/conf/colorScheme/mint';
@import 'theme/conf/variables'; @import 'theme/conf/variables';
@import 'theme/_login.scss';

141
src/sass/theme/_login.scss Normal file
View File

@ -0,0 +1,141 @@
.login {
min-height: 520px;
@include main-background();
height: 100%;
}
$text-color: #ffffff;
.login .form-control,
.login .form-control:focus {
@include placeholderStyle($text-color, 0.9);
background-color: rgba(0, 0, 0, .4);
border-radius: 5px;
color: $text-color;
}
.login .form-control[disabled],
.login .form-control[readonly],
fieldset[disabled] .form-control {
@include placeholderStyle($text-color, 0.6);
}
.auth-main {
display: flex;
align-items: center;
height: 100%;
width: 100%;
}
.login .auth-block {
width: 540px;
margin: 150px auto;
border-radius: 5px;
@include bg-translucent-dark(0.55);
color: #fff;
padding: 32px;
h1 {
font-weight: $font-light;
margin-bottom: 28px;
text-align: center;
}
p {
font-size: 16px;
}
a {
text-decoration: none;
outline: none;
transition: all 0.2s ease;
color: $primary;
&:hover {
color: $primary-dark;
}
}
.control-label {
padding-top: 11px;
color: $text-color;
}
.form-group {
margin-bottom: 12px;
}
}
.login .auth-input {
width: 300px;
margin-bottom: 24px;
input {
display: block;
width: 100%;
border: none;
font-size: 16px;
padding: 4px 10px;
outline: none;
}
}
.login a.forgot-pass {
display: block;
text-align: right;
margin-bottom: -20px;
float: right;
z-index: 2;
position: relative;
}
.login .auth-link {
display: block;
font-size: 16px;
text-align: center;
margin-bottom: 33px;
}
.login .auth-sep {
margin-top: 36px;
margin-bottom: 24px;
line-height: 20px;
font-size: 16px;
text-align: center;
display: block;
position: relative;
&>span {
display: table-cell;
width: 30%;
white-space: nowrap;
padding: 0 24px;
color: $text-color;
&>span {
margin-top: -12px;
display: block;
}
}
&:before,
&:after {
border-top: solid 1px $text-color;
content: "";
height: 1px;
width: 35%;
display: table-cell;
}
}
.login .al-share-auth {
text-align: center;
.al-share {
float: none;
margin: 0;
padding: 0;
display: inline-block;
li {
margin-left: 24px;
&:first-child {
margin-left: 0;
}
i {
font-size: 24px;
}
}
}
}
.login .btn-auth {
color: #ffffff!important;
}