diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-java.jar deleted file mode 100644 index 1155f26e..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-java.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index 796ab7f5..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ 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 673d8868..20c6fb9a 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 @@ -11,6 +11,7 @@ position: fixed; width: calc(100% - 40px); z-index: 9999; + font-family: "Montserrat", sans-serif; } #cookies.cookiesHide { diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ 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 c0b615ea..86107bfb 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 @@ -4,6 +4,46 @@ background-color: $w; width: 100%; z-index: 1000; + + .flex-end-menu { + @media (min-width: 991px) { + display: flex !important; + align-items: flex-end; + } + } + + .logo-margin { margin-left:-120px !important; } + + .cont-payoff{ + text-align: center; + font-size: 15px; + align-self: center; + margin-left: 20px; + font-family: Merriweather, serif; + + .payoff1{ + margin-bottom: 10px; + font-size: 20px; + font-weight:bold; + } + + .payoff2{ + font-size: 15px; + line-height: 18px; + } + } + + .link-home{ + margin-left: 20px; + font-size: 18px; + color: #000; + font-weight: bold; + text-transform: uppercase; + margin-bottom: 3px; + font-family: Montserrat,sans-serif; + } + + .toggled & { padding-right: 250px; @@ -35,19 +75,25 @@ @include display-flex(); @include justify-content(space-between); @include align-items(center); + .site-title { margin: 0; - padding: 15px; + padding: 0; .logo-img { height: $height-header; width: auto; } } + + .navigation { + border-top: 0; + border-bottom: 0; + } .page-title { margin: 0; - padding: 15px; + padding: 2px 0; .img-site { height: $height-header; width: auto; @@ -64,11 +110,8 @@ @include flex-wrap(wrap); /*box-shadow: 0 0 2px black !important;*/ background-color: $w; - border-top: 2px solid $red-selected; - border-bottom: 2px solid $red-selected; - - - + border-top: 2px solid #e2001a; + border-bottom: 2px solid #e2001a; .main-menu { /*@include flex(1);*/ @@ -163,7 +206,7 @@ margin-bottom: 4px; background-color: $w; transition: transform .5s; - border-radius: 25px; + border-radius: 0; } } 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 30dfbf41..3b3b4c39 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 @@ -36,7 +36,7 @@ $second-font: 'Montserrat', sans-serif; $base_font_size:14px; /* SIZE */ -$height-header: 60px; +$height-header: auto; $padding-top-container: 80px; $f: 100%; $desktop: 1200px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl index f7b0e1c9..c99b9674 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/_diffs/templates/header.ftl @@ -1,16 +1,20 @@
-

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

+ <#assign logo_url = "${images_folder}/logo-rs.png" /> + + ${logo_description} + +
+
Regione Siciliana
+
Dipartimento dei Beni Culturali
e dell'identità Siciliana
+
+

<#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> @@ -29,12 +33,35 @@
-

- - ${logo_description} - -

+

+ + ${logo_description} + +

