summaryrefslogtreecommitdiff
path: root/web-ui
diff options
context:
space:
mode:
Diffstat (limited to 'web-ui')
-rw-r--r--web-ui/app/js/account_recovery.js2
-rw-r--r--web-ui/app/js/account_recovery/page.js6
-rw-r--r--web-ui/app/scss/account_recovery/page.scss52
-rw-r--r--web-ui/config/loaders-webpack.js20
-rw-r--r--web-ui/package.json2
-rw-r--r--web-ui/webpack.config.js14
-rw-r--r--web-ui/webpack.production.config.js13
7 files changed, 71 insertions, 38 deletions
diff --git a/web-ui/app/js/account_recovery.js b/web-ui/app/js/account_recovery.js
index a48415f8..441a8936 100644
--- a/web-ui/app/js/account_recovery.js
+++ b/web-ui/app/js/account_recovery.js
@@ -3,6 +3,8 @@ import { render } from 'react-dom'
import Page from 'js/account_recovery/page'
import a11y from 'react-a11y'
+import 'font-awesome/scss/font-awesome.scss'
+
if(process.env.NODE_ENV === 'development') a11y(React);
render(
diff --git a/web-ui/app/js/account_recovery/page.js b/web-ui/app/js/account_recovery/page.js
index 4dda8fff..5d4f2c36 100644
--- a/web-ui/app/js/account_recovery/page.js
+++ b/web-ui/app/js/account_recovery/page.js
@@ -14,6 +14,12 @@ const Page = () => (
<label className="animated-label" htmlFor="email">Digite seu e-mail de recuperação</label>
</div>
<button>Adicionar e-mail</button>
+ <div>
+ <a href="/">
+ <i className="fa fa-angle-left" aria-hidden="true"></i>
+ <span>Voltar</span>
+ </a>
+ </div>
</form>
</div>
);
diff --git a/web-ui/app/scss/account_recovery/page.scss b/web-ui/app/scss/account_recovery/page.scss
index 9fe85d5c..8bba1b5a 100644
--- a/web-ui/app/scss/account_recovery/page.scss
+++ b/web-ui/app/scss/account_recovery/page.scss
@@ -29,6 +29,20 @@ p {
margin-after: 0.5em;
}
+a {
+ text-decoration: none;
+ color: $dark_blue;
+ font-style: italic;
+
+ .fa {
+ font-size: 1.6em;
+ position: relative;
+ top: 3px;
+ margin-right: 0.3em;
+ }
+
+}
+
.field-group {
position:relative;
margin: 1.5em 0;
@@ -83,6 +97,7 @@ button {
border-radius: 2px;
font-weight: 300;
width: 100%;
+ margin-bottom: 1em;
}
.container {
@@ -110,10 +125,17 @@ img {
font-size: 1.3em;
}
- .field-group, button {
- width: 70%;
- -webkit-align-self: center;
- align-self: center;
+ form {
+ display: flex;
+ -webkit-display: flex;
+ -webkit-flex-direction: column;
+ flex-direction: column;
+
+ .field-group, button, div {
+ width: 70%;
+ -webkit-align-self: center;
+ align-self: center;
+ }
}
}
@@ -130,21 +152,21 @@ img {
form {
margin-left: 2.5em;
- }
- img {
- width: 300px;
- }
+ .field-group, button, div {
+ width: 300px;
+ -webkit-align-self: flex-start;
+ align-self: flex-start;
+ }
- .field-group, button {
- width: 300px;
- -webkit-align-self: center;
- align-self: center;
+ .field-group {
+ margin-top: 3em;
+ font-size: 1em;
+ }
}
- .field-group {
- margin-top: 3em;
- font-size: 1em;
+ img {
+ width: 300px;
}
button {
diff --git a/web-ui/config/loaders-webpack.js b/web-ui/config/loaders-webpack.js
new file mode 100644
index 00000000..21e9a572
--- /dev/null
+++ b/web-ui/config/loaders-webpack.js
@@ -0,0 +1,20 @@
+module.exports = [
+ {
+ test: /\.js$/,
+ exclude: /(node_modules|bower_components)/,
+ loader: 'babel',
+ query: { presets: ['es2015', 'react']}
+ },
+ {
+ test: /\.scss|css$/,
+ loader: "style-loader!css-loader!sass-loader"
+ },
+ {
+ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+ loader: "url-loader?limit=10000&mimetype=application/font-woff"
+ },
+ {
+ test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+ loader: "file-loader"
+ }
+]
diff --git a/web-ui/package.json b/web-ui/package.json
index cd9e1286..6f9b03d4 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -17,6 +17,7 @@
"dompurify": "^0.8.4",
"enzyme": "^2.7.1",
"expect": "^1.20.2",
+ "file-loader": "^0.10.0",
"font-awesome": "^4.7.0",
"handlebars": "^4.0.5",
"he": "^1.1.0",
@@ -56,6 +57,7 @@
"sass-loader": "^4.1.1",
"style-loader": "^0.13.1",
"typeahead.js": "^0.11.1",
+ "url-loader": "^0.5.7",
"utf8": "^2.1.2",
"watch": "0.19.1",
"webpack": "^1.14.0"
diff --git a/web-ui/webpack.config.js b/web-ui/webpack.config.js
index c59ebb63..5886154a 100644
--- a/web-ui/webpack.config.js
+++ b/web-ui/webpack.config.js
@@ -1,6 +1,7 @@
var path = require('path');
var webpack = require('webpack');
var copyWebpack = require('./config/copy-webpack');
+var loaders = require('./config/loaders-webpack');
var aliases = require('./config/alias-webpack');
module.exports = {
@@ -20,18 +21,7 @@ module.exports = {
extensions: ['', '.js']
},
module: {
- loaders: [
- {
- test: /\.js$/,
- exclude: /(node_modules|bower_components)/,
- loader: 'babel',
- query: { presets: ['es2015', 'react']}
- },
- {
- test: /\.scss|css$/,
- loader: "style-loader!css-loader!sass-loader"
- }
- ]
+ loaders: loaders
},
plugins: [copyWebpack, new webpack.DefinePlugin({
'process.env': {
diff --git a/web-ui/webpack.production.config.js b/web-ui/webpack.production.config.js
index bc10b90e..cf8ab8ff 100644
--- a/web-ui/webpack.production.config.js
+++ b/web-ui/webpack.production.config.js
@@ -1,6 +1,7 @@
var path = require('path');
var webpack = require('webpack');
var copyWebpack = require('./config/copy-webpack');
+var loaders = require('./config/loaders-webpack');
var aliases = require('./config/alias-webpack');
module.exports = {
@@ -20,17 +21,7 @@ module.exports = {
extensions: ['', '.js']
},
module: {
- loaders: [
- {
- test: /\.js$/,
- loader: 'babel',
- query: { presets: ['es2015', 'react']}
- },
- {
- test: /\.scss|css$/,
- loader: "style-loader!css-loader!sass-loader"
- }
- ]
+ loaders: loaders
},
plugins: [
new webpack.optimize.UglifyJsPlugin(),
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 05:38:52 +0000