From 766d4f516ca979f196268bae3052abde40c8794a Mon Sep 17 00:00:00 2001 From: Mattia MWG Date: Fri, 7 Aug 2020 10:08:00 +0200 Subject: [PATCH] modifichefrontend --- .../portos-cookies-portlet/.tern-project | 1 + .../WEB-INF/src/content/Language.properties | 2 +- .../src/content/Language_en.properties | 2 +- .../docroot/css/main.css | 9 +++- .../portos-cookies-portlet/docroot/view.jsp | 2 +- .../sismica/fe/servlet/SorgentiServlet.java | 2 +- .../docroot/html/sorgenti/form.jsp | 4 +- .../docroot/html/sorgenti/invio_ok.jsp | 2 +- .../docroot/_diffs/css/component/cookies.scss | 16 +++++++ .../_diffs/css/component/fascicolo.scss | 5 +++ .../docroot/_diffs/css/component/header.scss | 5 ++- .../docroot/_diffs/css/component/index.css | 4 +- .../_diffs/css/component/variable.scss | 1 + .../docroot/_diffs/images/favicon.ico | Bin 0 -> 1150 bytes .../docroot/css/component/cookies.scss | 16 +++++++ .../docroot/css/component/fascicolo.scss | 5 +++ .../docroot/css/component/header.scss | 5 ++- .../docroot/css/component/index.css | 4 +- .../docroot/css/component/variable.scss | 1 + .../docroot/images/favicon.ico | Bin 1150 -> 1150 bytes .../docroot/_diffs/images/favicon.ico | Bin 0 -> 1150 bytes .../docroot/images/favicon.ico | Bin 1150 -> 1150 bytes .../_diffs/css/component/carousel.scss | 40 ++++++++++++++++-- .../docroot/_diffs/css/component/cookie.scss | 6 ++- .../docroot/_diffs/css/component/header.scss | 15 ++++++- .../_diffs/css/component/mediaobject.scss | 13 ++++-- .../_diffs/css/component/variable.scss | 3 +- .../docroot/_diffs/images/favicon.ico | Bin 0 -> 1150 bytes .../docroot/_diffs/templates/footer.ftl | 6 ++- .../docroot/_diffs/templates/header.ftl | 12 +++--- .../docroot/css/component/carousel.scss | 40 ++++++++++++++++-- .../docroot/css/component/cookie.scss | 6 ++- .../docroot/css/component/header.scss | 15 ++++++- .../docroot/css/component/mediaobject.scss | 13 ++++-- .../docroot/css/component/variable.scss | 3 +- .../docroot/images/favicon.ico | Bin 1150 -> 1150 bytes .../docroot/templates/footer.ftl | 6 ++- .../docroot/templates/header.ftl | 12 +++--- 38 files changed, 222 insertions(+), 54 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/images/favicon.ico create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/cookies.scss create mode 100644 liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/_diffs/images/favicon.ico create mode 100644 liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/images/favicon.ico diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project new file mode 100644 index 00000000..a185ba0d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/.tern-project @@ -0,0 +1 @@ +{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties index 787631ea..9ae18045 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language.properties @@ -1 +1 @@ -cookie.accepted.message.accept=Accept \ No newline at end of file +cookie.accepted.message.accept=Accetto \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties index 787631ea..9ae18045 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/src/content/Language_en.properties @@ -1 +1 @@ -cookie.accepted.message.accept=Accept \ No newline at end of file +cookie.accepted.message.accept=Accetto \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css index fdc4ec71..673d8868 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/css/main.css @@ -19,14 +19,16 @@ #cookies.cookiesShow { display: block; + text-align:center; } #cookies .notifications-content { + padding-top:12px; } #cookies .notifications-button { float: right; - padding: 5px 10px 10px 15px; + padding: 5px 10px 5px 15px; } #cookies .notifications-content p span.title { @@ -74,4 +76,9 @@ input[type="button"].btn-primary:hover { #cookies a { text-decoration: none; + color: #fff; +} + +#cookies a:hover { + text-decoration: underline; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp index 0c15e732..492629d1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp @@ -50,7 +50,7 @@ inputCssClass="btn btn-primary" value="cookie.accepted.message.accept" onclick="cookiesAccepted()"/>
- + Il sito utilizza cookies. Navigando ne accetti l'uso. Informazioni
<% diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java index 0b2d00a0..6b4506f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/mwg/sismica/fe/servlet/SorgentiServlet.java @@ -52,7 +52,7 @@ public class SorgentiServlet extends HttpServlet { private static final int validita = 3; private static final String folder = "condivisi"; - private static final String uri = "/portos-fe-portlet/sorgenti-sismica/"; + private static final String uri = "/portos-fe-portlet/sorgenti-paesaggistica/"; @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp index 18d2df10..0a00b41f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/form.jsp @@ -3,12 +3,12 @@

Sorgenti del portale Paesaggistica Sicilia

Compila il form sottostante e riceverai per email il collegamento per scaricare - i sorgenti del portale Sismica.
+ i sorgenti del portale Paesaggistica.
-
+ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ok.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ok.jsp index b575c2fe..3024ed4c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ok.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/sorgenti/invio_ok.jsp @@ -4,7 +4,7 @@
È stata inviata una mail all'indirizzo <%=ParamUtil.getString(request, "email")%> - contente l'indirizzo per scaricare i sorgenti del portale Sismica di Regione Siciliana + contente l'indirizzo per scaricare i sorgenti del portale Paesaggistica di Regione Siciliana
<%@ include file="/html/sorgenti/footer.jsp"%> \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss new file mode 100644 index 00000000..d2406f6e --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/cookies.scss @@ -0,0 +1,16 @@ +#cookies { + background-color: rgba(0,0,0,0.9); + color: white; + border: none; + + .notifications-content { + font-size: em(14px, 11px); + } + + button { + background-color: $green-logo; + border-color: $green-logo; + border-radius: 0; + + } +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss index 4c71d435..5cd9a889 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/fascicolo.scss @@ -158,4 +158,9 @@ .module-group.first { padding-top: 15px; } + + .portlet-journal-content .journal-content-article p { + font-size:1.1em; + } + } diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss index 7fc0d387..c0b615ea 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/header.scss @@ -152,8 +152,9 @@ height: 35px; padding-left: 8px; padding-right: 8px; - background-color: $red-logo; - border-color: $red-logo; + background-color: $header-menu; + border-color: $header-menu; + border-radius: 0; .toggle { .toggle-line { diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css index 55979dc2..d4f42a81 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/index.css @@ -82,4 +82,6 @@ @import url(allegato_variazione_soggetti.scss); -@import url(loader.scss); \ No newline at end of file +@import url(cookies.scss); + +@import url(loader.scss); diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss index 9e6913ae..30dfbf41 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/css/component/variable.scss @@ -13,6 +13,7 @@ $footer-link: #aaa; $header-menu: #333; $text-news: #555; $red-logo: #E2001A; +$green-logo: #2ABE31; $date-news: #b4b4b4; $table-header: #e2001a; $red-selected: #e2001a; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..cf9186681548d35d2c354808e364b8e974316652 GIT binary patch literal 1150 zcmbVMO-vI}5MC2c8iY$lPf$q|3=xzc6KniAkswkM|G=WAB?JUp#ma$JQfv!o1U%@) z17K_n2cQ+3R?m9CqNbX(2?xW0hHyYbH09FW?dQzft`fsVr}^g1eDlrj+u663q;2#o zD3Hh(OP$*#X}2Uvr39jg(Rf-UiE8h5X%IQNjGBcGnPN6sQIU}qD3t5q+UA&ZT`!t) zZe=Bfboz(L6h%Qct6g)mMvqnesj-&LX6r&--6bq7eHFQ?@;HAA2D}JNz~S&=k0F60mBXk!G=Z9`6&$VY z!`{LmdTu?z^T0S7&YVR{OAFq|7U1=IVX;`y*l32^?ZRER7l$kE;Pi=6m`wL^+%$|+ zCr400oZIau^ucU4qqWt7*N`!SVUg{|Eke{RQs7 BASeI; literal 0 HcmV?d00001 diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/cookies.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/cookies.scss new file mode 100644 index 00000000..d2406f6e --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/cookies.scss @@ -0,0 +1,16 @@ +#cookies { + background-color: rgba(0,0,0,0.9); + color: white; + border: none; + + .notifications-content { + font-size: em(14px, 11px); + } + + button { + background-color: $green-logo; + border-color: $green-logo; + border-radius: 0; + + } +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss index 4c71d435..5cd9a889 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/fascicolo.scss @@ -158,4 +158,9 @@ .module-group.first { padding-top: 15px; } + + .portlet-journal-content .journal-content-article p { + font-size:1.1em; + } + } diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss index 7fc0d387..c0b615ea 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/header.scss @@ -152,8 +152,9 @@ height: 35px; padding-left: 8px; padding-right: 8px; - background-color: $red-logo; - border-color: $red-logo; + background-color: $header-menu; + border-color: $header-menu; + border-radius: 0; .toggle { .toggle-line { diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css index 55979dc2..d4f42a81 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/index.css @@ -82,4 +82,6 @@ @import url(allegato_variazione_soggetti.scss); -@import url(loader.scss); \ No newline at end of file +@import url(cookies.scss); + +@import url(loader.scss); diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss index 9e6913ae..30dfbf41 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/css/component/variable.scss @@ -13,6 +13,7 @@ $footer-link: #aaa; $header-menu: #333; $text-news: #555; $red-logo: #E2001A; +$green-logo: #2ABE31; $date-news: #b4b4b4; $table-header: #e2001a; $red-selected: #e2001a; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/images/favicon.ico index 7871fca28a09ade8d2a06c19710601a0547bddc7..cf9186681548d35d2c354808e364b8e974316652 100644 GIT binary patch literal 1150 zcmbVMO-vI}5MC2c8iY$lPf$q|3=xzc6KniAkswkM|G=WAB?JUp#ma$JQfv!o1U%@) z17K_n2cQ+3R?m9CqNbX(2?xW0hHyYbH09FW?dQzft`fsVr}^g1eDlrj+u663q;2#o zD3Hh(OP$*#X}2Uvr39jg(Rf-UiE8h5X%IQNjGBcGnPN6sQIU}qD3t5q+UA&ZT`!t) zZe=Bfboz(L6h%Qct6g)mMvqnesj-&LX6r&--6bq7eHFQ?@;HAA2D}JNz~S&=k0F60mBXk!G=Z9`6&$VY z!`{LmdTu?z^T0S7&YVR{OAFq|7U1=IVX;`y*l32^?ZRER7l$kE;Pi=6m`wL^+%$|+ zCr400oZIau^ucU4qqWt7*N`!SVUg{|Eke{RQs7 BASeI; literal 1150 zcmbtTOG_J36uzPP0j|0#(%nq5@r58#5La%jicmxZi(2u82tIwSU;9`FT>Y*1O2Q5(QO0Y0$#Xv_L>Pzx5(ch)R$Bx&b9{3Rdy{GXa zdgMps+k4RWd0P+0TPxw6vgz>j&)KRKYS62}s{xPD68S!Z;o4%M#noA(!$*Jm5&klb z=#fu@kB4?Rr-#>H!`yH;9L>+*aSrM5i;h0n8_F@Syb>I0;1k!ftKm|EZiKg{1Q*RL z*?-bSJ`)G^LH?5;$+J}hZlUpf`-85&dvZW{Lw%5zOV8Fcc$y1w#!feNczaK)nD3CK zLFgo}=9HJX2(E}(k`Kwfr1sxdStRyGQ+a{#h_sBgRN&8+OK6E6`ftQfE4^Z0IS0Fi yzceF{OW|5pL3;oG`g|o`lBA5(zHa-@&rcRV)JEcHAA2D}JNz~S&=k0F60mBXk!G=Z9`6&$VY z!`{LmdTu?z^T0S7&YVR{OAFq|7U1=IVX;`y*l32^?ZRER7l$kE;Pi=6m`wL^+%$|+ zCr400oZIau^ucU4qqWt7*N`!SVUg{|Eke{RQs7 BASeI; literal 0 HcmV?d00001 diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-private-theme/docroot/images/favicon.ico index 7871fca28a09ade8d2a06c19710601a0547bddc7..cf9186681548d35d2c354808e364b8e974316652 100644 GIT binary patch literal 1150 zcmbVMO-vI}5MC2c8iY$lPf$q|3=xzc6KniAkswkM|G=WAB?JUp#ma$JQfv!o1U%@) z17K_n2cQ+3R?m9CqNbX(2?xW0hHyYbH09FW?dQzft`fsVr}^g1eDlrj+u663q;2#o zD3Hh(OP$*#X}2Uvr39jg(Rf-UiE8h5X%IQNjGBcGnPN6sQIU}qD3t5q+UA&ZT`!t) zZe=Bfboz(L6h%Qct6g)mMvqnesj-&LX6r&--6bq7eHFQ?@;HAA2D}JNz~S&=k0F60mBXk!G=Z9`6&$VY z!`{LmdTu?z^T0S7&YVR{OAFq|7U1=IVX;`y*l32^?ZRER7l$kE;Pi=6m`wL^+%$|+ zCr400oZIau^ucU4qqWt7*N`!SVUg{|Eke{RQs7 BASeI; literal 1150 zcmbtTOG_J36uzPP0j|0#(%nq5@r58#5La%jicmxZi(2u82tIwSU;9`FT>Y*1O2Q5(QO0Y0$#Xv_L>Pzx5(ch)R$Bx&b9{3Rdy{GXa zdgMps+k4RWd0P+0TPxw6vgz>j&)KRKYS62}s{xPD68S!Z;o4%M#noA(!$*Jm5&klb z=#fu@kB4?Rr-#>H!`yH;9L>+*aSrM5i;h0n8_F@Syb>I0;1k!ftKm|EZiKg{1Q*RL z*?-bSJ`)G^LH?5;$+J}hZlUpf`-85&dvZW{Lw%5zOV8Fcc$y1w#!feNczaK)nD3CK zLFgo}=9HJX2(E}(k`Kwfr1sxdStRyGQ+a{#h_sBgRN&8+OK6E6`ftQfE4^Z0IS0Fi yzceF{OW|5pL3;oG`g|o`lBA5(zHa-@&rcRV)JEcHAA2D}JNz~S&=k0F60mBXk!G=Z9`6&$VY z!`{LmdTu?z^T0S7&YVR{OAFq|7U1=IVX;`y*l32^?ZRER7l$kE;Pi=6m`wL^+%$|+ zCr400oZIau^ucU4qqWt7*N`!SVUg{|Eke{RQs7 BASeI; literal 0 HcmV?d00001 diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl index b750eb04..76ef13f7 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/footer.ftl @@ -84,8 +84,10 @@
- <#assign logo_url = "${images_folder}/logo-rs.png" /> - ${logo_description} + + <#assign logo_url = "${images_folder}/logo-rs.png" /> + ${logo_description} +
diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl index a47f1530..5aee7646 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/templates/header.ftl @@ -1,12 +1,10 @@

- - <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> - - ${logo_description} - + <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> + + ${logo_description}

diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/carousel.scss index d4eeedaf..0186a9b3 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/carousel.scss @@ -37,6 +37,39 @@ position: absolute; top: 0; right: 0; + width: 100%; + padding-right: 0px; + + .list-group-item { + position: relative; + .info-item { + position: relative; + top: 50%; + @include transform(translate3D(0, -50%, 0)); + } + + .btn-carousel { + position: absolute; + right: 0; + top: 50%; + @include transform(translate3D(0, -50%, 0)); + } + } + +} + +#myCarousel .list-group-item { + border-radius: 0px; + cursor: pointer; +} + +/* +#myCarousel .list-group { + opacity: 0; + position: absolute; + top: 0; + right: 0; + width: 100%; padding-right: 0px; transition: opacity $speed; @@ -115,7 +148,7 @@ #myCarousel .list-group .active { background-color: rgba( 52, 52, 52, 0.7 ); -} +}*/ .carousel-inner { @@ -162,10 +195,11 @@ } @media (max-width: 991px) { - .carousel-caption p, - #myCarousel .list-group { + .carousel-caption p { display: none; } + + /* ,#myCarousel .list-group*/ } .carousel-controls { diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss index 5fced315..90e3f0b0 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/cookie.scss @@ -8,7 +8,9 @@ } button { - background-color: $red-logo; - border-color: $red-logo; + background-color: $green-logo; + border-color: $green-logo; + border-radius: 0; + } } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss index 86475808..9fc04b78 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/header.scss @@ -46,6 +46,7 @@ .page-title { margin: 0; + padding:2px 0; .img-site { height: $height-header; width: auto; @@ -95,8 +96,9 @@ height: 35px; padding-left: 8px; padding-right: 8px; - background-color: $red-logo; - border-color: $red-logo; + background-color: $header-menu; + border-color: $header-menu; + border-radius: 0; .toggle { .toggle-line { @@ -255,6 +257,12 @@ header { transition: all .5s ease; top: 0; } + +main { + padding-top:90px; +} + +/* header.nav-up { top: -60px; @@ -262,6 +270,9 @@ header.nav-up { top: 0px; } } +*/ + +header.nav-up { top:0px; } .user-notification { margin: 0px!important; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss index b3df794f..d8cf3e3e 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/mediaobject.scss @@ -5,6 +5,11 @@ padding: 50px; vertical-align: top; + + .page_description { + font-size: 1.1em; + } + @media (max-width: $tablet) { padding-top: 40px; padding-bottom: 40px; @@ -45,15 +50,15 @@ .container-icon { width: em(210px); - height: em(210px); - border-radius: 50%; + height: em(140px); + /*border-radius: 50%;*/ margin: 0 auto; @include display-flex(); @include justify-content(center); @include align-items(center); .mediaobject_icon { - font-size: em(110px); + font-size: em(36px); color: $w; } } @@ -80,6 +85,8 @@ } } } + + .page_description:before { content: ""; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss index 6699bee0..54ddb4ec 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/css/component/variable.scss @@ -11,6 +11,7 @@ $footer-link: #aaa; $header-menu: #333; $text-news: #555; $red-logo: #E2001A; +$green-logo: #2ABE31; $date-news: #b4b4b4; $red-selected: #e2001a; $table-header: #e2001a; @@ -33,7 +34,7 @@ $second-font: 'Montserrat', sans-serif; $base_font_size:14px; /* SIZE */ -$height-header: 60px; +$height-header: auto; $f: 100%; $desktop: 1200px; $tablet: 992px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/images/favicon.ico b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/images/favicon.ico index 7871fca28a09ade8d2a06c19710601a0547bddc7..cf9186681548d35d2c354808e364b8e974316652 100644 GIT binary patch literal 1150 zcmbVMO-vI}5MC2c8iY$lPf$q|3=xzc6KniAkswkM|G=WAB?JUp#ma$JQfv!o1U%@) z17K_n2cQ+3R?m9CqNbX(2?xW0hHyYbH09FW?dQzft`fsVr}^g1eDlrj+u663q;2#o zD3Hh(OP$*#X}2Uvr39jg(Rf-UiE8h5X%IQNjGBcGnPN6sQIU}qD3t5q+UA&ZT`!t) zZe=Bfboz(L6h%Qct6g)mMvqnesj-&LX6r&--6bq7eHFQ?@;HAA2D}JNz~S&=k0F60mBXk!G=Z9`6&$VY z!`{LmdTu?z^T0S7&YVR{OAFq|7U1=IVX;`y*l32^?ZRER7l$kE;Pi=6m`wL^+%$|+ zCr400oZIau^ucU4qqWt7*N`!SVUg{|Eke{RQs7 BASeI; literal 1150 zcmbtTOG_J36uzPP0j|0#(%nq5@r58#5La%jicmxZi(2u82tIwSU;9`FT>Y*1O2Q5(QO0Y0$#Xv_L>Pzx5(ch)R$Bx&b9{3Rdy{GXa zdgMps+k4RWd0P+0TPxw6vgz>j&)KRKYS62}s{xPD68S!Z;o4%M#noA(!$*Jm5&klb z=#fu@kB4?Rr-#>H!`yH;9L>+*aSrM5i;h0n8_F@Syb>I0;1k!ftKm|EZiKg{1Q*RL z*?-bSJ`)G^LH?5;$+J}hZlUpf`-85&dvZW{Lw%5zOV8Fcc$y1w#!feNczaK)nD3CK zLFgo}=9HJX2(E}(k`Kwfr1sxdStRyGQ+a{#h_sBgRN&8+OK6E6`ftQfE4^Z0IS0Fi yzceF{OW|5pL3;oG`g|o`lBA5(zHa-@&rcRV)JEc
- <#assign logo_url = "${images_folder}/logo-rs.png" /> - ${logo_description} + + <#assign logo_url = "${images_folder}/logo-rs.png" /> + ${logo_description} +

diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl index a47f1530..5aee7646 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/templates/header.ftl @@ -1,12 +1,10 @@

- - <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> - - ${logo_description} - + <#assign logo_url = "${images_folder}/logo-rs-testo.png" /> + + ${logo_description}

Nome