diff --git a/www/css/style.css b/www/css/style.css index 539fbd6..fa65cc3 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -8,6 +8,40 @@ .o_floatRight{ float: right; } +.o_userProfileBackground{ + min-height: 30%!important; + width: 100%; + min-height: auto; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; + background-position: center; + background-image: url('../img/userProfileBackground.png'); + text-align: center; + /*color: white;*/ + + /* Create the parallax scrolling effect */ + background-attachment: fixed; + background-position: center; + background-repeat: no-repeat; + background-size: cover; + + color: #ffffff; +} +.o_userImgCircular { + margin-top: 5%; + background: #ffffff; + width: 40%; + border: 4px #ffffff solid; + border-radius: 150px; + -webkit-border-radius: 150px; + -moz-border-radius: 150px; + /*background: url(http://link-to-your/image.jpg) no-repeat;*/ +} +.o_userImgCircular p{ + color: #ffffff!important; +} /* SISTEMA DE COLORS diff --git a/www/img/faircoinpublickey_sample.png b/www/img/faircoinpublickey_sample.png new file mode 100644 index 0000000..8704a8b Binary files /dev/null and b/www/img/faircoinpublickey_sample.png differ diff --git a/www/img/foucault.jpg b/www/img/foucault.jpg new file mode 100644 index 0000000..8675490 Binary files /dev/null and b/www/img/foucault.jpg differ diff --git a/www/img/header.png b/www/img/header.png new file mode 100644 index 0000000..b52e9a0 Binary files /dev/null and b/www/img/header.png differ diff --git a/www/img/header_background.png b/www/img/header_background.png new file mode 100644 index 0000000..2491785 Binary files /dev/null and b/www/img/header_background.png differ diff --git a/www/img/userProfileBackground.png b/www/img/userProfileBackground.png new file mode 100644 index 0000000..2ae41b5 Binary files /dev/null and b/www/img/userProfileBackground.png differ diff --git a/www/img/userProfileBackground_old.png b/www/img/userProfileBackground_old.png new file mode 100644 index 0000000..3868039 Binary files /dev/null and b/www/img/userProfileBackground_old.png differ diff --git a/www/js/translations.js b/www/js/translations.js index b32010d..faaaa11 100644 --- a/www/js/translations.js +++ b/www/js/translations.js @@ -13,7 +13,7 @@ var translations = { "Login": "Login", "Username": "Username", "Password": "Password", - "Mail": "Mail", + "Email": "Email", "Phone": "Phone", "Telegram": "Telegram", "Avatar": "Avatar", diff --git a/www/templates/login.html b/www/templates/login.html index 7f22e2d..f441515 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -1,24 +1,20 @@ - -

{{'Login' | translate}}

- -
+
-
- - - +
+ + + + + + + + +
+ {{'Signup' | translate}} + {{'Login' | translate}} +
diff --git a/www/templates/signup.html b/www/templates/signup.html index 59e6b5e..c0e8f9c 100644 --- a/www/templates/signup.html +++ b/www/templates/signup.html @@ -1,44 +1,37 @@

{{'Signup' | translate }}

-
-
-
- - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ {{'Cancel' | translate}} + {{'Signup' | translate}} +
- diff --git a/www/templates/user.html b/www/templates/user.html index f82098e..5cd60e7 100644 --- a/www/templates/user.html +++ b/www/templates/user.html @@ -1,12 +1,14 @@ -
- -

{{user.username}}

+
+ +

{{user.username}}

+

{{user.description}}

+

{{user.email}}

-
-

{{user.description}}

-

{{user.mail}}

+
+ +

@{{user.telegram}} @@ -32,6 +34,9 @@ -->

+
+ +
{{'current_publications_of' | translate}} {{user.username}}:
{{user.travels.length}} {{'publications' | translate}}