diff --git a/app/conf/nginx.conf.template b/app/conf/nginx.conf.template
index 41c927c..de8bf3b 100644
--- a/app/conf/nginx.conf.template
+++ b/app/conf/nginx.conf.template
@@ -6,6 +6,27 @@ server {
return 404;
}
+server {
+ listen 80;
+ server_name zuykov.ru www.zuykov.ru;
+ return 301 http://zuykov.com/ru$request_uri;
+
+ location /robots.txt {
+ alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt;
+ }
+}
+
+server {
+ listen 80;
+ server_name www.zuykov.com;
+ return 301 http://zuykov.com$request_uri;
+
+ location /robots.txt {
+ alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt;
+ }
+}
+
+
server {
listen 80;
server_name dev.zuykov.com;
@@ -13,6 +34,10 @@ server {
client_max_body_size 1024M;
+ location /robots.txt {
+ alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static/robots.txt;
+ }
+
location /static {
alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static;
}
diff --git a/blog/templates/blog/plugins/latest_entries.html b/blog/templates/blog/plugins/latest_entries.html
index ebd5439..f267c3c 100644
--- a/blog/templates/blog/plugins/latest_entries.html
+++ b/blog/templates/blog/plugins/latest_entries.html
@@ -4,7 +4,7 @@
{% for post in posts_list %}
{{ post.title }}
- {{ post.date_published|date:"DATE_FORMAT" }}
+ {{ post.date_published|date:"DATE_FORMAT" }}
{% empty %}
{% trans "No article found." %}
diff --git a/zsite/static/less/blog.less b/zsite/static/less/blog.less
index 33d323d..c1138e2 100644
--- a/zsite/static/less/blog.less
+++ b/zsite/static/less/blog.less
@@ -4,6 +4,12 @@
}
}
+.date {
+ color: #333;
+ letter-spacing: .12em;
+ text-transform: uppercase;
+}
+
.plugin-blog-category-cases {
.make-row();
@@ -15,6 +21,12 @@
font-size: 12px;
vertical-align: top;
+
+ .date {
+ font-size: 10px;
+
+ margin-top: 2px;
+ }
}
}
@@ -51,5 +63,9 @@ article {
p {
margin-bottom: 15px;
}
+
+ .date {
+ font-size: 11px;
+ }
}
}
diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less
index 707c7cf..3dfd246 100644
--- a/zsite/static/less/header.less
+++ b/zsite/static/less/header.less
@@ -11,6 +11,10 @@
.make-sm-column(4);
.make-xs-column(4);
+ a {
+ border: 0;
+ }
+
.slogan {
position: absolute;
top: 58px;
@@ -134,8 +138,9 @@
// margin-right: 50px;
// }
- a {
+ a, a:hover, a:active {
text-decoration: underline;
+ border-bottom: 0;
}
}
diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less
index 0a9b2c8..583696a 100644
--- a/zsite/static/less/main.less
+++ b/zsite/static/less/main.less
@@ -30,6 +30,23 @@
@import 'nice.less';
+
+a, a:hover, a:active {
+ text-decoration: none;
+
+ border-bottom: 1px solid;
+
+}
+
+a {
+ border-color: rgba(51, 122, 183, 0.3);
+}
+
+a:hover {
+ border-color: lighten(@link-hover-color, 40%);
+}
+
+
h1 {
font-weight: 600;
}
diff --git a/zsite/static/less/people.less b/zsite/static/less/people.less
index 9a44780..8043a8b 100644
--- a/zsite/static/less/people.less
+++ b/zsite/static/less/people.less
@@ -1,4 +1,6 @@
.plugin-people {
+
+
.people-detail-visual {
margin-top: 20px;
@@ -36,6 +38,10 @@
position: relative;
z-index: -2;
}
+
+ a, a:hover, a:active {
+ border: 0;
+ }
}
.people-visual:before {
diff --git a/zsite/static/less/sub_content.less b/zsite/static/less/sub_content.less
index ce413b6..b0a1fa8 100644
--- a/zsite/static/less/sub_content.less
+++ b/zsite/static/less/sub_content.less
@@ -56,6 +56,8 @@
color: #000000;
text-decoration: none;
+
+ border: 0;
}
}
}
diff --git a/zsite/static/less/variables.less b/zsite/static/less/variables.less
index eff1ddc..36089c7 100644
--- a/zsite/static/less/variables.less
+++ b/zsite/static/less/variables.less
@@ -1,3 +1,49 @@
+
+
+//
+// Variables
+// --------------------------------------------------
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+@gray-base: #000;
+@gray-darker: lighten(@gray-base, 13.5%); // #222
+@gray-dark: lighten(@gray-base, 20%); // #333
+@gray: lighten(@gray-base, 33.5%); // #555
+@gray-light: lighten(@gray-base, 46.7%); // #777
+@gray-lighter: lighten(@gray-base, 93.5%); // #eee
+
+@brand-primary: darken(#428bca, 6.5%); // #337ab7
+@brand-success: #5cb85c;
+@brand-info: #5bc0de;
+@brand-warning: #f0ad4e;
+@brand-danger: #d9534f;
+
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for ``.
+@body-bg: #fff;
+//** Global text color on ``.
+@text-color: @gray-dark;
+
+//** Global textual link color.
+@link-color: @brand-primary;
+//** Link hover color set via `darken()` function.
+@link-hover-color: #AB4545;
+//** Link hover decoration.
+@link-hover-decoration: underline;
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
@font-family-sans-serif: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: 'Roboto Slab', Menlo, Monaco, Consolas, "Courier New", monospace;
@@ -26,3 +72,799 @@
@headings-font-weight: 500;
@headings-line-height: 1.1;
@headings-color: inherit;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+@icon-font-path: "../fonts/";
+//** File name for all font files.
+@icon-font-name: "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id: "glyphicons_halflingsregular";
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical: 6px;
+@padding-base-horizontal: 12px;
+
+@padding-large-vertical: 10px;
+@padding-large-horizontal: 16px;
+
+@padding-small-vertical: 5px;
+@padding-small-horizontal: 10px;
+
+@padding-xs-vertical: 1px;
+@padding-xs-horizontal: 5px;
+
+@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small: 1.5;
+
+@border-radius-base: 4px;
+@border-radius-large: 6px;
+@border-radius-small: 3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color: #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg: @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base: 4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large: 5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for ``s and ` | `s.
+@table-cell-padding: 8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding: 5px;
+
+//** Default background color used for all tables.
+@table-bg: transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent: #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover: #f5f5f5;
+@table-bg-active: @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color: #ddd;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight: normal;
+
+@btn-default-color: #333;
+@btn-default-bg: #fff;
+@btn-default-border: #ccc;
+
+@btn-primary-color: #fff;
+@btn-primary-bg: @brand-primary;
+@btn-primary-border: darken(@btn-primary-bg, 5%);
+
+@btn-success-color: #fff;
+@btn-success-bg: @brand-success;
+@btn-success-border: darken(@btn-success-bg, 5%);
+
+@btn-info-color: #fff;
+@btn-info-bg: @brand-info;
+@btn-info-border: darken(@btn-info-bg, 5%);
+
+@btn-warning-color: #fff;
+@btn-warning-bg: @brand-warning;
+@btn-warning-border: darken(@btn-warning-bg, 5%);
+
+@btn-danger-color: #fff;
+@btn-danger-bg: @brand-danger;
+@btn-danger-border: darken(@btn-danger-bg, 5%);
+
+@btn-link-disabled-color: @gray-light;
+
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base: @border-radius-base;
+@btn-border-radius-large: @border-radius-large;
+@btn-border-radius-small: @border-radius-small;
+
+
+//== Forms
+//
+//##
+
+//** `` background color
+@input-bg: #fff;
+//** `` background color
+@input-bg-disabled: @gray-lighter;
+
+//** Text color for ``s
+@input-color: @gray;
+//** `` border color
+@input-border: #ccc;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on ` |