Merge branch '1.1' of https://github.com/merdiano/orient-site into 1.1

themes/modern2/assets/css/style.css

@@ -135,3 +135,66 @@ body {
 .right-top-content-date-2 {
     margin-top: 5rem;
 }
+.event__body-column .card {
+    padding: 10px 0;
+    border-bottom: 1px solid #dcdcdc;
+}
+
+.card__link {
+    color: #000;
+    font-weight: 700;
+    font-size: 16px;
+    line-height: 25px;
+    margin: 5px 0 0 0;
+    display: block;
+    height: 49px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.card {
+    position: relative;
+    padding: 21px 30px;
+    background: #ffffff;
+}
+
+.event__header {
+    margin-bottom: 25px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: relative;
+}
+.main {
+    margin-top: 20px;
+}
+.event {
+    margin: 30px 0;
+    margin-bottom: 70px;
+}
+.main__banner {
+    width: 100%;
+    height: auto;
+    margin-bottom: 30px;
+}
+.main__body-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 35px;
+    position: relative;
+}
+.partner__title {
+    font-size: 20px;
+    line-height: 26px;
+    font-weight: 700;
+    color: #242424;
+    margin-bottom: 30px;
+}
+
+.main__body-row {
+    margin: 0px -20px 50px -20px;
+    display: flex;
+    align-items: stretch;
+    flex-wrap: wrap;
+}

themes/modern2/pages/home2.htm

@@ -65,69 +65,6 @@ code = "right-bottom"
 type = "slider"
 random = 0
 ==
-<style>
-.event__body-column .card {
-    padding: 10px 0;
-    border-bottom: 1px solid #dcdcdc;
-}
-
-.card__link {
-    color: #000;
-    font-weight: 700;
-    font-size: 16px;
-    line-height: 25px;
-    margin: 10px 0 0 0;
-    display: block;
-    height: 49px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.card {
-    position: relative;
-    padding: 21px 30px;
-    background: #ffffff;
-}
-.card {
-    position: relative;
-    padding: 21px 30px;
-    background: #ffffff;
-}
-
-.event__header {
-    margin-bottom: 40px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    position: relative;
-}
-.main {
-    margin-top: 20px;
-}
-.event {
-    margin: 30px 0;
-    margin-bottom: 70px;
-}
-.main__banner {
-    width: 100%;
-    height: auto;
-    margin-bottom: 30px;
-}
-.main__body-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 35px;
-    position: relative;
-}
-.partner__title {
-    font-size: 20px;
-    line-height: 26px;
-    font-weight: 700;
-    color: #242424;
-    margin-bottom: 30px;
-}
-</style>
 <section class="hero">
     <div class="auto__container">
         <div class="hero__inner">

themes/modern2/pages/index.htm

@@ -74,71 +74,6 @@ code = "right-bottom"
 type = "slider"
 random = 0
 ==
-<style>
-.event__body-column .card {
-    padding: 10px 0;
-    border-bottom: 1px solid #dcdcdc;
-}
-
-.card__link {
-    color: #000;
-    font-weight: 700;
-    font-size: 16px;
-    line-height: 25px;
-    margin: 5px 0 0 0;
-    display: block;
-    height: 49px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.card {
-    position: relative;
-    padding: 21px 30px;
-    background: #ffffff;
-}
-
-.event__header {
-    margin-bottom: 25px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    position: relative;
-}
-.main {
-    margin-top: 20px;
-}
-.event {
-    margin: 30px 0;
-    margin-bottom: 70px;
-}
-.main__banner {
-    width: 100%;
-    height: auto;
-    margin-bottom: 30px;
-}
-.main__body-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 35px;
-    position: relative;
-}
-.partner__title {
-    font-size: 20px;
-    line-height: 26px;
-    font-weight: 700;
-    color: #242424;
-    margin-bottom: 30px;
-}
-
-.main__body-row {
-    margin: 0px -20px 50px -20px;
-    display: flex;
-    align-items: stretch;
-    flex-wrap: wrap;
-}
-</style>
 <section class="hero">
     <div class="auto__container">
         <div class="hero__inner">

themes/modern2/partials/head.htm

@@ -7,8 +7,7 @@
 <link rel="preconnect" href="https://fonts.gstatic.com">
 <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700;900&display=swap" rel="stylesheet">
 {% styles %}
-<link href="{{ ['assets/css/main.css']|theme }}" rel="stylesheet">
+<link href="{{ ['assets/css/main.css','assets/css/style.css']|theme }}" rel="stylesheet">
-<link href="{{ ['assets/css/style.css']|theme }}" rel="stylesheet">
 <link rel="icon" href="{{'assets/images/icon/cropped-cropped-orienticon-32x32.png'|theme}}" sizes="32x32">
 <link rel="icon" href="{{'assets/images/icon/cropped-cropped-orienticon-192x192.png'|theme}}" sizes="192x192">
 <link rel="apple-touch-icon-precomposed" href="{{'assets/images/icon/cropped-cropped-orienticon-180x180.png'|theme}}">