diff --git a/webapp/app.js b/webapp/app.js index 56016b0..b52cf35 100644 --- a/webapp/app.js +++ b/webapp/app.js @@ -12,7 +12,7 @@ angular.module('app', [ 'app.login', 'app.main', 'app.newmodel', - 'app.profile' + 'app.user' ]). config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) { $locationProvider.hashPrefix('!'); diff --git a/webapp/css/own.css b/webapp/css/own.css index e3b46ad..614ac60 100644 --- a/webapp/css/own.css +++ b/webapp/css/own.css @@ -1,5 +1,40 @@ .o_nav { - background: #ffffff!important; - color: #000000!important; - /*border-bottom: 2px solid #4DD0E1!important;*/ + background: #ffffff !important; + color: #000000 !important; + /*border-bottom: 2px solid #4DD0E1!important;*/ +} + +body { + background: #f5f8fa; +} + +.o_userProfileBackground { + min-height: 30% !important; + width: 100%; + height: 150px; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; + background-position: center; + background-image: url('../img/background01.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: -100px; + margin-left: 25%; + background: #ffffff; + width: 50%; + border: 4px #ffffff solid; + border-radius: 150px; + -webkit-border-radius: 150px; + -moz-border-radius: 150px; } diff --git a/webapp/img/background01.png b/webapp/img/background01.png new file mode 100755 index 0000000..2ae41b5 Binary files /dev/null and b/webapp/img/background01.png differ diff --git a/webapp/index.html b/webapp/index.html index ed820ff..51be385 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -24,7 +24,7 @@
-



+
@@ -61,7 +61,7 @@ Works for both browser and electron with the same code --> - +