Skip to content

Commit ccda00c

Browse files
committed
Moved web assets to web/ and implemented a pure PHP compression solution for CSS and JS files
1 parent 269991e commit ccda00c

File tree

108 files changed

+128
-9834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+128
-9834
lines changed
Binary file not shown.
Binary file not shown.

app/Resources/assets/fonts/font-awesome/fontawesome-webfont.svg

Lines changed: 0 additions & 565 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-25 KB
Binary file not shown.
Binary file not shown.
-24.9 KB
Binary file not shown.
-24.1 KB
Binary file not shown.

app/Resources/assets/js/jquery-2.1.4.js

Lines changed: 0 additions & 9210 deletions
This file was deleted.

app/Resources/views/base.html.twig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
{% block stylesheets %}
1313
{# uncomment the following lines to compile SCSS assets with Assetic
1414
15-
{% stylesheets output="css/app.css"
16-
"%kernel.root_dir%/Resources/assets/scss/bootstrap.scss"
17-
"%kernel.root_dir%/Resources/assets/scss/font-awesome.scss"
18-
"%kernel.root_dir%/Resources/assets/css/*.css"
19-
"%kernel.root_dir%/Resources/assets/scss/main.scss"
15+
{% stylesheets filter="scssphp" output="css/app.css"
16+
"%kernel.root_dir%/../web/assets/scss/bootstrap.scss"
17+
"%kernel.root_dir%/../web/assets/scss/font-awesome.scss"
18+
"%kernel.root_dir%/../web/assets/css/*.css"
19+
"%kernel.root_dir%/../web/assets/scss/main.scss"
2020
%}
2121
<link rel="stylesheet" href="{{ asset_url }}" />
2222
{% endstylesheets %}
@@ -133,11 +133,11 @@
133133
{% endblock %}
134134

135135
{% block javascripts %}
136-
{# uncomment the following lines to compile JavaScript assets with Assetic
137-
{% javascripts output="js/app.js"
138-
"%kernel.root_dir%/Resources/assets/js/jquery-2.1.4.min.js"
139-
"%kernel.root_dir%/Resources/assets/js/bootstrap-3.3.4.min.js"
140-
"%kernel.root_dir%/Resources/assets/js/highlight.pack.js" %}
136+
{# uncomment the following lines to combine and minimize JavaScript assets with Assetic
137+
{% javascripts filter="jsqueeze" output="js/app.js"
138+
"%kernel.root_dir%/../web/assets/js/jquery-2.1.3.js"
139+
"%kernel.root_dir%/../web/assets/js/bootstrap-3.3.4.js"
140+
"%kernel.root_dir%/../web/assets/js/highlight.pack.js" %}
141141
<script src="{{ asset_url }}"></script>
142142
{% endjavascripts %}
143143
#}

app/config/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ assetic:
5050
debug: "%kernel.debug%"
5151
use_controller: false
5252
bundles: [ ]
53-
#java: /usr/bin/java
5453
filters:
5554
cssrewrite: ~
56-
sass:
57-
bin: "/usr/bin/sass"
58-
apply_to: "\.scss$"
55+
jsqueeze: ~
56+
scssphp:
57+
# the formatter must be the FQCN (don't use the 'compressed' value)
58+
formatter: "Leafo\\ScssPhp\\Formatter\\Compressed"
5959

6060
# Doctrine Configuration (used to access databases and manipulate their information)
6161
doctrine:

composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"erusev/parsedown" : "~1.5",
1616
"incenteev/composer-parameter-handler" : "~2.0",
1717
"ircmaxell/password-compat" : "~1.0",
18+
"leafo/scssphp" : "~0.1.",
19+
"patchwork/jsqueeze" : "~1.0",
1820
"sensio/distribution-bundle" : "~3.0.12",
1921
"sensio/framework-extra-bundle" : "~3.0",
2022
"symfony/assetic-bundle" : "~2.3",

composer.lock

Lines changed: 103 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.

web/css/app.css

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6988,10 +6988,6 @@ code {
69886988
background: #ecf0f1;
69896989
color: #2c3e50; }
69906990

6991-
.text-danger,
6992-
.text-danger:hover {
6993-
color: #e74c3c; }
6994-
69956991
i {
69966992
margin-right: .25em; }
69976993

@@ -7039,35 +7035,13 @@ footer {
70397035
margin-bottom: 2em;
70407036
padding: 0; }
70417037

7042-
.form-group.has-error .form-control {
7043-
border-color: #e74c3c; }
7044-
7045-
.form-group.has-error .control-label {
7046-
color: #e74c3c; }
7047-
7048-
.form-group.has-error .help-block {
7049-
background-color: #e74c3c;
7038+
.form-error ul {
70507039
color: #FFF;
7051-
font-size: 15px;
7052-
padding: 1em; }
7053-
.form-group.has-error .help-block ul {
7054-
margin-bottom: 0; }
7040+
margin-bottom: 0; }
70557041

70567042
body#homepage {
70577043
text-align: center; }
70587044

7059-
body#login #login-users-help p {
7060-
font-size: 15px;
7061-
line-height: 1.42857; }
7062-
body#login #login-users-help p:last-child {
7063-
margin-bottom: 0; }
7064-
body#login #login-users-help p .label {
7065-
margin-right: 5px; }
7066-
body#login #login-users-help p .console {
7067-
display: block;
7068-
margin: 5px 0;
7069-
padding: 10px; }
7070-
70717045
body#blog_index h1 {
70727046
margin-bottom: .5em; }
70737047
body#blog_index article.post {
@@ -7091,9 +7065,5 @@ body#blog_post_show .post-comment {
70917065
display: block; }
70927066

70937067
body#comment_form_error h1.text-danger {
7094-
margin-bottom: 1em; }
7095-
7096-
body#admin_post_index .item-actions {
7097-
white-space: nowrap; }
7098-
body#admin_post_index .item-actions a.btn + a.btn {
7099-
margin-left: 4px; }
7068+
color: #E74C3C;
7069+
margin-bottom: 1em; }

web/js/app.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)