From b940800b9f8fd803b89fa328a5082c5d38b67fb0 Mon Sep 17 00:00:00 2001 From: arnaucode Date: Thu, 26 Jan 2017 21:07:04 +0100 Subject: [PATCH] material design with purple style started --- www/css/style.css | 89 +++++++++++++++++++++++++++++-- www/templates/main.html | 20 +++++-- www/templates/menu.html | 22 ++++---- www/templates/newPublication.html | 6 +-- www/templates/offerCar.html | 6 +-- www/templates/travels.html | 9 ++-- www/templates/user.html | 5 +- www/templates/users.html | 4 +- 8 files changed, 129 insertions(+), 32 deletions(-) diff --git a/www/css/style.css b/www/css/style.css index 6fec15d..539fbd6 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -22,8 +22,8 @@ a part podem posar ColorDark o ColorLight per fer un color més fosc o més clar */ .o_bSidenav{ - background: #333b42!important; - color: #c6ccd2!important; + background: #ffffff!important; + color: #616161!important; } .o_fWhiteLight{ color: #c6ccd2!important; @@ -85,11 +85,94 @@ background: #FF7043!important; color: #ffffff!important; } -.o_bPurple{ +/*.o_bPurple{ background: #9575CD!important; color: #ffffff!important; } .o_bPurpleDark{ background: #512DA8!important; color: #ffffff!important; +}*/ + +.o_purple50{ + background: #EDE7F6!important; + color: #000000!important; +} +.o_purple100{ + background: #D1C4E9!important; + color: #000000!important; +} +.o_purple200{ + background: #B39DDB!important; + color: #000000!important; +} +.o_purple300{ + background: #9575CD!important; + color: #ffffff!important; +} +.o_purple400{ + background: #7E57C2!important; + color: #ffffff!important; +} +.o_purple500{ + background: #673AB7!important; + color: #ffffff!important; +} +.o_purple600{ + background: #5E35B1!important; + color: #ffffff!important; +} +.o_purple700{ + background: #512DA8!important; + color: #ffffff!important; +} +.o_purple800{ + background: #4527A0!important; + color: #ffffff!important; +} +.o_purple900{ + background: #311B92!important; + color: #ffffff!important; +} + + +.o_purpleG000to200{ + background: -moz-linear-gradient(0deg, #ffffff 0%, #D1C4E9 100%); /* ff3.6+ */ + background: -webkit-gradient(linear, left top, right top, color-stop(0%, #ffffff), color-stop(100%, #D1C4E9)); /* safari4+,chrome */ + background: -webkit-linear-gradient(0deg, #ffffff 0%, #D1C4E9 100%); /* safari5.1+,chrome10+ */ + background: -o-linear-gradient(0deg, #ffffff 0%, #D1C4E9 100%); /* opera 11.10+ */ + background: -ms-linear-gradient(0deg, #ffffff 0%, #D1C4E9 100%); /* ie10+ */ + background: linear-gradient(90deg, #ffffff 0%, #D1C4E9 100%); /* w3c */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#D1C4E9',GradientType=1 ); /* ie6-9 */ +} +.o_purpleG500to300{ + background: -moz-linear-gradient(219deg, #9575CD 0%, #673AB7 100%); /* ff3.6+ */ + background: -webkit-gradient(linear, left bottom, right top, color-stop(0%, #673AB7), color-stop(100%, #9575CD)); /* safari4+,chrome */ + background: -webkit-linear-gradient(219deg, #9575CD 0%, #673AB7 100%); /* safari5.1+,chrome10+ */ + background: -o-linear-gradient(219deg, #9575CD 0%, #673AB7 100%); /* opera 11.10+ */ + background: -ms-linear-gradient(219deg, #9575CD 0%, #673AB7 100%); /* ie10+ */ + background: linear-gradient(231deg, #9575CD 0%, #673AB7 100%); /* w3c */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#673AB7', endColorstr='#9575CD',GradientType=1 ); /* ie6-9 */ + color: #ffffff!important; +} +.o_purpleG300to500{ + background: -moz-linear-gradient(42deg, #9575CD 0%, #673AB7 100%); /* ff3.6+ */ + background: -webkit-gradient(linear, left bottom, right top, color-stop(0%, #9575CD), color-stop(100%, #673AB7)); /* safari4+,chrome */ + background: -webkit-linear-gradient(42deg, #9575CD 0%, #673AB7 100%); /* safari5.1+,chrome10+ */ + background: -o-linear-gradient(42deg, #9575CD 0%, #673AB7 100%); /* opera 11.10+ */ + background: -ms-linear-gradient(42deg, #9575CD 0%, #673AB7 100%); /* ie10+ */ + background: linear-gradient(48deg, #9575CD 0%, #673AB7 100%); /* w3c */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9575CD', endColorstr='#673AB7',GradientType=1 ); /* ie6-9 */ + color: #ffffff!important; +} + + +.o_text_purple400{ + color: #7E57C2!important; +} +.o_text_purple500{ + color: #673AB7!important; +} +.o_text_purple600{ + color: #5E35B1!important; } diff --git a/www/templates/main.html b/www/templates/main.html index 35b90f3..be282e6 100644 --- a/www/templates/main.html +++ b/www/templates/main.html @@ -1,18 +1,30 @@ - + + + {{storageuser.username}} profile + + + + New publication + + Travels - + Users - + + + Notifications + + Settings - + Help diff --git a/www/templates/menu.html b/www/templates/menu.html index 2b80197..f3904ec 100644 --- a/www/templates/menu.html +++ b/www/templates/menu.html @@ -1,11 +1,11 @@ - - + + - @@ -27,31 +27,31 @@ -

{{'Menu' | translate }}

+

{{'Menu' | translate }}

 - + {{'Main' | translate }} - + {{storageuser.username}} - + {{'Travels' | translate }} - + {{'Users' | translate }} - + {{'Notifications' | translate }} {{userdata.notifications.length}} - + {{'Settings' | translate }} - + {{'Help' | translate }} diff --git a/www/templates/newPublication.html b/www/templates/newPublication.html index c1df01a..c8de767 100644 --- a/www/templates/newPublication.html +++ b/www/templates/newPublication.html @@ -1,14 +1,14 @@ - + Offer Car - + Ask for Car - + Ask for Package diff --git a/www/templates/offerCar.html b/www/templates/offerCar.html index 93cd9c8..89f819d 100644 --- a/www/templates/offerCar.html +++ b/www/templates/offerCar.html @@ -2,7 +2,7 @@
@@ -50,9 +50,9 @@

- +

diff --git a/www/templates/travels.html b/www/templates/travels.html index c223739..f138196 100644 --- a/www/templates/travels.html +++ b/www/templates/travels.html @@ -23,12 +23,13 @@ {{'Pull_from_top_to_refresh' | translate}} - + -

{{travel.title}}

+

{{travel.title}}

-
{{travel.date | date:"dd/MM"}}
-
{{travel.date | date:"HH:mm"}}h
+
{{travel.date | date:"dd/MM"}}
+
{{travel.date | date:"HH:mm"}}h

diff --git a/www/templates/user.html b/www/templates/user.html index 978c44e..f82098e 100644 --- a/www/templates/user.html +++ b/www/templates/user.html @@ -34,13 +34,14 @@

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

{{travel.title}}
-
{{travel.date | date:"dd/MM/yyyy HH:mm a"}}
+
{{travel.date | date:"HH:mm a"}}
+
{{travel.date | date:"dd/MM/yyyy"}}

diff --git a/www/templates/users.html b/www/templates/users.html index 6ae11f5..e9d9145 100644 --- a/www/templates/users.html +++ b/www/templates/users.html @@ -12,9 +12,9 @@
- + -

{{user.username}}

+

{{user.username}}

{{user.description}}