From 28fa49ae42c58e106b4140134543f1a85d1084f8 Mon Sep 17 00:00:00 2001 From: Vikram Tiwari Date: Sat, 27 Aug 2016 14:19:29 -0700 Subject: [PATCH 1/7] adds angular-material support removed bootstrap fixed layout issues fixed header --- app.js | 8 +- package.json | 3 + .../public/views/system/header.html | 74 ++++++++----------- .../server/views/includes/head.html | 4 +- .../meanStarter/server/views/index.html | 2 +- .../server/views/layouts/default.html | 9 ++- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/app.js b/app.js index 640b85391e..339dce71db 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ import 'angular/angular-csp.css' import 'angular-ui-select/select.min.css' -import 'bootstrap/dist/css/bootstrap.min.css' +import 'angular-material/angular-material.min.css' import jQuery from 'jquery' import 'angular' @@ -13,7 +13,9 @@ import 'angular-resource' import 'angular-sanitize' import 'angular-ui-router' import 'angular-jwt' -import 'angular-bootstrap/ui-bootstrap-tpls' +import 'angular-aria' +import 'angular-animate' +import 'angular-material' window.$ = jQuery @@ -26,7 +28,7 @@ angular.element(document).ready(function () { }) function processModules (modules) { - var packageModules = ['ngCookies', 'ngResource', 'ui.bootstrap', 'ui.router', 'ui.select', 'ngSanitize'] + var packageModules = ['ngCookies', 'ngResource', 'ui.router', 'ui.select', 'ngSanitize', 'ngMaterial'] var m var mn for (var index in modules) { diff --git a/package.json b/package.json index 76c74b0265..6e9011def0 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,12 @@ }, "dependencies": { "angular": "^1.5.5", + "angular-animate": "^1.5.8", + "angular-aria": "^1.5.8", "angular-bootstrap": "^0.12.2", "angular-cookies": "^1.5.2", "angular-jwt": "latest", + "angular-material": "^1.1.0", "angular-mocks": "^1.5.2", "angular-resource": "^1.5.2", "angular-route": "^1.5.2", diff --git a/packages/custom/meanStarter/public/views/system/header.html b/packages/custom/meanStarter/public/views/system/header.html index 1d86585855..97a15a8849 100644 --- a/packages/custom/meanStarter/public/views/system/header.html +++ b/packages/custom/meanStarter/public/views/system/header.html @@ -1,47 +1,31 @@ - + + + + exit_to_app + Logout + + + + + diff --git a/packages/custom/meanStarter/server/views/includes/head.html b/packages/custom/meanStarter/server/views/includes/head.html index cb30b0b4fb..e225c85d62 100644 --- a/packages/custom/meanStarter/server/views/includes/head.html +++ b/packages/custom/meanStarter/server/views/includes/head.html @@ -21,7 +21,9 @@ - + + + diff --git a/packages/custom/meanStarter/server/views/index.html b/packages/custom/meanStarter/server/views/index.html index 216f285fa8..cfb381bc03 100644 --- a/packages/custom/meanStarter/server/views/index.html +++ b/packages/custom/meanStarter/server/views/index.html @@ -1,6 +1,6 @@ {% extends 'layouts/default.html' %} {% block content %} -
+
{% if (process.env.NODE_ENV == 'development') %} From 5b8555827a0fb74ea20d00a2d92eef31aef8d770 Mon Sep 17 00:00:00 2001 From: Vikram Tiwari Date: Sat, 27 Aug 2016 17:04:56 -0700 Subject: [PATCH 4/7] user package with material design --- .../public/views/users/forgot-password.html | 48 ++++---- .../meanStarter/public/views/users/index.html | 30 ++--- .../meanStarter/public/views/users/login.html | 58 ++++------ .../public/views/users/register.html | 105 +++++++----------- .../public/views/users/reset-password.html | 48 ++++---- 5 files changed, 126 insertions(+), 163 deletions(-) diff --git a/packages/custom/meanStarter/public/views/users/forgot-password.html b/packages/custom/meanStarter/public/views/users/forgot-password.html index a1e4fa0e5d..325d66dda3 100644 --- a/packages/custom/meanStarter/public/views/users/forgot-password.html +++ b/packages/custom/meanStarter/public/views/users/forgot-password.html @@ -1,23 +1,25 @@ -
-
{{forgot.response.message}}
-

Forgot Password

-

Please enter your email address to reset your password.

-
-
- - -
Please enter a correct info #
- -
-
- -

Don't have an account?

- Sign up -
- -
-
- # -
-
+ + +
+ + + Forgot Password +

{{forgot.response.message}}

+ + + + + + + + + + Login + Join + + Retrieve + +
+ + # + diff --git a/packages/custom/meanStarter/public/views/users/index.html b/packages/custom/meanStarter/public/views/users/index.html index 02d162c011..d0dad2d44a 100644 --- a/packages/custom/meanStarter/public/views/users/index.html +++ b/packages/custom/meanStarter/public/views/users/index.html @@ -1,19 +1,11 @@ -
- - - - -
+ + + + # + diff --git a/packages/custom/meanStarter/public/views/users/login.html b/packages/custom/meanStarter/public/views/users/login.html index 0dec0d832e..9e91604525 100644 --- a/packages/custom/meanStarter/public/views/users/login.html +++ b/packages/custom/meanStarter/public/views/users/login.html @@ -1,34 +1,24 @@ -
- -
{{login.loginError}}
- -

Login

- -
-
- -
Please enter a correct info #
- -
-
- -
Please enter a correct info #
- -
- {{login.input.tooltipText}} -
- -
-
- Forgot your password? -
- -
- # -
-
-
\ No newline at end of file + diff --git a/packages/custom/meanStarter/public/views/users/register.html b/packages/custom/meanStarter/public/views/users/register.html index 2153f20ada..eeb50637b7 100644 --- a/packages/custom/meanStarter/public/views/users/register.html +++ b/packages/custom/meanStarter/public/views/users/register.html @@ -1,66 +1,39 @@ -
-
-
{{error.msg}}
-
-
{{reg.usernameError}}
-
{{reg.emailError}}
-
-

Sign Up

- -
- - -
Please enter a correct info #
- -
- -
- - -
Please enter a correct info #
- -
- -
- - -
Please enter a correct info #
- -
- -
- - -
Please enter a correct info #
- -
- {{reg.input.tooltipText}} -
- -
-
- - -
Please enter a correct info #
- -
- {{reg.input.tooltipTextConfirmPass}} -
- -
- -
- -

Already have an account?

- Log in -
-
- # -
-
-
+ diff --git a/packages/custom/meanStarter/public/views/users/reset-password.html b/packages/custom/meanStarter/public/views/users/reset-password.html index 3910455505..c655607084 100644 --- a/packages/custom/meanStarter/public/views/users/reset-password.html +++ b/packages/custom/meanStarter/public/views/users/reset-password.html @@ -1,21 +1,27 @@ -
-
{{reset.resetpassworderror}}
-
-
{{reset.error.msg}}
-
-

Enter your new password

-
-
- - -
-
- - -
-
- -
-
-
- + + +
+ + + Forgot Password +

{{reset.resetpassworderror}}

+

{{reset.error.msg}}

+ + + + + + + + + + + + + + Save + +
+ + # + From b8f66b7d37d7c374cc53892b2b31f6320ad0f88f Mon Sep 17 00:00:00 2001 From: Vikram Tiwari Date: Fri, 2 Sep 2016 18:58:37 -0700 Subject: [PATCH 5/7] update social buttons --- .../public/views/system/index.html | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/custom/meanStarter/public/views/system/index.html b/packages/custom/meanStarter/public/views/system/index.html index 3ea4b881bc..4240a30bc4 100644 --- a/packages/custom/meanStarter/public/views/system/index.html +++ b/packages/custom/meanStarter/public/views/system/index.html @@ -1,27 +1,32 @@

- With MEAN framework, you can create members, articles, or add more features with packages from the community. + With MEAN framework, you can create members, articles, or add more features with packages from the community.

+ community group - + face + Facebook - + code + GitHub - + textsms + Gitter - + voice_chat + Hangout @@ -30,25 +35,27 @@
-

Browse the Documentation

+

Browse the Documentation

Before you jump in it's important to read the documentation and learn about the different aspects of extending and developing MEAN.

- Mean is based on MongoDB, Express.js, Angular.js and Node.js and even basic proficiency in these technologies will help you dive in to mean development - luckily there are plenty of tutorials around. + Mean is based on MongoDB, Express.js, Angular.js and Node.js and even basic proficiency in these technologies will help you dive in to mean development - luckily there are plenty of tutorials around.

{{doc.text}}

- More Info + More Info
-

Browse our packages All Packages

+

Browse our packages + All Packages +

Site Image @@ -58,7 +65,7 @@ - More Info + More Info
@@ -74,7 +81,7 @@ - More Info + More Info
From 80484e6e5bcaedb759513a15c8bdbd754abdd1dd Mon Sep 17 00:00:00 2001 From: Vikram Tiwari Date: Fri, 2 Sep 2016 19:07:49 -0700 Subject: [PATCH 6/7] use debug module patches into cluster to give basic production status logs --- package.json | 3 ++- server.js | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6e9011def0..aaf7b73973 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "license": "MIT", "scripts": { - "start": "node server", + "start": "DEBUG=cluster node server", "mocha": "node tools/test/run-mocha.js", "karma": "node node_modules/karma/bin/karma start karma.conf.js", "test": "gulp test", @@ -41,6 +41,7 @@ "connect-flash": "latest", "connect-modrewrite": "latest", "consolidate": "latest", + "debug": "^2.2.0", "express": "^4.14.0", "helmet": "^2.1.1", "lodash": "latest", diff --git a/server.js b/server.js index 855b9906c0..1ebba79fed 100644 --- a/server.js +++ b/server.js @@ -14,6 +14,7 @@ process.env.NODE_CONFIG_DIR = './config/env' var mean = require('meanio') var cluster = require('cluster') var deferred = require('q').defer() +var debug = require('debug')('cluster') // Code to run if we're in the master process or if we are not in debug mode/ running tests @@ -23,20 +24,20 @@ if ((cluster.isMaster) && (process.execArgv.indexOf('--singleProcess') < 0)) { // if (cluster.isMaster) { - console.log('for real!') + debug(`Production Environment`) // Count the machine's CPUs var cpuCount = process.env.CPU_COUNT || require('os').cpus().length // Create a worker for each CPU for (var i = 0; i < cpuCount; i += 1) { - console.log('forking ', i) + debug(`forking ${i}`) cluster.fork() } // Listen for dying workers cluster.on('exit', function (worker) { // Replace the dead worker, we're not sentimental - console.log('Worker ' + worker.id + ' died :(') + debug(`Worker ${worker.id} died :(`) cluster.fork() }) @@ -50,7 +51,7 @@ if ((cluster.isMaster) && mean.serve({ workerid: workerId }, function (app) { var config = app.getConfig() var port = config.https && config.https.port ? config.https.port : config.http.port - console.log('Mean app started on port ' + port + ' (' + process.env.NODE_ENV + ') cluster.worker.id:', workerId) + debug(`MEAN app started on port ${port} (${process.env.NODE_ENV}) with cluster worker id ${workerId}`) deferred.resolve(app) }) From 7c6ece6eb265a263555b9b499176ec143c02a4e0 Mon Sep 17 00:00:00 2001 From: Vikram Tiwari Date: Fri, 2 Sep 2016 19:28:05 -0700 Subject: [PATCH 7/7] update gulp, remove extra css files gulp running sass, less before webpack removed all extra css which is not required now --- gulp/development.js | 2 +- .../meanStarter/public/assets/css/common.css | 51 +- .../public/assets/css/loginForms.css | 449 ------------------ .../meanStarter/public/assets/css/starter.css | 261 ---------- packages/custom/meanStarter/public/index.js | 2 - .../public/views/system/header.html | 1 + .../public/views/system/index.html | 3 +- 7 files changed, 9 insertions(+), 760 deletions(-) delete mode 100644 packages/custom/meanStarter/public/assets/css/loginForms.css delete mode 100644 packages/custom/meanStarter/public/assets/css/starter.css diff --git a/gulp/development.js b/gulp/development.js index 56299291ae..ba9a6da232 100644 --- a/gulp/development.js +++ b/gulp/development.js @@ -106,7 +106,7 @@ myDevConfig.devtool = 'sourcemap' myDevConfig.debug = true // create a single instance of the compiler to allow caching var devCompiler = webpack(myDevConfig) -gulp.task('webpack:build-dev', function (callback) { +gulp.task('webpack:build-dev', ['sass', 'less'], function (callback) { // run webpack devCompiler.run(function (err, stats) { if (err) throw new gutil.PluginError('webpack:build-dev', err) diff --git a/packages/custom/meanStarter/public/assets/css/common.css b/packages/custom/meanStarter/public/assets/css/common.css index 05959c2618..335fb71c22 100644 --- a/packages/custom/meanStarter/public/assets/css/common.css +++ b/packages/custom/meanStarter/public/assets/css/common.css @@ -1,47 +1,6 @@ -.page-header { - padding-bottom: 0 !important; - margin: 0 !important; - border-bottom: 0 !important; +.MEAN-logo { + content: url('/meanStarter/assets/img/logo.png'); + height: 100%; + width: 2.5%; + margin-right: 0.5em; } -.page-header .navbar-nav { - float: right; -} -.page-header > div > div, .page-header > div > ul { - display: inline-block; -} -.text-edit { - float: right; - margin-top: 12px; -} -.account { - text-align:right; -} -.account > div, .account > ul { - text-align: left; -} -.navbar .nav > li > a.brand { - padding-left: 20px; - margin-left: 0 -} -.content { - margin-top: 70px; - width: 100% -} -footer { - position: fixed; - left: 0; - bottom: 0; - height: 30px; - width: 100%; - background: #ddd; - -webkit-box-shadow: 0 8px 6px 6px black; - -moz-box-shadow: 0 8px 6px 6px black; - box-shadow: 0 8px 6px 6px black -} -footer p { - padding: 5px 0 12px 10px -} - -.featuredpic img{ - width:510px; -} \ No newline at end of file diff --git a/packages/custom/meanStarter/public/assets/css/loginForms.css b/packages/custom/meanStarter/public/assets/css/loginForms.css deleted file mode 100644 index b635550372..0000000000 --- a/packages/custom/meanStarter/public/assets/css/loginForms.css +++ /dev/null @@ -1,449 +0,0 @@ -html { - height: 100%; -} - -body.login, body.register, body.forgot-password { -background: url("/meanStarter/assets/img/bg.png"); - height: 100%; - position: relative; -} -@font-face { - font-family: 'futura_bkbook'; - src: url("/meanStarter/assets/fonts/ufonts.com_futura-book.eot"); - src: url("/meanStarter/assets/fonts/ufonts.com_futura-book.eot?#iefix") format("embedded-opentype"), url("/meanStarter/assets/fonts/ufonts.com_futura-book.woff") format("woff"), url("/meanStarter/assets/fonts/ufonts.com_futura-book.ttf") format("truetype"), url("/meanStarter/assets/fonts/ufonts.com_futura-book.svg#futura_bkbook") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'open_sans_hebrewregular'; - src: url("/meanStarter/assets/fonts/opensanshebrew-regular.eot"); - src: url("/meanStarter/assets/fonts/opensanshebrew-regular.eot?#iefix") format("embedded-opentype"), url("/meanStarter/assets/fonts/opensanshebrew-regular.woff") format("woff"), url("/meanStarter/assets/fonts/opensanshebrew-regular.ttf") format("truetype"), url("/meanStarter/assets/fonts/opensanshebrew-regular.svg#open_sans_hebrewregular") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'open_sans_hebrewlight'; - src: url("/meanStarter/assets/fonts/opensanshebrew-light.eot"); - src: url("/meanStarter/assets/fonts/opensanshebrew-light.eot?#iefix") format("embedded-opentype"), url("/meanStarter/assets/fonts/opensanshebrew-light.woff") format("woff"), url("/meanStarter/assets/fonts/opensanshebrew-light.ttf") format("truetype"), url("/meanStarter/assets/fonts/opensanshebrew-light.svg#open_sans_hebrewlight") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'proxima_nova_rgregular'; - src: url("/meanStarter/assets/fonts/mark_simonson_-_proxima_nova_regular.eot"); - src: url("/meanStarter/assets/fonts/mark_simonson_-_proxima_nova_regular.eot?#iefix") format("embedded-opentype"), url("/meanStarter/assets/fonts/mark_simonson_-_proxima_nova_regular.woff") format("woff"), url("/meanStarter/assets/fonts/mark_simonson_-_proxima_nova_regular.ttf") format("truetype"), url("/meanStarter/assets/fonts/mark_simonson_-_proxima_nova_regular.svg#proxima_nova_rgregular") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'proxima_novalight'; - src: url("/meanStarter/assets/fonts/proximanova-light.eot"); - src: url("/meanStarter/assets/fonts/proximanova-light.eot?#iefix") format("embedded-opentype"), url("/meanStarter/assets/fonts/proximanova-light.woff") format("woff"), url("/meanStarter/assets/fonts/proximanova-light.ttf") format("truetype"), url("/meanStarter/assets/fonts/proximanova-light.svg#proxima_novalight") format("svg"); - font-weight: normal; - font-style: normal; -} -.form { - background: #ffffff; - box-shadow: 0 1px 3px 1px #003644; - margin-top: 35px; - left: 50%; - position: relative; -} - -.main-form { - width: 748px; - height: 435px; - margin-left: -374px; -} - -.main-form.register-form { - height: 622px; -} - -.login-form__left { - width: 440px; - height: 100%; - float: left; - padding: 34px 0 0 27px; -} - -.login-form__left h2, .forgot_password_form h2 { - font-size: 30px; - padding-bottom: 4px; - font-family: "futura_bkbook"; - margin: 0; - text-transform: uppercase; -} - -.login-form__left p, .forgot_password_form p { - font-size: 16px; - font-family: 'proxima_nova_rgregular'; -} - -.main-form .input-wrapper { - position: relative; - margin-bottom: 10px; -} - -.main-form .input-wrapper input { - width: 401px; - border: 1px solid #d3d3d3; - border-radius: 5px; - padding: 18px 0 18px 16px; - outline: none; - font-size: 15px; - font-family: 'proxima_nova_rgregular'; - line-height: 22px; -} - -.main-form .input-wrapper input:invalid { - box-shadow: none; -} - -.main-form .input-wrapper input:focus { - border-color: #66afe9; - outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6); -} - -.pic.email { - position: absolute; - background: url("/meanStarter/assets/img/mail_login.png") no-repeat; - width: 30px; - height: 21px; - top: 18px; - right: 28px; -} - -.pic.password { - position: absolute; - background: url("/meanStarter/assets/img/eye_password.png") no-repeat 50% 50%; - width: 40px; - height: 30px; - top: 16px; - right: 22px; - cursor: pointer; -} - -.login-form__left .icon_hide_password { - background: url("/meanStarter/assets/img/eye_password_disabled.png") no-repeat 50% 50%; - width: 40px; - height: 30px; - top: 16px; - right: 22px; -} - -.login-form__left .hide_text_password { - display: none; - position: absolute; - line-height: 38px; - width: 125px; - height: 34px; - bottom: 39px; - right: -40px; - background: #0588a0; - text-align: center; - border-radius: 5px; - font-family: "proxima_nova_rgregular"; - color: white; -} - -.login-form__left .hide_text_password:after { - content: ''; - display: block; - position: absolute; - left: 50%; - top: 100%; - border-top: 10px solid #0588a0; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - margin-left: -4px; -} - -.pic.password:hover .hide_text_password { - display: block; -} - -.icon_hide_password:hover .hide_text_password { - display: block; -} - -.error_message { - display: none; - position: absolute; - line-height: 29px; - height: auto; - bottom: 67px; - left: 0; - background: blue; - text-align: center; - border-radius: 3px; - min-width: 30px; - max-width: 150px; -} - -.error_message:after { - content: ''; - display: block; - position: absolute; - left: 50%; - top: 100%; - border-top: 10px solid blue; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - margin-left: -4px; -} - -.login-form__left .forgot_password { - margin-top: -5px; - margin-left: 8px; -} - -.login-form__left .forgot_password a { - font-size: 15px; - color: #68a80c; - text-decoration: none; - font-family: "open_sans_hebrewregular"; -} - -.login-form__left .button_login { - margin-top: 23px; -} - -.submit_button { - display: inline-block; - border: none; - cursor: pointer; - background: url("/meanStarter/assets/img/button_login.png") no-repeat 50% 50%; - width: 107px; - height: 47px; - font-size: 21px; - color: white; - font-family: "open_sans_hebrewregular"; -} - -.submit_button:hover { - background: url("/meanStarter/assets/img/button_login_hover.png") no-repeat 50% 50%; -} - -.submit_button:focus { - outline: none; -} - -.button_login p, -.button_send p, -.button_register p { - display: inline-block; - font-size: 15px; - margin-left: 15px; - font-family: "open_sans_hebrewregular"; - vertical-align: top; - padding-top: 11px; -} - -.button_send p { - margin-left: 65px; -} - -.button_register { - margin-top: 25px; -} - -.button_login a, -.button_send a, -.button_register a { - display: inline-block; - font-size: 15px; - color: #68a80c; - text-decoration: none; - margin-left: 1px; - padding-top: 11px; - vertical-align: top; - font-family: "open_sans_hebrewregular"; -} - -.login-form__center { - height: 100%; - float: left; - background: url("/meanStarter/assets/img/devide_line.png") no-repeat 50% 30%; - padding: 0 10px; -} - -.register-form .login-form__center { - margin-top: 38px; - background: url("/meanStarter/assets/img/devide_line_long.png") no-repeat 50% 0; -} - -.login-form__center p { - margin-top: 155px; - font-family: 'proxima_novalight'; - font-size: 16px; -} - -.register-form .login-form__center p { - margin-top: 227px; -} - -.login-form__right { - height: 100%; - float: left; - width: 270px; - padding-left: 26px; -} -.login-form__right .social_wrap { - width: 235px; - height: 270px; - margin-top: 36px; - padding-left: 0; - display: block; - position:relative; -} - -.register-form .login-form__right .social_wrap { - height: 483px; -} - -.login-form__right .bigger { - height: 345px; - margin-top: 35px; -} - -.login-form__right .bigger .social { - top: inherit; - -ms-transform: none; /* IE 9 */ - -webkit-transform: none; /* Chrome, Safari, Opera */ - transform: none; -} - -.login-form__right .social { - margin: 0; - padding-left: 0; - display: block; - list-style:none; - position:absolute; - top:50%; - left:0; - right:0; - -ms-transform: translate(0, -50%); /* IE 9 */ - -webkit-transform: translate(0, -50%); /* Chrome, Safari, Opera */ - transform: translate(0, -50%); -} - -.login-form__right .social_icon { - width: 230px; - height: 60px; - border: 1px solid #e1e1e0; - border-radius: 5px; - margin-bottom: 10px; - list-style-type: none; - vertical-align: middle; - display: inline-block; -} - -.login-form__right .social_icon:hover { - background: #f1f1f1; -} - -.login-form__right .social_icon .button { - display: block; - text-decoration: none; - padding: 22px 0 22px 60px; - line-height: 1; - color: #959595; - position: relative; -} - -.login-form__right .social_icon .button:active { - color: #959595; -} - -.login-form__right .social_icon .button span { - font-size: 15px; - font-family: 'open_sans_hebrewlight'; -} - -.login-form__right .social_icon .button span:visited { - color: #959595; -} - -.login-form__right .social_icon_linkedin .button:before { - content: ''; - position: absolute; - background: url("/meanStarter/assets/img/social_in.png") no-repeat 50% 50%; - width: 50px; - height: 47px; - top: 10px; - left: 0; -} - -.login-form__right .social_icon_facebook .button:before { - content: ''; - position: absolute; - background: url("/meanStarter/assets/img/social_fb.png") no-repeat 50% 50%; - width: 41px; - height: 40px; - top: 10px; - left: 8px; -} - -.login-form__right .social_icon_github .button:before { - content: ''; - position: absolute; - background: url("/meanStarter/assets/img/social_github.png") no-repeat 50% 50%; - width: 40px; - height: 40px; - top: 10px; - left: 8px; -} - -.login-form__right .social_icon_twitter .button:before { - content: ''; - position: absolute; - background: url("/meanStarter/assets/img/social_tw.png") no-repeat 50% 50%; - width: 40px; - height: 41px; - top: 10px; - left: 8px; -} - -.login-form__right .social_icon_google .button:before { - content: ''; - position: absolute; - background: url("/meanStarter/assets/img/social_g+.png") no-repeat 50% 50%; - width: 40px; - height: 41px; - top: 10px; - left: 8px; -} - -.woman_ninja_bottom { - position: absolute; - left: 21%; - pointer-events: none; -} - -.woman_ninja_left { - position: absolute; - top: 75px; - left: -410px; - pointer-events: none; -} - -.registration_form { - width: 440px; - float: left; - margin-right: 10px; -} - -.forgot_password_form { - padding: 34px 27px; - min-height: 280px; - height: auto; - width: 465px; - margin-left: -232px; -} diff --git a/packages/custom/meanStarter/public/assets/css/starter.css b/packages/custom/meanStarter/public/assets/css/starter.css deleted file mode 100644 index 2b18075737..0000000000 --- a/packages/custom/meanStarter/public/assets/css/starter.css +++ /dev/null @@ -1,261 +0,0 @@ -@font-face { - font-family: 'futura_bkbook'; - src: url("/meanStarter/assets/fonts/ufonts.com_futura-book.eot"); - src: url("/meanStarter/assets/fonts/ufonts.com_futura-book.eot?#iefix") format("embedded-opentype"), url("/meanStarter/assets/fonts/ufonts.com_futura-book.woff") format("woff"), url("/meanStarter/assets/fonts/ufonts.com_futura-book.ttf") format("truetype"), url("/meanStarter/assets/fonts/ufonts.com_futura-book.svg#futura_bkbook") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'open_sans_hebrewregular'; - src: url("/meanStarter/assets/fonts/opensanshebrew-regular.eot"); - src: url("/meanStarter/assets/fonts/opensanshebrew-regular.eot?#iefix") format("embedded-opentype"), url("/meanStarter/assets/fonts/opensanshebrew-regular.woff") format("woff"), url("/meanStarter/assets/fonts/opensanshebrew-regular.ttf") format("truetype"), url("/meanStarter/assets/fonts/opensanshebrew-regular.svg#open_sans_hebrewregular") format("svg"); - font-weight: bold; - font-style: normal; -} - -.welcome.container-fluid { - margin:18px; - padding-top:10px; - background-color:#fff; - color:#525252; -} - -.welcome .info, .welcome .featured { - float:left; -} -.welcome .row { - margin-top:10px; - background-color:#f3f3f3; -} -.welcome .first{ - padding:0; - margin-bottom:30px; - font-size:22px; - background-color:#fff; -} - -.welcome { - padding-bottom: 4px; - /*font-family: "futura_bkbook";*/ - font-family:"open_sans_hebrewregular"; - font-size:16px; - margin: 0; - margin:10px; -} - -.welcome .info { - margin-top:10px; - background-color: #fff; - padding-bottom: 10px; -} - -.welcome h1 { - font-size:30px; - text-transform: uppercase; - color:#0e0e0e; -} - -.welcome h2 { - margin-top: 27px; - font-size:30px; - font-weight:300; -} - -.featured-packages h2{ - margin-top:0; -} - -.welcome h3 { - font-size:17px; -/* font-weight:300; */ - text-transform: uppercase; - color: #0e0e0e; -} - -.docs h3 { - padding:10px; -} - - -.welcome .packages, .welcome .community, .welcome .featured-packages { - clear:both; - margin-top:80px; - height:100%; - border-top:3px solid #f3f3f3; -} - -.welcome .packages h3 { - margin:20px 0 20px 0; -} - -/* Docs */ -.welcome .info ul { - padding-left:20px; - width:220px; - list-style:none; -} - -.welcome .info ul li { - width:100px; - font-size:14px; -} - -.welcome .info ul li:before { - content: '\003E'; - margin: 0 0.6em 0 -1em; -} - -.welcome p { - font-size: 12px; - margin-top: 10px; - margin-left:53px; -} -.welcome .info .docs { - height:100%; -} -.welcome .info .docs p{ - font-size:14px; -} - -.docs-desc { - float:left; -} - -.docs-link { - margin: 16px 0 0 0; - float:left; - width:120px; -} - -.docs-link.first { - margin: 16px 0 0 53px; -} - -.morelink { - margin: 16px 0 6px 0; - clear:both; - float:right; -} - -.docs .morelink { - margin-top:30px; -} - -.morelink :before { - text-transform: uppercase; - content: '\003E'; - margin: 0 0.5em 0 -1em; -} - -/* Packages */ - -.packages .package{ - float:left; - width:200px; - margin-right:40px; -} - -/* Packages */ -.packages .package h4, .community .package h4{ - text-transform: uppercase; - margin-left:53px; - color:#176583; - font-size:16px; -} - -.packages .package p { - margin-left:53px; -} - -/* Community */ -.welcome-sprite{ - float:left; - width:53px; - height:53px; -} -.welcome-sprite{ - background-image: url("/meanStarter/assets/img/welcome_sprite.png"); - background-repeat: no-repeat; - display: block; -} -.docs .welcome-sprite { - background-position: 0 -7px ; -} - -.packages .welcome-sprite { - background-position: -60px 0; -} - -.community .welcome-sprite { - background-position: -120px 0; -} - -.community .package { - float:left; - margin-bottom:10px; -} -.community .package p{ - width:190px; - margin: 0 0 0 10px; -} -.community .package h4{ - margin: 0 0 0 10px; -} - - -.socialsprite { - background-image: url("/meanStarter/assets/img/welcome_social.png"); - background-repeat: no-repeat; - display: block; - float:left; -} - -.sprite-facebook { - width: 39px; - height: 42px; - background-position: -5px -5px; -} - -.sprite-github { - width: 40px; - height: 44px; - background-position: -54px -5px; -} - -.sprite-irc { - width: 38px; - height: 42px; - background-position: -104px -5px; -} - -.sprite-stackoverflow { - width: 40px; - height: 44px; - background-position: -152px -5px; -} - -/* Featured Pic */ -.featuredpic img{ - width:510px; -} - -.welcome .community h3{ - margin-bottom:40px; -} - -/* Featured Sites */ - - -.featured-sites h4{ - font-size:24px; -} - -.featured-sites h4 span{ - font-size:14px; -} - -.featured-sites p, .featured-packages p { - font-size:14px; - margin-left:0; -} diff --git a/packages/custom/meanStarter/public/index.js b/packages/custom/meanStarter/public/index.js index 0fddc2bf41..33b20d7fed 100644 --- a/packages/custom/meanStarter/public/index.js +++ b/packages/custom/meanStarter/public/index.js @@ -1,5 +1,3 @@ 'use strict' import './assets/css/common.css' -import './assets/css/loginForms.css' -import './assets/css/starter.css' diff --git a/packages/custom/meanStarter/public/views/system/header.html b/packages/custom/meanStarter/public/views/system/header.html index 97a15a8849..5b009aeed3 100644 --- a/packages/custom/meanStarter/public/views/system/header.html +++ b/packages/custom/meanStarter/public/views/system/header.html @@ -1,4 +1,5 @@
+

 MEAN

{{item.title}} diff --git a/packages/custom/meanStarter/public/views/system/index.html b/packages/custom/meanStarter/public/views/system/index.html index 4240a30bc4..14dbdc0f21 100644 --- a/packages/custom/meanStarter/public/views/system/index.html +++ b/packages/custom/meanStarter/public/views/system/index.html @@ -1,7 +1,8 @@

- With MEAN framework, you can create members, articles, or add more features with packages from the community. + With MEAN framework, you can create members, articles, or add more features with packages from the + community.