Commit 325a5375 authored by Vitor Lopes's avatar Vitor Lopes

fix #102, fix loding screen scrollbars

parent 78db9431
...@@ -7,6 +7,7 @@ $svg-icon-size: 62px; ...@@ -7,6 +7,7 @@ $svg-icon-size: 62px;
position: absolute; position: absolute;
background: #262627; background: #262627;
z-index: 999999; z-index: 999999;
position: fixed;
img { img {
width: 96px; width: 96px;
height: 96px; height: 96px;
...@@ -406,7 +407,16 @@ h1.title::first-letter { ...@@ -406,7 +407,16 @@ h1.title::first-letter {
} }
.landing-page { .landing-page {
.twitter-container {
position: absolute;
bottom: 20px;
left: 0;
right: 0;
margin: 0 auto;
width: 400px;
z-index: 999;
}
#buorg { #buorg {
border: 0px solid white !important; border: 0px solid white !important;
...@@ -1010,6 +1020,38 @@ h1.title::first-letter { ...@@ -1010,6 +1020,38 @@ h1.title::first-letter {
.news { .news {
.social-icons-top {
text-align: right;
position: relative;
margin-top: -43px;
.btn {
height: 2.075rem;
min-width: 2.075rem;
width: 2.075rem;
}
i {
font-size: 14px !important;
padding-top: 11px;
color: white;
}
.facebook {
background-color: #44609c;
&:hover,
&:active,
&:focus {
background-color: #44609c;
}
}
.twitter {
background-color: #1da1f2;
&:hover,
&:active,
&:focus {
background-color: #1da1f2;
}
}
}
#updatesModal { #updatesModal {
.modal-header { .modal-header {
padding-top: 14px; padding-top: 14px;
......
...@@ -33,5 +33,5 @@ ...@@ -33,5 +33,5 @@
</div> </div>
</div> </div>
{{ partial "story-overview.html" . }} {{ partial "story-overview.html" . }}
{{ end }} {{ end }}
\ No newline at end of file
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
setTimeout(function(){ setTimeout(function(){
$(".progress-bar").css("width", "100%"); $(".progress-bar").css("width", "100%");
$(".logo-overlay-loader").fadeOut(); $(".logo-overlay-loader").fadeOut();
$("body").css("overflow", "visible");
}, 600); }, 600);
setTimeout(function(){ setTimeout(function(){
$(".social-animation").removeClass("social-animation"); $(".social-animation").removeClass("social-animation");
...@@ -94,6 +95,7 @@ MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ['\\(','\\)']] } }); ...@@ -94,6 +95,7 @@ MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ['\\(','\\)']] } });
{{ end }} {{ end }}
<!-- do not run on news page --> <!-- do not run on news page -->
<script> <script>
$("body").css("overflow", "hidden");
addBackToTop({ addBackToTop({
diameter: 56, diameter: 56,
backgroundColor: '#44883C', backgroundColor: '#44883C',
......
...@@ -29,6 +29,12 @@ function postTypeButtons() { ...@@ -29,6 +29,12 @@ function postTypeButtons() {
return postTypeButtons return postTypeButtons
} }
function stopModal(el) {
$(el).on('click', function (e) {
e.stopPropagation();
});
}
$(".section .container").prepend(postTypeButtons()); $(".section .container").prepend(postTypeButtons());
$('#news-grid').isotope({ $('#news-grid').isotope({
...@@ -133,7 +139,7 @@ function feedreader(url) { ...@@ -133,7 +139,7 @@ function feedreader(url) {
} }
} }
function buildArticleTemplate(el, img, date, title, shortText) { function buildArticleTemplate(el, img, date, title, shortText, link) {
var $article = $(` var $article = $(`
<article id='unique` + el + `' class='blog-post zoom grid-item col-md-6 col-xl-4 ml-auto mr-auto ` + detectPostTypeByTitle(title) + `'> <article id='unique` + el + `' class='blog-post zoom grid-item col-md-6 col-xl-4 ml-auto mr-auto ` + detectPostTypeByTitle(title) + `'>
...@@ -149,7 +155,15 @@ function feedreader(url) { ...@@ -149,7 +155,15 @@ function feedreader(url) {
<span class="date">` + date + `</date> <span class="date">` + date + `</date>
</div> </div>
<h5 class="card-title">` + title + `</h5> <h5 class="card-title">` + title + `</h5>
<div class="card-body " data-background-color="black"> <div class="card-body " data-background-color="black">
<div id="content" class="social-icons-top">
<a onclick="$(this).attr('href');" data-toggle="tooltip" data-placement="top" title="Share" href="https://twitter.com/intent/tweet?via=ManjaroLinux&hashtags=Manjaro,Linux&text=` + title + `&url=` + link + `" target="_blank" class="btn btn-icon btn-round twitter">
<i class="fab fa-twitter"></i>
</a>
<a onclick="" data-toggle="tooltip" data-placement="top" title="Share" href="https://www.facebook.com/sharer/sharer.php?u=` + link + `" target="_blank" class="btn btn-icon btn-round facebook">
<i class="fab fa-facebook-f"></i>
</a>
</div>
<p class="card-text">` + shortText + `</p> <p class="card-text">` + shortText + `</p>
</div> </div>
</div> </div>
...@@ -184,7 +198,7 @@ function feedreader(url) { ...@@ -184,7 +198,7 @@ function feedreader(url) {
$("#news-grid").isotope( "insert", buildArticleTemplate(el, img, item.date, item.title, shortText, item.link) );//.isotope( 'reloadItems' ).isotope({ sortBy: 'original-order' }); $("#news-grid").isotope( "insert", buildArticleTemplate(el, img, item.date, item.title, shortText, item.link) );//.isotope( 'reloadItems' ).isotope({ sortBy: 'original-order' });
$("#news-grid").append(buildModalTemplate(el, item.title, item.description)); $("#news-grid").append(buildModalTemplate(el, item.title, item.description));
stopModal($('#unique' + el + ' .social-icons-top a'));
$('#' + el + ' .modal-body').find(".meta").remove(); $('#' + el + ' .modal-body').find(".meta").remove();
$('#' + el + ' .modal-body').find(".poll").remove(); $('#' + el + ' .modal-body').find(".poll").remove();
$('#' + el + ' .modal-body').find("p:contains('Posts:')").remove(); $('#' + el + ' .modal-body').find("p:contains('Posts:')").remove();
...@@ -233,8 +247,7 @@ setTimeout(function(){ ...@@ -233,8 +247,7 @@ setTimeout(function(){
setTimeout(function(){ setTimeout(function(){
$(".logo-overlay-loader").fadeOut(); $(".logo-overlay-loader").fadeOut();
$("body").css("overflow", "visible");
$("#news-grid").isotope("reloadItems").isotope({ sortBy: 'original-order' }); $("#news-grid").isotope("reloadItems").isotope({ sortBy: 'original-order' });
}, 3000); }, 3000);
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment