diff --git a/config.xml b/config.xml index a453b0c..e9b8b0f 100644 --- a/config.xml +++ b/config.xml @@ -1,48 +1,49 @@ - + - CarsInCommon - + CarsInCommon + CarSharing app, for collective use. - + ArnauCode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable-land-hdpi/screen.png b/res/drawable-land-hdpi/screen.png index 66b12fe..09633f7 100644 Binary files a/res/drawable-land-hdpi/screen.png and b/res/drawable-land-hdpi/screen.png differ diff --git a/res/drawable-land-ldpi/screen.png b/res/drawable-land-ldpi/screen.png index 7dceec7..c581782 100644 Binary files a/res/drawable-land-ldpi/screen.png and b/res/drawable-land-ldpi/screen.png differ diff --git a/res/drawable-land-mdpi/screen.png b/res/drawable-land-mdpi/screen.png index 0dc2ba7..d4d6dc8 100644 Binary files a/res/drawable-land-mdpi/screen.png and b/res/drawable-land-mdpi/screen.png differ diff --git a/res/drawable-land-xhdpi/screen.png b/res/drawable-land-xhdpi/screen.png index 39ae00c..87c7a56 100644 Binary files a/res/drawable-land-xhdpi/screen.png and b/res/drawable-land-xhdpi/screen.png differ diff --git a/res/drawable-land-xxhdpi/screen.png b/res/drawable-land-xxhdpi/screen.png index 3f591b1..90117fd 100644 Binary files a/res/drawable-land-xxhdpi/screen.png and b/res/drawable-land-xxhdpi/screen.png differ diff --git a/res/drawable-land-xxxhdpi/screen.png b/res/drawable-land-xxxhdpi/screen.png index 253e6f1..22f779d 100644 Binary files a/res/drawable-land-xxxhdpi/screen.png and b/res/drawable-land-xxxhdpi/screen.png differ diff --git a/res/drawable-port-hdpi/screen.png b/res/drawable-port-hdpi/screen.png index e0dbb62..a32a6a0 100644 Binary files a/res/drawable-port-hdpi/screen.png and b/res/drawable-port-hdpi/screen.png differ diff --git a/res/drawable-port-ldpi/screen.png b/res/drawable-port-ldpi/screen.png index 4c42608..0ff9f2f 100644 Binary files a/res/drawable-port-ldpi/screen.png and b/res/drawable-port-ldpi/screen.png differ diff --git a/res/drawable-port-mdpi/screen.png b/res/drawable-port-mdpi/screen.png index 27271d8..2397f52 100644 Binary files a/res/drawable-port-mdpi/screen.png and b/res/drawable-port-mdpi/screen.png differ diff --git a/res/drawable-port-xhdpi/screen.png b/res/drawable-port-xhdpi/screen.png index 7126cb5..50bd01e 100644 Binary files a/res/drawable-port-xhdpi/screen.png and b/res/drawable-port-xhdpi/screen.png differ diff --git a/res/drawable-port-xxhdpi/screen.png b/res/drawable-port-xxhdpi/screen.png index 1dd0773..0d08d80 100644 Binary files a/res/drawable-port-xxhdpi/screen.png and b/res/drawable-port-xxhdpi/screen.png differ diff --git a/res/drawable-port-xxxhdpi/screen.png b/res/drawable-port-xxxhdpi/screen.png index ca36dc7..73214c3 100644 Binary files a/res/drawable-port-xxxhdpi/screen.png and b/res/drawable-port-xxxhdpi/screen.png differ diff --git a/res/mipmap-hdpi/icon.png b/res/mipmap-hdpi/icon.png index b910093..48cf44c 100644 Binary files a/res/mipmap-hdpi/icon.png and b/res/mipmap-hdpi/icon.png differ diff --git a/res/mipmap-ldpi/icon.png b/res/mipmap-ldpi/icon.png index 16cd5db..85b022d 100644 Binary files a/res/mipmap-ldpi/icon.png and b/res/mipmap-ldpi/icon.png differ diff --git a/res/mipmap-mdpi/icon.png b/res/mipmap-mdpi/icon.png index 64a6cbc..b40090a 100644 Binary files a/res/mipmap-mdpi/icon.png and b/res/mipmap-mdpi/icon.png differ diff --git a/res/mipmap-xhdpi/icon.png b/res/mipmap-xhdpi/icon.png index 1605f69..0210c55 100644 Binary files a/res/mipmap-xhdpi/icon.png and b/res/mipmap-xhdpi/icon.png differ diff --git a/res/mipmap-xxhdpi/icon.png b/res/mipmap-xxhdpi/icon.png index 56fb29e..da8dc5a 100644 Binary files a/res/mipmap-xxhdpi/icon.png and b/res/mipmap-xxhdpi/icon.png differ diff --git a/res/mipmap-xxxhdpi/icon.png b/res/mipmap-xxxhdpi/icon.png index e4a9152..5c1a544 100644 Binary files a/res/mipmap-xxxhdpi/icon.png and b/res/mipmap-xxxhdpi/icon.png differ diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index b910093..48cf44c 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 16cd5db..85b022d 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 64a6cbc..b40090a 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index 1605f69..0210c55 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index 56fb29e..da8dc5a 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index e4a9152..5c1a544 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 66b12fe..09633f7 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index 7dceec7..c581782 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 0dc2ba7..d4d6dc8 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index 39ae00c..87c7a56 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index 3f591b1..90117fd 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index 253e6f1..22f779d 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index e0dbb62..a32a6a0 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index 4c42608..0ff9f2f 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index 27271d8..2397f52 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index 7126cb5..50bd01e 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index 1dd0773..0d08d80 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index ca36dc7..73214c3 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/icon.png b/resources/icon.png index bee7766..182add3 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/splash.png b/resources/splash.png index cbddba0..8015053 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/www/css/style.css b/www/css/style.css index 1e5b07a..8164b0e 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -8,6 +8,62 @@ .o_floatRight{ float: right; } +.o_loginBackground{ + height: 100%!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; + + padding-top: 30%; +} +@font-face { + font-family: 'Thinking_of_Betty'; + src: url('../fonts/Thinking_of_Betty.ttf'); +} +.o_loginBackground h1{ + color: #ffffff!important; + margin: 10px; + font-family: 'Thinking_of_Betty' + /*font-weight: bold;*/ +} +.o_loginDivForm{ + /*background: rgba(255, 255, 255, 0.2);*/ +} +.o_loginInput{ + background: rgba(255, 255, 255, 0.2); + padding:10px; + color: #ffffff; + border: 0px; + width: 80%; + font-size: 120%; +} +.o_loginInput::-webkit-input-placeholder{ + color: rgba(255, 255, 255, 0.6); +} +.o_loginButton{ + color: rgba(0, 0, 0, 0.8); + font-weight: bold; + margin: 10%; +} +.o_transparentBackground{ + background: rgba(255, 255, 255, 0); + color: #ffffff; +} .o_userProfileBackground{ min-height: 30%!important; width: 100%; diff --git a/www/fonts/Pacifico.ttf b/www/fonts/Pacifico.ttf new file mode 100644 index 0000000..6d47cdc Binary files /dev/null and b/www/fonts/Pacifico.ttf differ diff --git a/www/fonts/Thinking_of_Betty.ttf b/www/fonts/Thinking_of_Betty.ttf new file mode 100644 index 0000000..e0c0bb7 Binary files /dev/null and b/www/fonts/Thinking_of_Betty.ttf differ diff --git a/www/img/userProfileBackground_old.png b/www/img/userProfileBackground_old.png deleted file mode 100644 index 3868039..0000000 Binary files a/www/img/userProfileBackground_old.png and /dev/null differ diff --git a/www/templates/login.html b/www/templates/login.html index 02856b3..6c903e5 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -1,22 +1,39 @@ - -
-
- v0.0.1 - - - - - - - - -
- {{'Signup' | translate}} - {{'Login' | translate}} +
+
+

Cars in Common

+ + v0.0.1 +

+

+ + +

+
+

+ + +

+
+

+ + {{'LOG IN' | translate}} + +

+ +
- +
diff --git a/www/templates/newTravel.html b/www/templates/newTravel.html index 4fe2a4b..c21aa33 100644 --- a/www/templates/newTravel.html +++ b/www/templates/newTravel.html @@ -6,11 +6,11 @@ - Ask for Car + Ask for Car (not yet) - Ask for Package + Ask for Package (not yet)