Browse Source

moved olf js to separate folder, combined js files to one

dev
Clemens Richter 8 years ago
parent
commit
ef8bf24dba
  1. 9
      user/themes/church/build.sh
  2. 2
      user/themes/church/css/bootstrap-critical-trim.css
  3. 17
      user/themes/church/css/footer-lazy.css
  4. 0
      user/themes/church/js/deobfuscate-href.js
  5. 0
      user/themes/church/js/old/bootstrap-native-all.js
  6. 0
      user/themes/church/js/old/bootstrap-native-collapse.js
  7. 0
      user/themes/church/js/old/bootstrap-native-dropdown.js
  8. 0
      user/themes/church/js/old/bootstrap-native.min.js
  9. 0
      user/themes/church/js/old/bootstrap.js
  10. 0
      user/themes/church/js/old/bootstrap.min.js
  11. 0
      user/themes/church/js/old/html5shiv-printshiv.min.js
  12. 0
      user/themes/church/js/old/modernizr.custom.71422.js
  13. 0
      user/themes/church/js/old/singlePageNav.min.js
  14. 16
      user/themes/church/templates/partials/base.html.twig

9
user/themes/church/minify.sh → user/themes/church/build.sh

@ -6,4 +6,13 @@ yui-compressor css/css-only-navigation-inline.css > css/css-only-navigation-inli
yui-compressor css/css-only-navigation-lazy.css > css/css-only-navigation-lazy.min.css
yui-compressor css/css-only-lightbox-inline.css > css/css-only-lightbox-inline.min.css
yui-compressor css/css-only-lightbox-lazy.css > css/css-only-lightbox-lazy.min.css
yui-compressor css/footer-lazy.css > css/footer-lazy.min.css
#yui-compressor js/deobfuscate-href.js -o js/deobfuscate-href.min.js
#yui-compressor js/navbar-keyboard-interaction.js -o js/navbar-keyboard-interaction.min.js
rm css/all-lazy.min.css
cat css/*-lazy.min.css > css/all-lazy.min.css
rm js/all.min.js
cat js/*.js > js/all.min.js #compressor not working
#cat js/*.min.js > js/all.min.js

2
user/themes/church/css/bootstrap-critical-trim.css vendored

@ -383,7 +383,7 @@ ul ul {
/*override bootstraps default column ordering -> sidebar on left moves down on small screen*/
@media (min-width: 768px){
.blog-main {
float: right;
float: right !important;
}
}
/*spam protection in mailto links*/

17
user/themes/church/css/bapho.css → user/themes/church/css/footer-lazy.css

@ -1,20 +1,3 @@
/*override bootstraps default column ordering -> sidebar on left moves down on small screen*/
@media (min-width: 768px){
.blog-main {
float: right;
}
}
/*custom content style*/
//for spam protection in mailto links // doesn't work for some reason
span.displaynone { display:none; }
//for list in links page
ul{list-style: none;}
.shiftRight
{
margin-left: 40px;
}
/*footer stuff*/
#footer
{

0
user/themes/church/js/custom.js → user/themes/church/js/deobfuscate-href.js

0
user/themes/church/js/bootstrap-native-all.js → user/themes/church/js/old/bootstrap-native-all.js vendored

0
user/themes/church/js/bootstrap-native-collapse.js → user/themes/church/js/old/bootstrap-native-collapse.js vendored

0
user/themes/church/js/bootstrap-native-dropdown.js → user/themes/church/js/old/bootstrap-native-dropdown.js vendored

0
user/themes/church/js/bootstrap-native.min.js → user/themes/church/js/old/bootstrap-native.min.js vendored

0
user/themes/church/js/bootstrap.js → user/themes/church/js/old/bootstrap.js vendored

0
user/themes/church/js/bootstrap.min.js → user/themes/church/js/old/bootstrap.min.js vendored

0
user/themes/church/js/html5shiv-printshiv.min.js → user/themes/church/js/old/html5shiv-printshiv.min.js vendored

0
user/themes/church/js/modernizr.custom.71422.js → user/themes/church/js/old/modernizr.custom.71422.js vendored

0
user/themes/church/js/singlePageNav.min.js → user/themes/church/js/old/singlePageNav.min.js vendored

16
user/themes/church/templates/partials/base.html.twig

@ -52,15 +52,8 @@
{% block bottom %}{% endblock %}
{% block javascripts %}
{# do assets.add('jquery', 101) #}
{# do assets.add('theme://js/modernizr.custom.71422.js', 100) #}
{% do assets.add('theme://js/custom.js', 99) %}
{% do assets.add('theme://js/navbar-keyboard-interaction.js', 99) %}
{# do assets.add('theme://js/bootstrap.min.js', 100) #}
{% if browser.getBrowser == 'msie' and browser.getVersion >= 8 and browser.getVersion <= 9 %}
{% do assets.add('https://oss.maxcdn.com/respond/1.4.2/respond.min.js') %}
{% do assets.add('theme://js/html5shiv-printshiv.min.js') %}
{% endif %}
{% do assets.add('theme://js/all.min.js', 99) %}
{% endif %}
{% endblock %}
{{ assets.js() }}
@ -68,10 +61,7 @@
<noscript id="deferred-styles">
{% block stylesheets %}
{% do assets.addCss('theme://css/bootstrap_16px.min.css', 100) %}
{% do assets.addCss('theme://css/bapho.css', 99) %}
{% do assets.addCss('theme://css/css-only-lightbox-lazy.min.css', 99) %}
{% do assets.addCss('theme://css/css-only-navigation-lazy.min.css', 101) %}
{# do assets.add('theme://css/font-awesome.min.css',99) #}
{% do assets.addCss('theme://css/all-lazy.min.css', 101) %}
{% endblock %}
{{ assets.css() }}
</noscript>

Loading…
Cancel
Save