Merge branch 'master' into swift-ansible-configurator, updating nginx…

… config in Ansible app
anechka · Mar 7, 2016 · 711146c · 711146c
2 parents 1adaf4d + a11dcee
commit 711146c
Show file tree

Hide file tree

Showing 86 changed files with 3,403 additions and 748 deletions.
diff --git a/css/main.css b/css/main.css
@@ -7,19 +7,27 @@
 }
 
 BODY {
+    background: url("../images/background-hd.jpg");
     background-size: cover;
-    background-color: #031b43; color: white;
+    background-color: #031b43;
+
+    color: white;
     overflow-x: hidden;
     overflow-y: auto;
-
 }
 
 .container.image_container .margined-top-div {
     margin-top: 25px;
 }
 
 .container .avatar {
-    top: 20px; position: relative;
+   position: relative;
+}
+
+.img-avatar {
+    border: 4px solid #e5e9ee;
+    box-shadow: 0 0 10px 10px rgba(255, 255, 255, 0.25);
+    margin-top: 30px;
 }
 
 .container span.name-header {
@@ -136,10 +144,12 @@ BODY {
     /*border: #244b80 solid 1px;*/
     -webkit-box-shadow: inset 0 6px 12px rgba(0, 0, 0, 0.255);
     box-shadow: inset 0 6px 12px rgba(0, 0, 0, 0.255);
+    padding-left: 45px;
+    padding-right: 45px;
 }
 
 .content .portfolio-header-div {
-    padding: 0; margin: 15px 0 15px 15px;
+    margin: 15px 0 15px 0;
 }
 
 .content .portfolio-header-div .header {
@@ -195,7 +205,7 @@ BODY {
 }
 
 .content .thumbnail .caption .description-ru-center-block {
-    min-height: 180px;
+    min-height: 200px;
 }
 
 .content .btn-default {
@@ -310,6 +320,7 @@ BODY {
 
 /* Mobile and media */
 @media (max-width: 480px) {
+    BODY {background-size: 100%; background-image: url("../images/background-iphone.jpg")}
 
     .container span.name-header, .container span.email {
         font-size: 2.5em;
@@ -330,12 +341,19 @@ BODY {
 }
 /* iPhone screen / smartphones */
 @media (max-width: 767px) {
+    BODY {
+        background-size: cover;
+        background-image: url("../images/background-ipad.jpg");
+    }
 
     #parallax_container {
         overflow: hidden;
         width: 100%;
     }
 
+    img.cloud_three {
+        opacity: 0.9;
+    }
 
     .show_portfolio_button {
         padding: 10px 35px;
@@ -364,6 +382,12 @@ BODY {
 
 }
 
+@media (max-width: 767px), (min-resolution: 192dpi) {
+    BODY {
+        background-image: url("../images/background-hd.jpg");
+    }
+}
+
 @media (min-width: 768px) and (max-width: 1200px) {
 
     .content .thumbnail .caption  {

diff --git a/css/portfolio/portfolio-index.css b/css/portfolio/portfolio-index.css
@@ -100,6 +100,17 @@ span.portfolio-header {
     vertical-align:top
 }
 
+.images-a-content a:focus {
+    color: #97B5C6;
+    text-decoration: none;
+}
+
+.images-a-content a:focus > button.btn {
+    background-color: #FFF;
+    border-color: #E0EAF0;
+    color: #B0B7BF;
+}
+
 .thumbnail {
     text-align: center;
     padding-top: 15px;
@@ -127,6 +138,12 @@ span.portfolio-header {
     box-shadow: 2px 0px 16px rgba(0, 0, 0, 0.22);
 }
 
+.btn-default:hover {
+    color: #002C4D;
+    background-color: #FFF;
+    border-color: #00d2ff;
+}
+
 .btn-site-link {
     color: #FFF;
     background-color: #00A5FF;