+ +
-
- -
- - <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> - - <#assign portlet_id = "2_WAR_notificationsportlet" /> - ${theme.runtime(portlet_id)} - -
- - - - - - - - \ No newline at end of file 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 c0b615ea..86107bfb 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 @@ -4,6 +4,46 @@ background-color: $w; width: 100%; z-index: 1000; + + .flex-end-menu { + @media (min-width: 991px) { + display: flex !important; + align-items: flex-end; + } + } + + .logo-margin { margin-left:-120px !important; } + + .cont-payoff{ + text-align: center; + font-size: 15px; + align-self: center; + margin-left: 20px; + font-family: Merriweather, serif; + + .payoff1{ + margin-bottom: 10px; + font-size: 20px; + font-weight:bold; + } + + .payoff2{ + font-size: 15px; + line-height: 18px; + } + } + + .link-home{ + margin-left: 20px; + font-size: 18px; + color: #000; + font-weight: bold; + text-transform: uppercase; + margin-bottom: 3px; + font-family: Montserrat,sans-serif; + } + + .toggled & { padding-right: 250px; @@ -35,19 +75,25 @@ @include display-flex(); @include justify-content(space-between); @include align-items(center); + .site-title { margin: 0; - padding: 15px; + padding: 0; .logo-img { height: $height-header; width: auto; } } + + .navigation { + border-top: 0; + border-bottom: 0; + } .page-title { margin: 0; - padding: 15px; + padding: 2px 0; .img-site { height: $height-header; width: auto; @@ -64,11 +110,8 @@ @include flex-wrap(wrap); /*box-shadow: 0 0 2px black !important;*/ background-color: $w; - border-top: 2px solid $red-selected; - border-bottom: 2px solid $red-selected; - - - + border-top: 2px solid #e2001a; + border-bottom: 2px solid #e2001a; .main-menu { /*@include flex(1);*/ @@ -163,7 +206,7 @@ margin-bottom: 4px; background-color: $w; transition: transform .5s; - border-radius: 25px; + border-radius: 0; } } 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 30dfbf41..3b3b4c39 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 @@ -36,7 +36,7 @@ $second-font: 'Montserrat', sans-serif; $base_font_size:14px; /* SIZE */ -$height-header: 60px; +$height-header: auto; $padding-top-container: 80px; $f: 100%; $desktop: 1200px; diff --git a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl index f7b0e1c9..c99b9674 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl +++ b/liferay-plugins-sdk-6.2/themes/portos-private-fe-theme/docroot/templates/header.ftl @@ -1,16 +1,20 @@
-

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

+ <#assign logo_url = "${images_folder}/logo-rs.png" /> + + ${logo_description} + +
+
Regione Siciliana
+
Dipartimento dei Beni Culturali
e dell'identità Siciliana
+
+

<#assign ddmTemplate_news = theme.getSetting("ddmTemplate-news") /> @@ -29,12 +33,35 @@
-

- - ${logo_description} - -

+

+ + ${logo_description} + +

+ +
-
- -
- - <#assign liferay_portlet = PortalJspTagLibs["/WEB-INF/tld/liferay-portlet-ext.tld"] /> - - <#assign portlet_id = "2_WAR_notificationsportlet" /> - ${theme.runtime(portlet_id)} - -
- - - - - - - - \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss index 0186a9b3..1d217461 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/carousel.scss @@ -46,6 +46,15 @@ position: relative; top: 50%; @include transform(translate3D(0, -50%, 0)); + + h4 { + font-weight:bold; + font-size:16px; + } + p { + font-size:13px; + } + } .btn-carousel { @@ -63,6 +72,12 @@ cursor: pointer; } +#myCarousel .list-group-item.active { + background-color: transparent !important; + border-color: #ddd !important; + color: $header-menu !important; +} + /* #myCarousel .list-group { opacity: 0; diff --git a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss index 9fc04b78..fabd757d 100644 --- a/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss +++ b/liferay-plugins-sdk-6.2/themes/portos-public-theme/docroot/_diffs/css/component/header.scss @@ -4,8 +4,44 @@ width: 100%; z-index: 1000; box-shadow: 0 0 5px $b!important; - - + + + .flex-end-menu { + @media (min-width: 991px) { + display: flex; + align-items: flex-end; + } + } + + .cont-payoff{ + text-align: center; + font-size: 15px; + align-self: center; + margin-left: 20px; + + .payoff1{ + margin-bottom: 10px; + font-size: 20px; + font-weight:bold; + } + + .payoff2{ + font-size: 15px; + line-height: 18px; + } + } + + .link-home{ + margin-left: 20px; + font-size: 18px; + color: #000; + font-weight: bold; + text-transform: uppercase; + margin-bottom: 3px; + font-family: Montserrat,sans-serif; + } + + .toggled &{ padding-right: 250px; @@ -107,7 +143,7 @@ margin-bottom: 4px; background-color: $w; transition: transform .5s; - border-radius: 25px; + border-radius: 0; } } 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 5aee7646..72bc048c 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,20 +1,28 @@
-

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

+ <#assign logo_url = "${images_folder}/logo-rs.png" /> ${logo_description} + +
+
Regione Siciliana
+
Dipartimento dei Beni Culturali
e dell'identità Siciliana
+
+

-

+

${logo_description} +