Skip to content

Commit

Permalink
continue the work
Browse files Browse the repository at this point in the history
  • Loading branch information
Renrhaf committed Jan 17, 2016
1 parent 300b90f commit 8fea77a
Show file tree
Hide file tree
Showing 71 changed files with 3,678 additions and 1,025 deletions.
1 change: 1 addition & 0 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
!var/SymfonyRequirements.php
/vendor/
/web/bundles/
/web/.sass-cache/
5 changes: 5 additions & 0 deletions app/Resources/translations/messages.en.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
menu:
presentation: Presentation
rooms: Our Rooms
reservation: Book & Fees
information: Information
5 changes: 5 additions & 0 deletions app/Resources/translations/messages.fr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
menu:
presentation: Présentation
rooms: Nos Chambres
reservation: Réservation & tarifs
information: Informations pratiques
19 changes: 7 additions & 12 deletions app/Resources/views/base.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,13 @@
<title>{% block title %}Villa Kleber{% endblock %}</title>

{% block all_stylesheets %}
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset('css/reset.css') }}" />
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset('libs/bootstrap/css/bootstrap.min.css') }}">
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset('libs/font-awesome/css/font-awesome.min.css') }}" />
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset('css/styles.css') }}" />
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset('css/header.css') }}" />
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset('css/footer.css') }}" />
<link rel="stylesheet" type="text/css" media="screen" href="{{ asset('css/main.css') }}" />
{% block stylesheets %}{% endblock %}
{% endblock %}

<link href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Open+Sans:400|News+Cycle:400,700|Arapey:400,400italic|Advent+Pro:400,100,200,300,600,500,700|Playfair+Display:400,700,400italic,700italic,900,900italic' rel='stylesheet' type='text/css'>
{% block favicon %}<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />{% endblock %}

<script>
Expand Down Expand Up @@ -48,7 +44,7 @@
<div class="container clearfix">
<h1 id="logo">
<a href="{{ path('homepage') }}">
Villa <span class="second-color">Kleber</span>
Villa <span class="secondary-color">Kleber</span>
</a>
</h1>

Expand All @@ -60,11 +56,10 @@

<nav id="main-menu" class="nav">
<ul class="clearfix">
<li class="first active leaf"><a href="#home" class="active scroll-to-link">Home</a></li>
<li class="leaf"><a href="#gallery" class="active scroll-to-link">Gallerie</a></li>
<li class="leaf"><a href="#rooms" class="active scroll-to-link">Chambre</a></li>
<li class="leaf"><a href="#strasbourg" class="active scroll-to-link">Strasbourg</a></li>
<li class="last leaf"><a href="#contact" class="active scroll-to-link">Contact</a></li>
<li class="first active leaf"><a href="#presentation" class="active scroll-to-link">{{ 'menu.presentation'|trans }}</a></li>
<li class="leaf"><a href="#rooms" class="active scroll-to-link">{{ 'menu.rooms'|trans }}</a></li>
<li class="leaf"><a href="#reservation" class="active scroll-to-link">{{ 'menu.reservation'|trans }}</a></li>
<li class="last leaf"><a href="#information" class="active scroll-to-link">{{ 'menu.information'|trans }}</a></li>
</ul>
</nav>
</div>
Expand Down
825 changes: 163 additions & 662 deletions app/Resources/views/default/index.html.twig

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/config/config.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ imports:
# Put parameters here that don't need to change on each machine where the app is deployed
# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
parameters:
locale: en
locale: fr

framework:
#esi: ~
#translator: { fallbacks: ["%locale%"] }
translator: { fallbacks: ["%locale%"] }
secret: "%secret%"
router:
resource: "%kernel.root_dir%/config/routing.yml"
Expand Down
24 changes: 24 additions & 0 deletions web/config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Require any additional compass plugins here.

# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "css"
sass_dir = "sass"
images_dir = "img"
javascripts_dir = "js"

# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed

# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true

# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false


# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
121 changes: 0 additions & 121 deletions web/css/footer.css

This file was deleted.

Loading

0 comments on commit 8fea77a

Please sign in to comment.