minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into binarity.cz

Browse Source
This commit is contained in:
Michal Kváček
2016-10-02 23:33:53 +02:00
parent 06c84867ec 8a9543cd2d
commit 33a928febb
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/Gravatar.php
+1 -1
View File
@@ -5,6 +5,6 @@ class Gravatar
{ {
public static function img($email, $size = 50) public static function img($email, $size = 50)
{ {
return "http://www.gravatar.com/avatar/" . md5(strtolower(trim($email))) . "?s=" . $size; return "//www.gravatar.com/avatar/" . md5(strtolower(trim($email))) . "?s=" . $size;
} }
} }
templates/DoucovaniNeratovice/Resources/assets/css/grayscale.css
Vendored
+19 -10
View File
@@ -89,6 +89,10 @@ a:focus {
} }
.navbar-custom a { .navbar-custom a {
color: black;
}
.navbar-custom.top-nav-collapse a {
color: white; color: white;
} }
@@ -99,7 +103,7 @@ a:focus {
} }
.navbar-custom .nav li a:hover { .navbar-custom .nav li a:hover {
color: rgba(255, 255, 255, 0.8); color: rgba(109, 109, 109, 0.8);
outline: none; outline: none;
background-color: transparent; background-color: transparent;
} }
@@ -154,7 +158,7 @@ a:focus {
height: auto; height: auto;
padding: 100px 0; padding: 100px 0;
text-align: center; text-align: center;
color: white; color: black;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: bottom center; background-position: bottom center;
background-attachment: scroll; background-attachment: scroll;
@@ -201,7 +205,7 @@ a:focus {
border: 2px solid white; border: 2px solid white;
border-radius: 100% !important; border-radius: 100% !important;
font-size: 40px; font-size: 40px;
color: white; color: #7F7F7F;
background: transparent; background: transparent;
-webkit-transition: background 0.3s ease-in-out; -webkit-transition: background 0.3s ease-in-out;
-moz-transition: background 0.3s ease-in-out; -moz-transition: background 0.3s ease-in-out;
@@ -211,8 +215,8 @@ a:focus {
.btn-circle:hover, .btn-circle:hover,
.btn-circle:focus { .btn-circle:focus {
outline: none; outline: none;
color: white; color: #000;
background: rgba(255, 255, 255, 0.1); background: rgba(0, 0, 0, 0.1);
} }
.btn-circle i.animated { .btn-circle i.animated {
@@ -320,7 +324,7 @@ footer p {
/****************************/ /****************************/
#kontakt { #kontakt {
background-color: #A1A383; background-color: #DDD;
} }
#o-mne { #o-mne {
@@ -328,7 +332,7 @@ footer p {
} }
#nabizene-doucovani { #nabizene-doucovani {
background-color: #C4C0A9; background-color: #F4F4F4;
} }
.notification { .notification {
@@ -337,7 +341,7 @@ footer p {
top: 5em; top: 5em;
right: 12.5%; right: 12.5%;
width: 75%; width: 75%;
border-radius: 5px;
text-align: center; text-align: center;
line-height: 3em; line-height: 3em;
font-size: 2em; font-size: 2em;
@@ -346,6 +350,11 @@ footer p {
} }
.notification.success { .notification.success {
background: #308424; background: rgba(58, 200, 51, 0.34);
color: white; color: darkgreen;
}
.notification.alert {
background: rgba(200, 79, 0, 0.38);
color: firebrick;
} }
templates/DoucovaniNeratovice/Resources/views/modules/contactform/visitor/default.blade.php
+7 -1
View File
@@ -1,10 +1,16 @@
@if(session('success')) @if(session('success'))
<div class="notification success"> <div class="notification success">
Děkuji za zprávu, ozvu se na uvedený e-mail hned jak to bude možné! Děkuji za zprávu, ozvu se na uvedený e-mail hned jak to bude možné!
</div> </div>
@endif @endif
@if(session('error'))
<div class="notification alert">
Bohužel nebylo možné odeslat zprávu. Pošlete mi to prosím ručně na {{$page->module_settings->contactEmail}}.
Děkuji!
</div>
@endif
<section id="{{$page->url}}" class="container content-section text-center"> <section id="{{$page->url}}" class="container content-section text-center">
<div class="col-lg-8 col-lg-offset-2"> <div class="col-lg-8 col-lg-offset-2">
<h2>{{$page->title}}</h2> <h2>{{$page->title}}</h2>