merge error
Change-Id: I816fb84c9691d3d73a586998e26e3730b3717e76
diff --git a/common_assets/css/styles.css b/common_assets/css/styles.css
index b1c8bde..67f6823 100644
--- a/common_assets/css/styles.css
+++ b/common_assets/css/styles.css
@@ -373,8 +373,6 @@
#update_site input {
width: 50%;
}
-<<<<<<< HEAD
-=======
/* Badges */
.badge {
text-transform: uppercase;
@@ -385,7 +383,6 @@
#sirius_versions .badge {
margin-top: -3px;
}
->>>>>>> 51330b3 (New version of the Acceleo website)
/* Footer */
footer {
background: #261e58;
@@ -411,11 +408,7 @@
font-size: 12px;
color:#fff;
}
-<<<<<<< HEAD
-footer a:hover {color:#ccc;}
-=======
footer a:hover, footer a:focus, footer a:active {color:#ccc;}
->>>>>>> 51330b3 (New version of the Acceleo website)
/* Fancybox
-----------*/
.fancybox-close {
@@ -565,11 +558,6 @@
color: #FBB800;
background-color: #261e58;
}
-<<<<<<< HEAD
-
-
-=======
->>>>>>> 51330b3 (New version of the Acceleo website)
/* Accordion Style
--------------- */
.dropdown_content {
@@ -615,10 +603,6 @@
.row.usecase img.shadow {
box-shadow: 0 2px 6px #999 !important;
}
-<<<<<<< HEAD
-
-=======
->>>>>>> 51330b3 (New version of the Acceleo website)
/* Cookies consent
-------------------------- */
.cc-color-override-1434350510.cc-window, .cc-color-override-1434350510.cc-revoke, .cc-color-override-1434350510 .cc-btn {
@@ -628,28 +612,16 @@
background-color: #261e58 !important;
}
.cc-color-override-1434350510.cc-revoke {
-<<<<<<< HEAD
- background-color: #FBBF52 !important;
-}
-.cc-color-override-1434350510.cc-revoke:hover {
- text-decoration: none !important;
- color: #FBBF52 !important;
-=======
background-color: #FBB800 !important;
}
.cc-color-override-1434350510.cc-revoke:hover {
text-decoration: none !important;
color: #FBB800 !important;
->>>>>>> 51330b3 (New version of the Acceleo website)
background-color: #261e58 !important;
}
.cc-color-override-1434350510 .cc-btn:last-child, .cc-highlight .cc-btn:first-child:focus, .cc-highlight .cc-btn:first-child:hover {
-<<<<<<< HEAD
- background-color: #FBBF52 !important;
-=======
background-color: #FBB800 !important;
->>>>>>> 51330b3 (New version of the Acceleo website)
color: #261e58 !important;
}
diff --git a/overview.html b/overview.html
index 8dcf7a5..4a5c183 100644
--- a/overview.html
+++ b/overview.html
@@ -16,16 +16,11 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
<link rel="stylesheet" href="/acceleo/common_assets/css/styles.css">
<link rel="stylesheet" href="/acceleo/common_assets/css/animate.css">
-<<<<<<< HEAD
-
- <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-=======
<link rel="stylesheet" href="/acceleo/common_assets/css/media.css"/>
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="/acceleo/common_assets/js/magnific-popup.video.js"></script>
<script src="/acceleo/common_assets/js/magnific-popup.min.js"></script>
->>>>>>> 51330b3 (New version of the Acceleo website)
<!-- Eclipse Foundation Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -41,13 +36,8 @@
<script src="/acceleo/assets/js/ga.js"></script>
-<<<<<<< HEAD
- <!-- Old version of font awesome for some icons -->
- <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-=======
<!-- FontAwesome Latest version Kit (automatically updated) -->
<script src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
->>>>>>> 51330b3 (New version of the Acceleo website)
<!-- Bootstrap JS -->
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
@@ -118,21 +108,12 @@
<li>easy kick off</li>
</ul>
<p>A pragmatic implementation of the Object Management Group (OMG) MOF Model to Text Language (MTL) standard, Acceleo is
-<<<<<<< HEAD
- the result of several man-years of R&D started in the <a href="https://www.obeo.fr" target="_blank">Obeo</a> company.</p>
-
- <p><a href="https://projects.eclipse.org/projects/modeling.acceleo" target="_blank">Project page <i class="fas fa-arrow-alt-circle-right" aria-hidden="true"></i></a></p>
- </div>
- <div class="popup-gallery col-md-7 order-2 wow fadeInUp" data-wow-delay=".2s">
- <a href="images/screenshots/overview.png" target="_blank" title="Acceleo - Overview"><img src="images/screenshots/overview.png" alt="Acceleo - Overview"></a>
-=======
the result of several man-years of R&D started in the <a href="https://www.obeosoft.com" target="_blank">Obeo</a> company.</p>
<p><a href="https://projects.eclipse.org/projects/modeling.acceleo" target="_blank">Project page <i class="fas fa-arrow-alt-circle-right" aria-hidden="true"></i></a></p>
</div>
<div class="col-md-7 popup-gallery text-center order-2 wow fadeInUp" data-wow-delay=".2s">
<a href="images/screenshots/overview.png" target="_blank" title="Acceleo - Overview"><img src="images/screenshots/overview.png" class="" alt="Acceleo - Overview"></a>
->>>>>>> 51330b3 (New version of the Acceleo website)
</div>
</div>
</div>
@@ -159,13 +140,8 @@
<p><a href="features.html" target="_self">Learn more <i class="fas fa-arrow-alt-circle-right" aria-hidden="true"></i></a></p>
</div>
-<<<<<<< HEAD
- <div class="popup-gallery col-md-7 order-1 wow fadeInUp" data-wow-delay=".2s">
- <a href="images/screenshots/user_experience.png" target="_self" title="Acceleo - User Experience"><img src="images/screenshots/user_experience.png" alt="Acceleo - User Experience"></a>
-=======
<div class="col-md-7 popup-gallery text-center order-1 wow fadeInUp" data-wow-delay=".2s">
<a href="images/screenshots/user_experience.png" target="_self" title="Acceleo - User Experience"><img src="images/screenshots/user_experience.png" class="" alt="Acceleo - User Experience"></a>
->>>>>>> 51330b3 (New version of the Acceleo website)
</div>
</div>
</div>
@@ -175,11 +151,7 @@
<div class="container">
<h2 class="title wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".2s">Related Projects</h2>
<h3 class="wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".3s"></h3>
-<<<<<<< HEAD
-<p class="wow fadeInDown" data-wow-duration="500ms" data-w ow-delay=".4s"></p>
-=======
<p class="wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".4s"></p>
->>>>>>> 51330b3 (New version of the Acceleo website)
@@ -198,11 +170,7 @@
<div class="col-md-3">
<p><a href="http://www.eclipse.org/" target="_blank"><img src="/acceleo/common_assets/images/logos/logo-eclipse-foundation.png" alt="Eclipse Foundation logo"></a></p>
-<<<<<<< HEAD
- <p id="copyright">Copyright © 2020 Eclipse Foundation, Inc.<br>All Rights Reserved.</p>
-=======
<p id="copyright">Copyright © 2021 Eclipse Foundation, Inc.<br>All Rights Reserved.</p>
->>>>>>> 51330b3 (New version of the Acceleo website)
</div>
<div class="col-md-3">
diff --git a/resources.html b/resources.html
index ded754a..7da13b6 100644
--- a/resources.html
+++ b/resources.html
@@ -16,16 +16,11 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
<link rel="stylesheet" href="/acceleo/common_assets/css/styles.css">
<link rel="stylesheet" href="/acceleo/common_assets/css/animate.css">
-<<<<<<< HEAD
-
- <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-=======
<link rel="stylesheet" href="/acceleo/common_assets/css/media.css"/>
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="/acceleo/common_assets/js/magnific-popup.video.js"></script>
<script src="/acceleo/common_assets/js/magnific-popup.min.js"></script>
->>>>>>> 51330b3 (New version of the Acceleo website)
<!-- Eclipse Foundation Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -41,13 +36,8 @@
<script src="/acceleo/assets/js/ga.js"></script>
-<<<<<<< HEAD
- <!-- Old version of font awesome for some icons -->
- <script src="https://use.fontawesome.com/b51f77a16a.js"></script>
-=======
<!-- FontAwesome Latest version Kit (automatically updated) -->
<script src="https://kit.fontawesome.com/16cf99803e.js" crossorigin="anonymous"></script>
->>>>>>> 51330b3 (New version of the Acceleo website)
<!-- Bootstrap JS -->
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
@@ -106,21 +96,13 @@
<div class="row">
<div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="300ms" data-wow-delay="0ms">
-<<<<<<< HEAD
- <div><i class="fas fa-play-circle fa-3x pa2 txt_indigo" aria-hidden="true"></i></div>
-=======
<div><i class="far fa-play-circle fa-3x pa2 txt_indigo" aria-hidden="true"></i></div>
->>>>>>> 51330b3 (New version of the Acceleo website)
<h4>Tutorials</h4>
<p><a data-wow-delay=".1s" href="https://wiki.eclipse.org/Acceleo/Getting_Started" target="_blank">Create your First Acceleo Generator <i class="fa fa-external-link" aria-hidden="true"></i></a></p>
<p><a data-wow-delay=".2s" href="https://wiki.eclipse.org/Acceleo/Videos/TopcasedDays2011" target="_blank">Android code generation <i class="fa fa-external-link" aria-hidden="true"></i></a></p>
</div>
<div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="300ms" data-wow-delay="0ms">
-<<<<<<< HEAD
- <div><i class="fas fa-file-alt fa-3x pa2 txt_indigo" aria-hidden="true"></i></div>
-=======
<div><i class="far fa-file-alt fa-3x pa2 txt_indigo" aria-hidden="true"></i></div>
->>>>>>> 51330b3 (New version of the Acceleo website)
<h4>Documentation</h4>
<p><a href="http://help.eclipse.org/photon/index.jsp?topic=/org.eclipse.acceleo.doc/pages/index.html" target="_blank">
Reference documentation <i class="fa fa-external-link" aria-hidden="true"></i></a> <i class="fa fa-info-circle hasTooltip txt_lightest_grey" title="This documentation is included in the Help Content of Eclipse. Within your Eclipse, go to Help / Help Contents and navigate to the Acceleo Model To Text section" data-toggle="tooltip" data-placement="bottom" data-original-title="This documentation is included in the Help Content of Eclipse. Within your Eclipse, go to Help / Help Contents and navigate to the Acceleo Model To Text section"></i></p>
@@ -132,11 +114,7 @@
</div>
<div class="col-sm-4 col-xs-12 wow fadeInLeft" data-wow-duration="300ms" data-wow-delay="100ms">
-<<<<<<< HEAD
- <div><i class="fas fa-folder-open fa-3x pa2 txt_indigo" aria-hidden="true"></i></div>
-=======
<div><i class="far fa-folder-open fa-3x pa2 txt_indigo" aria-hidden="true"></i></div>
->>>>>>> 51330b3 (New version of the Acceleo website)
<h4>Developers Resources</h4>
<p><a href="https://projects.eclipse.org/projects/modeling.acceleo" target="_blank">About this project <i class="fa fa-external-link" aria-hidden="true"></i></a></p>
<p><a href="http://git.eclipse.org/c/acceleo/org.eclipse.acceleo.git/" target="_blank">
@@ -157,11 +135,7 @@
<div class="container">
<h2 class="title wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".2s">Contribute</h2>
<h3 class="wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".3s"></h3>
-<<<<<<< HEAD
-<p class="wow fadeInDown" data-wow-duration="500ms" data-w ow-delay=".4s">Acceleo is actively looking for project contributors. <br><br>There are many official and unofficial ways
-=======
<p class="wow fadeInDown" data-wow-duration="500ms" data-wow-delay=".4s">Acceleo is actively looking for project contributors. <br><br>There are many official and unofficial ways
->>>>>>> 51330b3 (New version of the Acceleo website)
to get involved. <br>Please see <a href='http://wiki.eclipse.org/Acceleo/Wishlist' target='_blank'>this wiki page</a> for some
ideas, and <a href='http://wiki.eclipse.org/Setting_up_a_development_environment_for_Acceleo' target='_blank'>
this one</a> for information on how to set up your development environment.
@@ -178,11 +152,7 @@
<div class="col-md-3">
<p><a href="http://www.eclipse.org/" target="_blank"><img src="/acceleo/common_assets/images/logos/logo-eclipse-foundation.png" alt="Eclipse Foundation logo"></a></p>
-<<<<<<< HEAD
- <p id="copyright">Copyright © 2020 Eclipse Foundation, Inc.<br>All Rights Reserved.</p>
-=======
<p id="copyright">Copyright © 2021 Eclipse Foundation, Inc.<br>All Rights Reserved.</p>
->>>>>>> 51330b3 (New version of the Acceleo website)
</div>
<div class="col-md-3">
