From c4e27d07b1bdd4f6b63611dc2325f61ae671b2e0 Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Fri, 27 Nov 2020 11:59:32 +0100 Subject: [PATCH] changes on style for MD --- src/app/pages/agenda/agenda.page.html | 15 +++++- src/app/pages/agenda/agenda.page.scss | 31 ++++++++++- src/app/pages/events/events.page.html | 48 ++++++++++-------- src/app/pages/events/events.page.scss | 47 +++++++++++++++-- .../gabinete-digital.page.html | 15 +++++- .../gabinete-digital.page.scss | 30 ++++++++++- src/app/pages/login/login.page.html | 28 +++++----- src/app/pages/login/login.page.scss | 40 +++++++++++---- src/assets/images/icons-profile.svg | 23 +++++++++ src/assets/images/icons-search.svg | 19 +++++++ src/assets/images/logo-no-bg.png | Bin 0 -> 4157 bytes src/theme/variables.scss | 10 ++++ 12 files changed, 250 insertions(+), 56 deletions(-) create mode 100644 src/assets/images/icons-profile.svg create mode 100644 src/assets/images/icons-search.svg create mode 100644 src/assets/images/logo-no-bg.png diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 3c0341cc8..094f3d9b8 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -1,6 +1,19 @@ - + +
+
+ +
+ +
+ +
+
+ +
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index fdaad9ea6..33f6194f9 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -145,7 +145,7 @@ Calendar */ /* NEW CSS FOR TOGGLE BUTTON */ .toggleBox{ - margin:20px 20px 0 0; + margin:20px 12px 7px 0; } input[type="checkbox"]{ position: relative; @@ -214,7 +214,34 @@ label{ font-size: 25px; margin: 0 5px 0 25px; padding: 0; - color:#000; + color:#ffffff; float: left; } +.div-top-header{ + width: 400px; + height: 50px; + margin: 6px auto; + background-color: #0782c9; + overflow: auto; +} +.div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px +} +.div-logo{ + background: transparent; + width: 150px; + margin: 2.5px 0 2.5px 71px; + float: left; +} +.div-logo img{ + width: 100%; +} +.div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; +} + diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index af0549f35..1da806677 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -1,25 +1,29 @@ - - - - -
Presidente da República
-

GABINETE DIGITAL

- - - -
-
- - - -
-
- + +
+
+ +
+ +
+ +
+
- + + +
+
+ + + +
+
+ + + @@ -33,7 +37,7 @@ - + Combinada @@ -48,7 +52,7 @@ - +

{{customDate}}

diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 19eb3a6fb..5c7d8cb36 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -1,27 +1,64 @@ /* HEADER */ +.bg-blue{ + --background:#0782c9; + background:#0782c9; + --background-color:#0782c9; + background-color:#0782c9; + color: #ffffff; + --color: #ffffff; +} ion-toolbar{ --background: white; } .ion-text-header-top{ width: 100%; - + --background: transparent; text-align: center; padding-top: 15px; + color: #ffffff; /* border: 1px solid red; */ } + .div-top-header{ + width: 400px; + height: 50px; + margin: 6px auto; + background-color: #0782c9; + overflow: auto; + } + .div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px + } .div-logo{ - width: 60px; - /* border: 1px solid red; */ - margin-right: 20px; + background: transparent; + width: 150px; + margin: 2.5px 0 2.5px 71px; + float: left; } .div-logo img{ width: 100%; } + .div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; + } + .ion-text-header-top p{ + --background: transparent; + color: #ffffff; + } + .ion-text-right{ + --background: transparent; + color: #ffffff; + } .header-large{ font-family: Arial, Helvetica, sans-serif; font-size: 12.5pt; /* font-weight: 600; */ + background: transparent; + color: #ffffff; } .header-xsmall{ font-family: Arial, Helvetica, sans-serif; @@ -30,6 +67,7 @@ ion-toolbar{ padding-bottom: 3.5px; margin-bottom: 3.5px; border-bottom: 1px solid #ccc; + background: transparent; } .header-medium{ font-size: 12pt; @@ -46,6 +84,7 @@ ion-toolbar{ color:#000; margin-right: 25px !important; text-align: right; + /* color: #ffffff; */ } /* CONTENT */ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 3265de6ef..4270bb3c6 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -1,5 +1,18 @@ - + +
+
+ +
+ +
+ +
+
+ + Gabinete Digital diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 1b2754739..babb917b2 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -92,6 +92,34 @@ ion-label{ font-size: 25px; margin: 0 5px 0 25px; padding: 0; - color:#000; + color:#ffffff; float: left; } + + +.div-top-header{ + width: 400px; + height: 50px; + margin: 6px auto; + background-color: #0782c9; + overflow: auto; +} +.div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px +} +.div-logo{ + background: transparent; + width: 150px; + margin: 2.5px 0 2.5px 71px; + float: left; +} +.div-logo img{ + width: 100%; +} +.div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; +} diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index c2a8413de..496a9365c 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -1,21 +1,19 @@ - +
-

Inicie a sessão

-
- - - Nome de utilizador +

Inicie a sessão

+ +

Nome de utilizador

+ - - Palavra-passe - - - Iniciar - -
-
+

Palavra-passe

+ + + + + +
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index c99827774..6cc8a8996 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -2,24 +2,44 @@ margin: 0 auto; } .div-logo{ - width: 270px; + width: 200px; margin: 0 auto; padding-bottom: 15px; } .div-logo img{ width: 100%; } -form{ - /* border: 1px solid red; */ - padding: 10px; -} -.wrapper ion-label{ - font-size: 20px; -} .wrapper ion-input{ - font-size: 22px; + font-size: 18px; } .wrapper ion-button{ font-size: medium; - margin-top: 25px; + margin-top: 18px; } +ion-item{ + --background: transparent; +} +.form{ + width: 300px; + overflow: auto; + margin: 0 auto; +} +.form-label{ + margin: 15px 0 5px 0; + font-size: 15px; +} +.form-input{ + --background: #fff; + /* --color:#fff; */ + border-radius: 10px; + margin: 5px 0 5px 0; +} +.btn-ok-login{ + width: 160px !important; + height: 45px !important; + margin: 15px auto; + padding: 10px 15px; + border-radius: 22.5px; + background-color: #42b9fe; + color: #ffffff !important; + } \ No newline at end of file diff --git a/src/assets/images/icons-profile.svg b/src/assets/images/icons-profile.svg new file mode 100644 index 000000000..daf172ec5 --- /dev/null +++ b/src/assets/images/icons-profile.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + MD + + + + + + diff --git a/src/assets/images/icons-search.svg b/src/assets/images/icons-search.svg new file mode 100644 index 000000000..38b6a43ec --- /dev/null +++ b/src/assets/images/icons-search.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/logo-no-bg.png b/src/assets/images/logo-no-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..1074db181b2d88062e30da6db2fe72788abd2e67 GIT binary patch literal 4157 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 Hu0mjfaTDIr literal 0 HcmV?d00001 diff --git a/src/theme/variables.scss b/src/theme/variables.scss index dbaf6008a..c4644391e 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -392,3 +392,13 @@ background-color: #e0e9ee; color: #061b52 !important; } +.bg-blue{ + --background:#0782c9; + background:#0782c9; + --background-color:#0782c9; + background-color:#0782c9; + color: #ffffff; + --color: #ffffff; +} + +