Skip to content

Commit

Permalink
- fixed a few typos
Browse files Browse the repository at this point in the history 
- turned it ON!
  • Loading branch information
Cupidr Live committed Feb 10, 2015
1 parent f7d0b54 commit 36d787c
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 25 deletions.
50 changes: 28 additions & 22 deletions views/template.html.twig
View file
Expand Up @@ -8,7 +8,7 @@

<!-- Bootstrap -->
<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet/less" type="text/css" href="/styles.less" />
<link href="/styles.css" rel="stylesheet" type="text/css" />

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
Expand All @@ -20,34 +20,40 @@
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="/bootstrap/js/bootstrap.min.js"></script>

<script src="/js/less.min.js"></script>
<script src="/bootstrap/js/bootstrap.min.js"></script>

<link href='http://fonts.googleapis.com/css?family=Roboto:400,500,300|Raleway:400,700' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,800' rel='stylesheet' type='text/css'>

<meta property="og:image" content="http://cupidr.setfive.com/goslingtext.jpg" />
</head>
<body>

<div role="navigation" class="navbar navbar-default navbar-fixed-top hidden">
<div class="container">
<div class="navbar-header">
<button data-target=".navbar-collapse" data-toggle="collapse" class="navbar-toggle" type="button">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="#" class="navbar-brand">Name Here</a>
<a style="z-index: 10001" href="https://github.com/adatta02/cupidr" target="_blank"><img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10001"
src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>

<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"></a>
</div>
<div class="collapse navbar-collapse">
<div class="logo">
<a href="/"><img src="http://www.setfive.com/images/logo_noconsulting.png"></a>
</div>
<ul class="nav navbar-nav">
<li><a href="http://setfive.com" target="_blank">setfive.com</a></li>
<li><a href="#">|</a></li>
<li><a href="http://www.twitter.com/setfive" target="_blank">@setfive</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
<div class="navbar-collapse collapse navbar-right">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="about.html">About</a></li>
<li><a href="contact.html">Contact</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>

{% block body %}{% endblock body %}
Expand Down
6 changes: 3 additions & 3 deletions web/index.php
View file
Expand Up @@ -19,7 +19,7 @@
$images = [];
foreach( glob(__DIR__ . "/templates/*") as $fn ){

if( strpos($fn, "_small.jpg") !== false ){
if( strpos($fn, "_small.jpg") !== false || strpos($fn, "postcard_back.png") !== false ){
continue;
}

Expand Down Expand Up @@ -60,7 +60,7 @@

$formData = json_decode($rows[0]["form_fields"], true);

$rm = new ImageTool(Config::$LOB_TEST_KEY);
$rm = new ImageTool(Config::$LOB_LIVE_KEY);
$result = $rm->sendPostcard($formData["address"]["to"], $formData["address"]["from"], $urls);

$stmt = $pdo->prepare("UPDATE card SET lob_result = :result, is_sent = true WHERE filename = :filename");
Expand Down Expand Up @@ -115,7 +115,7 @@
->setTo( [ "contact@setfive.com" ] )
->setBody( $email );

if(0){
if(1){
$app['mailer']->send($userMessage);
$app['mailer']->send($message);
}
Expand Down
Binary file added web/logo_noconsulting.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions web/styles.css
View file
Expand Up @@ -226,3 +226,41 @@ h4 {
color: #333;
text-decoration: underline;
}
div.navbar-inverse {
background-color: rgba(3, 3, 3, 0.7);
border-top: 5px solid #000;
border-bottom: 1px solid #000;
}
div.navbar-inverse a {
text-transform: uppercase;
font-family: 'Lato', sans-serif;
font-size: 13px;
font-weight: bold;
}
div.navbar-inverse .navbar-nav {
float: right;
margin: 25px 0 0;
}
div.navbar-inverse .navbar-nav > li {
margin-right: 20px;
}
div.navbar-inverse .navbar-nav > li:last-child {
margin-right: 0px;
}
div.navbar-inverse .navbar-nav > li > a {
color: #fafafa;
padding: 0 0 2px;
}
div.navbar-inverse .navbar-nav > .active > a,
div.navbar-inverse .navbar-nav .active > a:hover,
div.navbar-inverse .navbar-nav .active > a:focus {
background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
border-bottom: 1px solid #000;
}
div.navbar-inverse .navbar-collapse.collapse {
min-height: 65px;
}
div.navbar-inverse .logo {
float: left;
padding-top: 10px;
}
47 changes: 47 additions & 0 deletions web/styles.less
View file
Expand Up @@ -262,4 +262,51 @@ h4 {
color: #333;
text-decoration: underline;
}
}


div.navbar-inverse {

background-color: rgba(3, 3, 3, 0.70);
border-top: 5px solid #000;
border-bottom: 1px solid #000;

a {
text-transform: uppercase;
font-family: 'Lato', sans-serif;
font-size: 13px;
font-weight: bold;
}

.navbar-nav {
float: right;
margin: 25px 0 0;
}

.navbar-nav > li {
margin-right: 20px;
&:last-child {
margin-right: 0px;
}
}

.navbar-nav > li > a {
color: #fafafa;
padding: 0 0 2px;
}

.navbar-nav > .active > a, .navbar-nav .active > a:hover, .navbar-nav .active > a:focus {
background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
border-bottom: 1px solid #000;
}

.navbar-collapse.collapse {
min-height: 65px;
}

.logo {
float: left;
padding-top: 10px;
}

}

0 comments on commit 36d787c

Please sign in to comment.