Update JS and travis (#13)
* delete some REANDOM JavaScriptShit * Update JS and sass * improve sassc * edit travis config
This commit is contained in:
L3D
GitHub
parent
7440d1d964
commit
92db927622
6 changed files with 18 additions and 63 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -48,4 +48,7 @@ assets/css/ie9.css.map
|
|||
assets/css/main.min.css.map
|
||||
assets/css/ie9.min.css.map
|
||||
tmp/
|
||||
libsass/
|
||||
sass-spec/
|
||||
sassc/
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ cache:
|
|||
- $HOME/.cache/pip
|
||||
before_install:
|
||||
- git lfs pull
|
||||
- gem install sass
|
||||
- make install-sassc
|
||||
install:
|
||||
- "pip install Lektor"
|
||||
- make sass
|
||||
|
|
|
|||
18
Makefile
18
Makefile
|
|
@ -3,26 +3,24 @@ LEKTOR_SERVER_FLAGS=-h 127.0.0.1
|
|||
all: build
|
||||
|
||||
sass:
|
||||
sass -t compressed ./assets/sass/main.scss ./assets/css/main.min.css
|
||||
sass -t compressed ./assets/sass/ie9.scss ./assets/css/ie9.min.css
|
||||
rm ./assets/css/main.min.css.map
|
||||
rm ./assets/css/ie9.min.css.map
|
||||
./sassc/bin/sassc -t compressed ./assets/sass/main.scss ./assets/css/main.min.css
|
||||
./sassc/bin/sassc -t compressed ./assets/sass/ie9.scss ./assets/css/ie9.min.css
|
||||
lektor clean --yes
|
||||
lektor build
|
||||
|
||||
sass-uncompressed:
|
||||
sass ./assets/sass/main.scss ./assets/css/main.css
|
||||
sass ./assets/sass/ie9.scss ./assets/css/ie9.css
|
||||
rm ./assets/css/main.css.map
|
||||
rm ./assets/css/ie9.css.map
|
||||
./sassc/bin/sassc ./assets/sass/main.scss ./assets/css/main.css
|
||||
./sassc/bin/sassc ./assets/sass/ie9.scss ./assets/css/ie9.css
|
||||
lektor clean --yes
|
||||
lektor build
|
||||
|
||||
install:
|
||||
if hash apt 2>/dev/null; then sudo apt update; sudo apt install imagemagick python3 python3-pip -y; elif hash pacman 2>/dev/null; then sudo pacman -Sy imagemagick python python-pip --noconfirm; elif hash dnf 2>/dev/null; then sudo dnf install -y ImageMagick python3 python3-pip; else echo -e "Please install Imagemagick, Python3 and Pip!"; fi
|
||||
pip install lektor --user
|
||||
gem install sass
|
||||
if hash apt 2>/dev/null; then sudo apt update; sudo apt install imagemagick -y; elif hash pacman 2>/dev/null; then sudo pacman -Sy imagemagick --noconfirm; elif hash dnf 2>/dev/null; then sudo dnf install -y imagemagick; else echo -e "Please install Imagemagick"; fi
|
||||
make install-sassc
|
||||
|
||||
install-sassc:
|
||||
if [ ! -d './sassc' ]; then git clone https://github.com/sass/sassc.git sassc; . sassc/script/bootstrap ; make -C sassc -j4 ; fi
|
||||
|
||||
build: sass
|
||||
lektor build
|
||||
|
|
|
|||
|
|
@ -2,6 +2,10 @@
|
|||
Landed by HTML5 UP
|
||||
html5up.net | @ajlkn
|
||||
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
|
||||
|
||||
"Cleaned" - aka destroyed and rewritten by L3D.
|
||||
<WARNING> L3D does not know how JavaScript works and just deleted some random lines.
|
||||
|
||||
*/
|
||||
|
||||
(function($) {
|
||||
|
|
@ -154,53 +158,6 @@
|
|||
}
|
||||
|
||||
|
||||
// Wrappers.
|
||||
var $wrappers = $('.wrapper');
|
||||
|
||||
$wrappers
|
||||
.each(function() {
|
||||
|
||||
var $this = $(this),
|
||||
on, off;
|
||||
|
||||
on = function() {
|
||||
|
||||
if (skel.canUse('transition')) {
|
||||
|
||||
$this.scrollex({
|
||||
top: 120,
|
||||
bottom: 0,
|
||||
initialize: function(t) { $this.addClass('inactive'); },
|
||||
terminate: function(t) { $this.removeClass('inactive'); },
|
||||
enter: function(t) { $this.removeClass('inactive'); },
|
||||
|
||||
// Uncomment the line below to "rewind" when this wrapper scrolls out of view.
|
||||
|
||||
//leave: function(t) { $this.addClass('inactive'); },
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
off = function() {
|
||||
|
||||
if (skel.canUse('transition'))
|
||||
$this.unscrollex();
|
||||
|
||||
};
|
||||
|
||||
skel.on('change', function() {
|
||||
|
||||
if (skel.breakpoint('medium').active)
|
||||
(off)();
|
||||
else
|
||||
(on)();
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
// Banner.
|
||||
var $banner = $('#banner');
|
||||
|
|
|
|||
|
|
@ -278,9 +278,7 @@ Wenn Sie unsere Kritik an der geplanten Urheberrechtsreform teilen, werden Sie a
|
|||
<script src="{{ '/js/jquery.scrolly.min.js'|asseturl }}"></script>
|
||||
<script src="{{ '/js/jquery.scrollex.min.js'|asseturl }}"></script>
|
||||
<script src="{{ '/js/skel.min.js'|asseturl }}"></script>
|
||||
<script src="{{ '/js/util.js'|asseturl }}"></script>{%
|
||||
block mainjs %}
|
||||
<script src="{{ '/js/main.js'|asseturl }}"></script>{%
|
||||
endblock %}
|
||||
<script src="{{ '/js/util.js'|asseturl }}"></script>
|
||||
<script src="{{ '/js/main.js'|asseturl }}"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
{% block title
|
||||
%}{{ this.title }}{%
|
||||
endblock %}
|
||||
{% block mainjs %}{% endblock %}
|
||||
{% block body %}
|
||||
<section id="four" class="wrapper style1 special fade-up">
|
||||
<div class="container">
|
||||
|
|
|
|||
Loading…
Reference in a new issue