Skip to content

Commit 02df060

Browse files
ntadejntadej
committed
General update
1 parent b68f880 commit 02df060

File tree

12 files changed

+128
-111
lines changed

12 files changed

+128
-111
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.bundle
22
.asset-cache
3+
.jekyll-cache
34
.jekyll-metadata
45
_site/
56
bower_components/

‎Gemfile

+12-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
source 'https://rubygems.org'
22

3-
gem "jekyll"
4-
gem "rake"
5-
6-
gem "pygments.rb"
7-
8-
#
9-
# jekyll-assets plugin itself
10-
#
11-
12-
gem "jekyll-assets"
13-
14-
#
15-
# Additional gems for jekyll-assets
16-
#
17-
18-
gem "therubyracer"
19-
gem "coffee-script" # We want to write our javascripts in CoffeeScript
20-
gem "uglifier" # And we want our javascripts to be minified with UglifyJS
21-
gem "sass" # And we want to write our stylesheets using SCSS/SASS
3+
gem 'rake'
4+
5+
gem 'jekyll'
6+
gem 'jekyll-assets'
7+
8+
gem 'pygments.rb'
9+
gem 'autoprefixer-rails'
10+
gem 'uglifier'
11+
gem 'babel-transpiler'
12+
gem 'sprockets', '~> 4.0.beta', {
13+
require: false
14+
}

‎Gemfile.lock

+86-51
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,118 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.4.0)
5-
coffee-script (2.4.1)
6-
coffee-script-source
4+
activesupport (5.1.4)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
6+
i18n (~> 0.7)
7+
minitest (~> 5.1)
8+
tzinfo (~> 1.1)
9+
addressable (2.5.2)
10+
public_suffix (>= 2.0.2, < 4.0)
11+
autoprefixer-rails (7.2.5)
712
execjs
8-
coffee-script-source (1.10.0)
9-
colorator (0.1)
10-
concurrent-ruby (1.0.2)
13+
babel-source (5.8.35)
14+
babel-transpiler (0.7.0)
15+
babel-source (>= 4.0, < 6)
16+
execjs (~> 2.0)
17+
colorator (1.1.0)
18+
concurrent-ruby (1.0.5)
19+
em-websocket (0.5.1)
20+
eventmachine (>= 0.12.9)
21+
http_parser.rb (~> 0.6.0)
22+
eventmachine (1.2.5)
1123
execjs (2.7.0)
12-
extras (0.1.0)
24+
extras (0.3.0)
1325
forwardable-extended (~> 2.5)
14-
fastimage (2.0.0)
15-
addressable (~> 2)
16-
ffi (1.9.10)
26+
fastimage (2.1.1)
27+
ffi (1.9.18)
1728
forwardable-extended (2.6.0)
18-
jekyll (3.1.6)
19-
colorator (~> 0.1)
29+
http_parser.rb (0.6.0)
30+
i18n (0.9.3)
31+
concurrent-ruby (~> 1.0)
32+
jekyll (3.7.2)
33+
addressable (~> 2.4)
34+
colorator (~> 1.0)
35+
em-websocket (~> 0.5)
36+
i18n (~> 0.7)
2037
jekyll-sass-converter (~> 1.0)
21-
jekyll-watch (~> 1.1)
22-
kramdown (~> 1.3)
23-
liquid (~> 3.0)
38+
jekyll-watch (~> 2.0)
39+
kramdown (~> 1.14)
40+
liquid (~> 4.0)
2441
mercenary (~> 0.3.3)
25-
rouge (~> 1.7)
42+
pathutil (~> 0.9)
43+
rouge (>= 1.7, < 4)
2644
safe_yaml (~> 1.0)
27-
jekyll-assets (2.2.7)
28-
extras (~> 0.1)
45+
jekyll-assets (3.0.7)
46+
activesupport (~> 5.0)
47+
execjs (~> 2.7)
48+
extras (~> 0.2)
2949
fastimage (~> 2.0, >= 1.8)
30-
jekyll (~> 3.1, >= 3.0)
31-
pathutil (>= 0.8)
32-
sprockets (~> 3.3)
33-
jekyll-sass-converter (1.4.0)
50+
jekyll (>= 3.5, < 4.0)
51+
jekyll-sanity (~> 1.2)
52+
liquid-tag-parser (~> 1.0)
53+
nokogiri (~> 1.8)
54+
pathutil (~> 0.16)
55+
sprockets (>= 3.3, < 4.1.beta)
56+
jekyll-sanity (1.2.0)
57+
jekyll (~> 3.1)
58+
jekyll-sass-converter (1.5.1)
3459
sass (~> 3.4)
35-
jekyll-watch (1.4.0)
36-
listen (~> 3.0, < 3.1)
37-
kramdown (1.11.1)
38-
libv8 (3.16.14.15)
39-
liquid (3.0.6)
40-
listen (3.0.8)
60+
jekyll-watch (2.0.0)
61+
listen (~> 3.0)
62+
kramdown (1.16.2)
63+
liquid (4.0.0)
64+
liquid-tag-parser (1.8.0)
65+
extras (~> 0.3)
66+
liquid (>= 3.0, < 5.0)
67+
listen (3.1.5)
4168
rb-fsevent (~> 0.9, >= 0.9.4)
4269
rb-inotify (~> 0.9, >= 0.9.7)
70+
ruby_dep (~> 1.2)
4371
mercenary (0.3.6)
44-
pathutil (0.14.0)
72+
mini_portile2 (2.3.0)
73+
minitest (5.11.3)
74+
multi_json (1.13.1)
75+
nokogiri (1.8.2)
76+
mini_portile2 (~> 2.3.0)
77+
pathutil (0.16.1)
4578
forwardable-extended (~> 2.6)
46-
posix-spawn (0.3.11)
47-
pygments.rb (0.6.3)
48-
posix-spawn (~> 0.3.6)
49-
yajl-ruby (~> 1.2.0)
50-
rack (2.0.1)
51-
rake (11.2.2)
52-
rb-fsevent (0.9.7)
53-
rb-inotify (0.9.7)
54-
ffi (>= 0.5.0)
55-
ref (2.0.0)
56-
rouge (1.11.1)
79+
public_suffix (3.0.1)
80+
pygments.rb (1.2.1)
81+
multi_json (>= 1.0.0)
82+
rack (2.0.4)
83+
rake (12.3.0)
84+
rb-fsevent (0.10.2)
85+
rb-inotify (0.9.10)
86+
ffi (>= 0.5.0, < 2)
87+
rouge (3.1.1)
88+
ruby_dep (1.5.0)
5789
safe_yaml (1.0.4)
58-
sass (3.4.22)
59-
sprockets (3.6.3)
90+
sass (3.5.5)
91+
sass-listen (~> 4.0.0)
92+
sass-listen (4.0.0)
93+
rb-fsevent (~> 0.9, >= 0.9.4)
94+
rb-inotify (~> 0.9, >= 0.9.7)
95+
sprockets (4.0.0.beta6)
6096
concurrent-ruby (~> 1.0)
6197
rack (> 1, < 3)
62-
therubyracer (0.12.2)
63-
libv8 (~> 3.16.14.0)
64-
ref
65-
uglifier (3.0.0)
98+
thread_safe (0.3.6)
99+
tzinfo (1.2.4)
100+
thread_safe (~> 0.1)
101+
uglifier (4.1.5)
66102
execjs (>= 0.3.0, < 3)
67-
yajl-ruby (1.2.1)
68103

