diff --git a/site/templates/_head.php b/site/templates/_head.php index 68572e2..ec316bf 100644 --- a/site/templates/_head.php +++ b/site/templates/_head.php @@ -20,8 +20,7 @@
diff --git a/site/templates/css/fonts.css b/site/templates/css/fonts.css index 0e3af09..6d5d534 100644 --- a/site/templates/css/fonts.css +++ b/site/templates/css/fonts.css @@ -19,18 +19,46 @@ @font-face { - font-family: 'Ambarella'; - src: url('../fonts/Ambarella_Regular.eot'); /* 1 */ - src: url('../fonts/Ambarella_Regular.eot?#iefix') format('embedded-opentype'), /* 2 */ - url('../fonts/Ambarella_Regular.woff2') format('woff2'), /* 3 */ - url('../fonts/Ambarella_Regular.woff') format('woff'), /* 4 */ - url('../fonts/Ambarella_Regular.otf') format('opentype'), /* 5 */ - url('../fonts/Ambarella_Regular.ttf') format('truetype'), /* 5 */ - url('../fonts/Ambarella_Regular.svg#ambarella') format('svg'); /* 6 */ + font-family: 'Amontillado'; + src: url('../fonts/Amontillado_Regular.eot'); /* 1 */ + src: url('../fonts/Amontillado_Regular.eot?#iefix') format('embedded-opentype'), /* 2 */ + url('../fonts/Amontillado_Regular.woff2') format('woff2'), /* 3 */ + url('../fonts/Amontillado_Regular.woff') format('woff'), /* 4 */ + url('../fonts/Amontillado_Regular.otf') format('opentype'), /* 5 */ + url('../fonts/Amontillado_Regular.ttf') format('truetype'), /* 5 */ + url('../fonts/Amontillado_Regular.svg#amontillado') format('svg'); /* 6 */ font-weight: normal; font-style: normal; } +@font-face +{ + font-family: 'Amontillados'; + src: url('../fonts/Amontillados_Regular.eot'); /* 1 */ + src: url('../fonts/Amontillados_Regular.eot?#iefix') format('embedded-opentype'), /* 2 */ + url('../fonts/Amontillados_Regular.woff2') format('woff2'), /* 3 */ + url('../fonts/Amontillados_Regular.woff') format('woff'), /* 4 */ + url('../fonts/Amontillados_Regular.otf') format('opentype'), /* 5 */ + url('../fonts/Amontillados_Regular.ttf') format('truetype'), /* 5 */ + url('../fonts/Amontillados_Regular.svg#amontillados') format('svg'); /* 6 */ + font-weight: normal; + font-style: normal; +} + +@font-face +{ + font-family: 'HelveticaNeue'; + src: url('../fonts/HelveticaNeue_Light.eot'); /* 1 */ + src: url('../fonts/HelveticaNeue_Light.eot?#iefix') format('embedded-opentype'), /* 2 */ + url('../fonts/HelveticaNeue_Light.woff2') format('woff2'), /* 3 */ + url('../fonts/HelveticaNeue_Light.woff') format('woff'), /* 4 */ + url('../fonts/HelveticaNeue_Light.otf') format('opentype'), /* 5 */ + url('../fonts/HelveticaNeue_Light.ttf') format('truetype'), /* 5 */ + url('../fonts/HelveticaNeue_Light.svg#amontillados') format('svg'); /* 6 */ + font-weight: lighter; + font-style: normal; +} + @font-face { font-family: 'DejaVu Sans'; diff --git a/site/templates/css/style.css b/site/templates/css/style.css index 80e910a..8ca83c1 100644 --- a/site/templates/css/style.css +++ b/site/templates/css/style.css @@ -7,10 +7,12 @@ { font-size: 16px; - --color_principal: 255, 255, 255; - --color_realce: 43, 44, 38; - --color-pe: 43, 44, 38; - --texto_realce: 189, 186, 178; + --color_fondo: 255, 255, 255; + --color_titulos: 0, 160, 153; + --color_texto: 90, 90, 102; + --color_fondo_realce: 42, 43, 46; + --color_realce: 255, 255, 255; + --color_enlaces: 194, 202, 232; } body @@ -22,57 +24,48 @@ body margin: 0; - color: rgb(var(--color_realce)); + color: rgb(var(--color_texto)); font-family: 'DejaVu Sans', sans-serif; font-size: 1rem; - background-color: rgb(var(--color_principal)); + background-color: rgb(var(--color_fondo)); } h1, h2, h3, h4, h5, h6 { margin-top: 0; + + font-family: 'HelveticaNeue', sans-serif; } h1 { - font-family: 'Ambarella', cursive; font-size: 2rem; } h2 { font-size: 1.5rem; - font-weight: normal; - font-style: oblique; } h3 { font-size: 1.17rem; - font-weight: normal; - font-style: oblique; } h4 { font-size: 1rem; - font-weight: normal; - font-style: oblique; } h5 { font-size: .83rem; - font-weight: normal; - font-style: oblique; } h6 { font-size: .67rem; - font-weight: normal; - font-style: oblique; } p @@ -80,6 +73,10 @@ p margin: 0; } +a{ + color: rgb(var(--color_enlaces)); +} + img { width: 100%; @@ -96,6 +93,14 @@ header#cabeceira 0px 8px 10px -5px rgba(0, 0, 0, 0.2); } +div#logo +{ + width: 230px !important; + height: 169px; + + background-image: url(../images/logo.jpg); +} + header#cabeceira input#interruptor { display: block; @@ -137,7 +142,7 @@ header#cabeceira .interruptor .linna border-radius: 0.625rem; - background: rgb(var(--color_realce)); + background: rgb(var(--color_fondo_realce)); } header#cabeceira .interruptor .linna1 @@ -168,11 +173,12 @@ nav#menu padding: 0; - border-right: 2px solid rgb(var(--color_realce)); + border-right: 2px solid rgb(var(--color_fondo_realce)); - color: rgb(var(--color_realce)); + color: rgb(var(--color_titulos)); + font-family: 'HelveticaNeue', sans-serif; - background-color: rgb(var(--color_principal)); + background-color: rgb(var(--color_fondo)); transform: translateX(-100%); transition: transform 0.5s; @@ -180,7 +186,7 @@ nav#menu nav#menu a { - color: rgb(var(--color_realce)); + color: rgb(var(--color_fondo_realce)); } ul#idiomas @@ -209,7 +215,7 @@ ul#idiomas li, ul#paxinas li { list-style: none; - text-transform: uppercase; + /*text-transform: uppercase;*/ } ul#idiomas li a @@ -218,31 +224,36 @@ ul#idiomas li a padding: 0.625rem; - border: 1px solid rgb(var(--color_realce)); + border: 1px solid rgb(var(--color_fondo_realce)); text-decoration: none; } ul#idiomas li.activo a { - color: rgb(var(--color_principal)); + color: rgb(var(--color_fondo)); - background-color: rgb(var(--color_realce)); + background-color: rgb(var(--color_fondo_realce)); } nav#menu li a:focus { - outline: 2px dotted rgb(var(--color_realce)); + outline: 2px dotted rgb(var(--color_titulos)); } ul#paxinas li { - border-left: 0.625rem solid rgb(var(--color_principal)); + border-left: 0.625rem solid rgb(var(--color_fondo)); } -ul#paxinas li:hover, ul#paxinas li.activo +ul#paxinas li.activo { - border-left: 0.625rem solid rgb(var(--color_realce)); + border-left: 0.625rem solid rgb(var(--color_titulos)); +} + +ul#paxinas li:hover +{ + border-left: 0.625rem solid rgb(var(--color_fondo_realce)); } ul#paxinas li a @@ -261,7 +272,7 @@ header#cabeceira input#interruptor:checked ~ nav#menu header#cabeceira input#interruptor:focus ~ .interruptor { - outline: 2px dotted rgb(var(--color_realce)); + outline: 2px dotted rgb(var(--color_titulos)); } header#cabeceira input#interruptor:checked ~ .interruptor .linna1 @@ -281,7 +292,7 @@ header#cabeceira input#interruptor:checked ~ .interruptor .linna3 header#cabeceira input#interruptor:checked:focus ~ .interruptor { - outline: 2px dotted rgb(var(--color_realce)); + outline: 2px dotted rgb(var(--color_titulos)); } header#cabeceira div.contedor @@ -297,6 +308,11 @@ main#contido flex: 1 0 auto; } +main section +{ + padding: 20px 0; +} + section#mantemento { align-items: center; @@ -332,9 +348,9 @@ footer#pe padding: 1.25rem 0.625rem; - color: rgb(var(--texto_realce)); + color: rgb(var(--color_realce)); - background-color: rgb(var(--color-pe)); + background-color: rgb(var(--color_fondo_realce)); } footer#pe p @@ -343,11 +359,6 @@ footer#pe p text-align: center; } -footer#pe a -{ - color: rgb(var(--texto_realce)); -} - .contedor { width: 100%; @@ -388,71 +399,38 @@ footer#pe a color: #fff; } -@media (max-height: 767px) and (orientation: landscape) +@media (max-height: 768px) and (orientation: landscape) { - nav#menu - { - height: 50vh; - width: 100%; - - border-right: none; - border-bottom: 2px solid rgb(var(--color_realce)); - - transform: translateX(0%); - transform: translateY(-100%); - transition: transform 0.5s; - } - ul#idiomas { margin-top: 20px; margin-left: 70px; } - ul#paxinas + ul#paxinas li a { - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - gap: 20px; - } - - ul#paxinas li - { - border-left: 0; - } - - ul#paxinas li:hover, ul#paxinas li.activo - { - border-left: 0; + padding: 0.625rem; } +} +@media (min-width:1024px) +{ ul#paxinas li a { padding: 0; } - - ul#paxinas li:hover a, ul#paxinas li.activo a - { - text-decoration: underline; - } } @media (min-width: 1024px) { header#cabeceira div.contedor { - align-items: center; + align-items: flex-start; display: flex; flex-direction: row; justify-content: space-between; } - header#cabeceira div.contedor > * - { - width: 50%; - } - header#cabeceira input#interruptor, header#cabeceira .interruptor { @@ -489,7 +467,7 @@ footer#pe a { flex-direction: row; justify-content: flex-end; - flex-wrap: wrap; + gap: 20px; } ul#paxinas li diff --git a/site/templates/fonts/Ambarella_Regular.eot b/site/templates/fonts/Ambarella_Regular.eot deleted file mode 100644 index 24eb8c5..0000000 Binary files a/site/templates/fonts/Ambarella_Regular.eot and /dev/null differ diff --git a/site/templates/fonts/Ambarella_Regular.otf b/site/templates/fonts/Ambarella_Regular.otf deleted file mode 100644 index 7ff5a2f..0000000 Binary files a/site/templates/fonts/Ambarella_Regular.otf and /dev/null differ diff --git a/site/templates/fonts/Ambarella_Regular.svg b/site/templates/fonts/Ambarella_Regular.svg deleted file mode 100644 index 546fc67..0000000 --- a/site/templates/fonts/Ambarella_Regular.svg +++ /dev/null @@ -1,1834 +0,0 @@ - - - - -Created by FontForge 20090622 at Mon Feb 15 08:57:04 2016 - By deploy user -Copyright (c) 2016 by polem. All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/templates/fonts/Ambarella_Regular.ttf b/site/templates/fonts/Ambarella_Regular.ttf deleted file mode 100644 index d5a077a..0000000 Binary files a/site/templates/fonts/Ambarella_Regular.ttf and /dev/null differ diff --git a/site/templates/fonts/Ambarella_Regular.woff b/site/templates/fonts/Ambarella_Regular.woff deleted file mode 100644 index bb27b93..0000000 Binary files a/site/templates/fonts/Ambarella_Regular.woff and /dev/null differ diff --git a/site/templates/fonts/Ambarella_Regular.woff2 b/site/templates/fonts/Ambarella_Regular.woff2 deleted file mode 100644 index 048dcd0..0000000 Binary files a/site/templates/fonts/Ambarella_Regular.woff2 and /dev/null differ diff --git a/site/templates/fonts/Amontillado_Regular.eot b/site/templates/fonts/Amontillado_Regular.eot new file mode 100644 index 0000000..afa0cb7 Binary files /dev/null and b/site/templates/fonts/Amontillado_Regular.eot differ diff --git a/site/templates/fonts/Amontillado_Regular.otf b/site/templates/fonts/Amontillado_Regular.otf new file mode 100644 index 0000000..bd2aa24 Binary files /dev/null and b/site/templates/fonts/Amontillado_Regular.otf differ diff --git a/site/templates/fonts/Amontillado_Regular.svg b/site/templates/fonts/Amontillado_Regular.svg new file mode 100644 index 0000000..f3daa51 --- /dev/null +++ b/site/templates/fonts/Amontillado_Regular.svg @@ -0,0 +1,1810 @@ + + + + +Created by FontForge 20201107 at Tue Feb 14 12:19:12 2017 + By Unknown +FREE FOR PERSONAL USE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/site/templates/fonts/Amontillado_Regular.ttf b/site/templates/fonts/Amontillado_Regular.ttf new file mode 100644 index 0000000..ddaaddb Binary files /dev/null and b/site/templates/fonts/Amontillado_Regular.ttf differ diff --git a/site/templates/fonts/Amontillado_Regular.woff b/site/templates/fonts/Amontillado_Regular.woff new file mode 100644 index 0000000..fa281b8 Binary files /dev/null and b/site/templates/fonts/Amontillado_Regular.woff differ diff --git a/site/templates/fonts/Amontillado_Regular.woff2 b/site/templates/fonts/Amontillado_Regular.woff2 new file mode 100644 index 0000000..0dff77c Binary files /dev/null and b/site/templates/fonts/Amontillado_Regular.woff2 differ diff --git a/site/templates/fonts/Amontillados_Regular.eot b/site/templates/fonts/Amontillados_Regular.eot new file mode 100644 index 0000000..5181367 Binary files /dev/null and b/site/templates/fonts/Amontillados_Regular.eot differ diff --git a/site/templates/fonts/Amontillados_Regular.otf b/site/templates/fonts/Amontillados_Regular.otf new file mode 100644 index 0000000..2c110e9 Binary files /dev/null and b/site/templates/fonts/Amontillados_Regular.otf differ diff --git a/site/templates/fonts/Amontillados_Regular.svg b/site/templates/fonts/Amontillados_Regular.svg new file mode 100644 index 0000000..fccd43f --- /dev/null +++ b/site/templates/fonts/Amontillados_Regular.svg @@ -0,0 +1,970 @@ + + + + +Created by FontForge 20201107 at Tue Feb 14 11:14:54 2017 + By Unknown +FREE FOR PERSONAL USE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/site/templates/fonts/Amontillados_Regular.ttf b/site/templates/fonts/Amontillados_Regular.ttf new file mode 100644 index 0000000..c156dce Binary files /dev/null and b/site/templates/fonts/Amontillados_Regular.ttf differ diff --git a/site/templates/fonts/Amontillados_Regular.woff b/site/templates/fonts/Amontillados_Regular.woff new file mode 100644 index 0000000..02a8b8f Binary files /dev/null and b/site/templates/fonts/Amontillados_Regular.woff differ diff --git a/site/templates/fonts/Amontillados_Regular.woff2 b/site/templates/fonts/Amontillados_Regular.woff2 new file mode 100644 index 0000000..8d546a0 Binary files /dev/null and b/site/templates/fonts/Amontillados_Regular.woff2 differ diff --git a/site/templates/fonts/HelveticaNeue_Light.eot b/site/templates/fonts/HelveticaNeue_Light.eot new file mode 100644 index 0000000..e247a02 Binary files /dev/null and b/site/templates/fonts/HelveticaNeue_Light.eot differ diff --git a/site/templates/fonts/HelveticaNeue_Light.otf b/site/templates/fonts/HelveticaNeue_Light.otf new file mode 100644 index 0000000..f4eb94f Binary files /dev/null and b/site/templates/fonts/HelveticaNeue_Light.otf differ diff --git a/site/templates/fonts/HelveticaNeue_Light.svg b/site/templates/fonts/HelveticaNeue_Light.svg new file mode 100644 index 0000000..691685c --- /dev/null +++ b/site/templates/fonts/HelveticaNeue_Light.svg @@ -0,0 +1,563 @@ + + + + +Created by FontForge 20201107 at Tue Oct 15 19:01:19 2013 + By Unknown +Copyright (c) 1988, 1990 Adobe Systems Incorporated. All Rights Reserved.Helvetica is a registered trademark of Linotype AG and/or its subsidiaries. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/site/templates/fonts/HelveticaNeue_Light.ttf b/site/templates/fonts/HelveticaNeue_Light.ttf new file mode 100644 index 0000000..cf7e1c9 Binary files /dev/null and b/site/templates/fonts/HelveticaNeue_Light.ttf differ diff --git a/site/templates/fonts/HelveticaNeue_Light.woff b/site/templates/fonts/HelveticaNeue_Light.woff new file mode 100644 index 0000000..a8ad7d3 Binary files /dev/null and b/site/templates/fonts/HelveticaNeue_Light.woff differ diff --git a/site/templates/fonts/HelveticaNeue_Light.woff2 b/site/templates/fonts/HelveticaNeue_Light.woff2 new file mode 100644 index 0000000..ed17cfb Binary files /dev/null and b/site/templates/fonts/HelveticaNeue_Light.woff2 differ diff --git a/site/templates/images/logo.jpg b/site/templates/images/logo.jpg new file mode 100644 index 0000000..aeeafe7 Binary files /dev/null and b/site/templates/images/logo.jpg differ