diff --git a/.gitignore b/.gitignore
index d50c29e..258a175 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
web/bundles/
web/HtmlMockups
web/uploads/*
+web/css/*
app/config/parameters.yml
app/bootstrap*
app/cache/*
diff --git a/app/config/config.yml b/app/config/config.yml
index 3097e9f..e74f072 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -42,8 +42,8 @@ assetic:
yui_js:
jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar
less:
- node: /usr/local/bin/node
- node_paths: [/usr/local/lib/node_modules]
+ node: %node%/usr/local/bin/node
+ node_paths: %node_paths%[/usr/local/lib/node_modules]
# Doctrine Configuration
doctrine:
diff --git a/src/SFM/PicmntBundle/Resources/public/less/general.less b/src/SFM/PicmntBundle/Resources/public/less/general.less
new file mode 100644
index 0000000..b60fe89
--- /dev/null
+++ b/src/SFM/PicmntBundle/Resources/public/less/general.less
@@ -0,0 +1,120 @@
+body {
+ background: whiteSmoke;
+ font-family: 'Libre Baskerville', serif;
+ /* font-family: "Nimbus Roman No9 L", Sans, serif; */
+ font-size: 14px;
+}
+
+.picmnt-title a{
+ font-size: 6em;
+ color: rgba(0, 0, 0, 0.19);
+ text-decoration: none !important;
+}
+
+h1 {
+ font-weight: normal !important;
+}
+
+#image-section {
+ padding-top: 30px;
+}
+
+#image-section img, #image-section canvas {
+ margin-left: 20px;
+ border: 10px solid white;
+ border-radius: 8px;
+ box-shadow: 5px 5px 10px #333;
+ -webkit-box-shadow: 5px 5px 10px #333;
+ -moz-box-shadow: 5px 5px 10px #333;
+}
+
+#image-title {
+ margin-top: 0;
+ font-size: 3em;
+}
+
+.image-extra-info {
+ margin-top: -20px;
+ padding-left: 2em;
+}
+
+#image-info p {
+ padding-bottom: 10px;
+}
+
+#separator {
+ margin: 60px auto 10px auto;
+ width: 960px;
+}
+
+
+
+/* COMMENTS */
+
+#comments-title {
+ text-align: center;
+}
+
+#comment-form .textarea {
+ height: 150px;
+ width: 400px;
+ resize: none;
+}
+
+#comments {
+ margin-top: 50px;
+}
+
+#comments h3 {
+ text-align: center;
+}
+
+.comment hr {
+ margin-top: 20px;
+}
+
+.comment {
+ margin-top: 30px;
+ margin-bottom: 30px;
+}
+
+.comment-text {
+ margin-top: -10px;
+ padding-left: 2em;
+}
+
+#image-comment img, #image-comment canvas {
+ top: 10px;
+ display: none;
+ position: fixed;
+ border: 10px solid white;
+ border-radius: 8px;
+ box-shadow: 5px 5px 10px #333;
+ -webkit-box-shadow: 5px 5px 10px #333;
+ -moz-box-shadow: 5px 5px 10px #333;
+}
+
+.link-to-comment {
+ float: right;
+}
+
+
+
+/* HEADER */
+#login-menu {
+ font-size: 0.8em;
+ margin-top: 2em;
+ text-align: right;
+}
+
+#login-menu ul {
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+ text-align: center;
+}
+
+#login-menu ul li {
+ display: inline;
+ float:right;
+}
diff --git a/src/SFM/PicmntBundle/Resources/public/stylesheets/picmnt.css b/src/SFM/PicmntBundle/Resources/public/stylesheets/picmnt.css
index 560914f..b60fe89 100644
--- a/src/SFM/PicmntBundle/Resources/public/stylesheets/picmnt.css
+++ b/src/SFM/PicmntBundle/Resources/public/stylesheets/picmnt.css
@@ -47,6 +47,8 @@ h1 {
width: 960px;
}
+
+
/* COMMENTS */
#comments-title {
@@ -81,6 +83,24 @@ h1 {
padding-left: 2em;
}
+#image-comment img, #image-comment canvas {
+ top: 10px;
+ display: none;
+ position: fixed;
+ border: 10px solid white;
+ border-radius: 8px;
+ box-shadow: 5px 5px 10px #333;
+ -webkit-box-shadow: 5px 5px 10px #333;
+ -moz-box-shadow: 5px 5px 10px #333;
+}
+
+.link-to-comment {
+ float: right;
+}
+
+
+
+/* HEADER */
#login-menu {
font-size: 0.8em;
margin-top: 2em;
@@ -98,18 +118,3 @@ h1 {
display: inline;
float:right;
}
-
-#image-comment img, #image-comment canvas {
- top: 10px;
- display: none;
- position: fixed;
- border: 10px solid white;
- border-radius: 8px;
- box-shadow: 5px 5px 10px #333;
- -webkit-box-shadow: 5px 5px 10px #333;
- -moz-box-shadow: 5px 5px 10px #333;
-}
-
-.link-to-comment {
- float: right;
-}
\ No newline at end of file
diff --git a/src/SFM/PicmntBundle/Resources/views/Image/viewImageNew.html.twig b/src/SFM/PicmntBundle/Resources/views/Image/viewImageNew.html.twig
index 4f9d6f3..034f75d 100644
--- a/src/SFM/PicmntBundle/Resources/views/Image/viewImageNew.html.twig
+++ b/src/SFM/PicmntBundle/Resources/views/Image/viewImageNew.html.twig
@@ -7,9 +7,17 @@
{% block stylesheet %}
-
-
-
+
+ {% stylesheets filter='?yui_css' output='css/libs.css'
+ '@SFMPicmntBundle/Resources/public/stylesheets/fluid_grid.css' %}
+
+ {% endstylesheets %}
+
+ {% stylesheets filter='less, ?yui_css' output='css/picmnt.css'
+ '@SFMPicmntBundle/Resources/public/less/general.less' %}
+
+ {% endstylesheets %}
+
{% endblock stylesheet %}