69104
PLATFORMS
70105
ruby
71106

72107
DEPENDENCIES
73-
coffee-script
108+
autoprefixer-rails
109+
babel-transpiler
74110
jekyll
75111
jekyll-assets
76112
pygments.rb
77113
rake
78-
sass
79-
therubyracer
114+
sprockets (~> 4.0.beta)
80115
uglifier
81116

82117
BUNDLED WITH
83-
1.12.5
118+
1.16.1

‎Rakefile

-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
require 'fileutils'
22

33
@output = '/var/www/vlc-qt/'
4-
@cdn = '/var/www/cdn/'
5-
@cdn_name = 'vlc-qt'
64

75
task default: %w[serve]
86

@@ -14,12 +12,4 @@ task :deploy do
1412
puts 'Building web page using Jekyll'
1513

1614
puts `JEKYLL_ENV=production bundle exec jekyll build --config _config.yml,_config_deploy.yml --destination #{@output}`
17-
18-
puts ''
19-
puts 'Copying assets and other resources to CDN'
20-
21-
FileUtils.rm_rf("#{@cdn}#{@cdn_name}/")
22-
23-
FileUtils.mkdir("#{@cdn}#{@cdn_name}")
24-
FileUtils.cp_r "#{@output}assets/", "#{@cdn}#{@cdn_name}/assets", :verbose => true
2515
end

