Skip to content

Commit

Permalink
Now using 3 different css files for the project: core ( html default …
Browse files Browse the repository at this point in the history
…tag styles override ), pagelayout ( css for the general page layout ), content ( specific css for the content area )
  • Loading branch information
thiagocamposviana committed Dec 22, 2013
1 parent c7fc945 commit 852c228
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
Empty file.
Empty file added Resources/public/css/core.css
Empty file.
File renamed without changes.
8 changes: 5 additions & 3 deletions Resources/views/pagelayout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
"bundles/tuteibase/css/bootstrap.min.css"
"bundles/tuteibase/css/font-awesome.min.css"
"bundles/tuteibase/css/lightbox.css"
"bundles/tuteibase/css/project.css"
"bundles/tuteibase/css/core.css"
"bundles/tuteibase/css/pagelayout.css"
"bundles/tuteibase/css/content.css"
filter='cssrewrite' %}
<link rel="stylesheet" href="{{ asset_url }}" />
{% endstylesheets %}
Expand Down Expand Up @@ -135,7 +137,7 @@
'parameters': { 'pathString': location.pathString } } ) ) }}
</aside>
{% endif %}
<section class="col-md-{% if showSideMenu %}9{% else %}12{% endif %}" role="main">
<div class="col-md-{% if showSideMenu %}9{% else %}12{% endif %}">

{% if location.pathString is defined
and location.pathString|split('/')[3] != '' %}
Expand All @@ -147,7 +149,7 @@
{% if location.pathString is defined %}
{{ render( controller( "tutei:showComponent", {'name':'Blocks', 'parameters': { 'pathString': location.pathString } } ) ) }}
{% endif %}
</section>
</div>


</div>
Expand Down

0 comments on commit 852c228

Please sign in to comment.