‎_assets/stylesheets/_overrides.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ img.inline-image {
126126

127127

128128
.sidebar-offcanvas .logo.vlc-qt {
129-
background: url(asset_path('icons/vlc-qt.png')) no-repeat center;
129+
background: asset_url('icons/vlc-qt.png') no-repeat center;
130130
}
131131

132132
.nav-pills {
@@ -145,7 +145,7 @@ img.inline-image {
145145
only screen and (min-resolution: 144dpi)
146146
{
147147
.sidebar-offcanvas .logo.vlc-qt {
148-
background-image: url(asset_path('icons/[email protected]'));
148+
background-image: asset_url('icons/[email protected]');
149149
background-size: 128px 128px;
150150
}
151151
}

‎_assets/stylesheets/external/_ionicons-font.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
@font-face {
55
font-family: $ionicons-font-family;
6-
src:url(asset_path("Ionicons/fonts/ionicons.eot?v=#{$ionicons-version}"));
7-
src:url(asset_path("Ionicons/fonts/ionicons.eot?v=#{$ionicons-version}#iefix")) format("embedded-opentype"),
8-
url(asset_path("Ionicons/fonts/ionicons.ttf?v=#{$ionicons-version}")) format("truetype"),
9-
url(asset_path("Ionicons/fonts/ionicons.woff?v=#{$ionicons-version}")) format("woff"),
10-
url(asset_path("Ionicons/fonts/ionicons.svg?v=#{$ionicons-version}#Ionicons")) format("svg");
6+
src:asset_url("Ionicons/fonts/ionicons.eot?v=#{$ionicons-version}");
7+
src:asset_url("Ionicons/fonts/ionicons.eot?v=#{$ionicons-version}#iefix") format("embedded-opentype"),
8+
asset_url("Ionicons/fonts/ionicons.ttf?v=#{$ionicons-version}") format("truetype"),
9+
asset_url("Ionicons/fonts/ionicons.woff?v=#{$ionicons-version}") format("woff"),
10+
asset_url("Ionicons/fonts/ionicons.svg?v=#{$ionicons-version}#Ionicons") format("svg");
1111
font-weight: normal;
1212
font-style: normal;
1313
}

‎_config.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@ description: >
88
baseurl: ""
99
url: "https://vlc-qt.tano.si"
1010
main_url: "https://tano.si"
11-
cdn_url: "https://cdn.tano.si/vlc-qt"
1211

1312
# Build settings
1413
production: false
1514
markdown: kramdown
1615
highlighter: pygments
1716
permalink: /:year/:month/:day/:title/
18-
exclude: [bower_components, Gemfile, Gemfile.lock, LICENSE.md, Rakefile, README.md, src, vendor]
17+
exclude: [bower_components, etc, Gemfile, Gemfile.lock, LICENSE.md, Rakefile, README.md, src, vendor]
18+
19+
plugins:
20+
- jekyll-assets
1921

2022
assets:
21-
cache: false
23+
cache: .asset-cache
2224
compress:
2325
css: true
2426
js: true

‎_config_deploy.yml

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
# Build settings
22
production: true
3-
4-
assets:
5-
cdn: "//cdn-direct.tano.si/vlc-qt/"
6-
cache: .asset-cache

‎_includes/favicons.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<link rel="shortcut icon" sizes="196x196" href="{% asset_path favicon/196.png %}" />
1+
<link rel="shortcut icon" sizes="196x196" href="{% asset favicon/196.png %}" />
22
<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 48x48 64x64" type="image/vnd.microsoft.icon">
3-
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="{% asset_path favicon/Icon_57-precomposed.png %}">
4-
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% asset_path favicon/Icon_72-precomposed.png %}">
5-
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{% asset_path favicon/Icon_76-precomposed.png %}">
6-
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% asset_path favicon/[email protected] %}">
7-
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{% asset_path favicon/[email protected] %}">
8-
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% asset_path favicon/[email protected] %}">
9-
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{% asset_path favicon/[email protected] %}">
10-
<link rel="apple-touch-icon-precomposed" sizes="180x180" href="{% asset_path favicon/[email protected] %}">
3+
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="{% asset favicon/Icon_57-precomposed.png @path %}">
4+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% asset favicon/Icon_72-precomposed.png @path %}">
5+
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{% asset favicon/Icon_76-precomposed.png @path %}">
6+
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% asset favicon/[email protected] @path %}">
7+
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{% asset favicon/[email protected] @path %}">
8+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% asset favicon/[email protected] @path %}">
9+
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{% asset favicon/[email protected] @path %}">
10+
<link rel="apple-touch-icon-precomposed" sizes="180x180" href="{% asset favicon/[email protected] @path %}">

‎_includes/head.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<title>{% if page.title %}{{ page.title }} - {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
77
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
88

9-
{% javascript external %}
10-
{% javascript main %}
9+
{% asset external.js %}
10+
{% asset main.js %}
1111

1212
<link href="//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic&subset=latin,latin-ext" rel="stylesheet" type="text/css">
1313
<link href="//fonts.googleapis.com/css?family=Alegreya+Sans+SC:300,400,500,700&subset=latin,latin-ext" rel="stylesheet" type="text/css">
1414

15-
{% stylesheet external %}
16-
{% stylesheet main %}
15+
{% asset external.css %}
16+
{% asset main.css %}
1717

1818
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1919
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ " /feed.rss " | prepend: site.baseurl | prepend: site.main_url }}" />

‎_layouts/error.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<link href="//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic&subset=latin,latin-ext" rel="stylesheet" type="text/css">
1212
<link href="//fonts.googleapis.com/css?family=Alegreya+Sans+SC:300,400,500,700&subset=latin,latin-ext" rel="stylesheet" type="text/css">
1313

14-
{% stylesheet external %}
15-
{% stylesheet main %}
14+
{% asset external.css %}
15+
{% asset main.css %}
1616
</head>
1717

1818
<body class="error">

‎bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"dependencies": {
1818
"Skeleton-Sass": "skeleton-scss#*",
1919
"Ionicons": "ionicons#~2.0.1",
20-
"bootstrap": "~4.0.0-alpha",
20+
"bootstrap": "4.0.0-alpha.2",
2121
"js-cookie": "~2.1",
2222
"jquery": "~2.1.4",
2323
"jquery-smooth-scroll": "~1.6"
2424
}
25-
}
25+
}

0 commit comments

Comments
 (0)