merge to master
This commit is contained in:
Joe
4
.gitattributes
vendored
Normal file
4
.gitattributes
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
*.js filter=dater
|
||||
*.html filter=dater
|
||||
*.txt ident
|
||||
date*.txt filter=dater
|
||||
BIN
.index.html.un~
Normal file
BIN
.index.html.un~
Normal file
Binary file not shown.
@@ -65,6 +65,18 @@ span.expanded {
|
||||
border-bottom-right-radius: 0px;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-nav>li.visible-xs>a{
|
||||
background-color:#999999;
|
||||
width:100%;
|
||||
height: 50px;
|
||||
top:0px;
|
||||
vertical-align: bottom;
|
||||
text-align:center;
|
||||
color:#000000;
|
||||
border-radius: 0px;
|
||||
}
|
||||
|
||||
|
||||
.navbar-default .navbar-nav>li>a:hover{
|
||||
background-color: #666b75;
|
||||
text-emphasis: bold;
|
||||
|
||||
4
dateHook.sh
Executable file
4
dateHook.sh
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
lastDate=$(git log --pretty=format:"%ad" -1)
|
||||
sed -e "s/\$Date.*\\$/$Date: ${lastDate} $/"
|
||||
1
date_test.txt
Normal file
1
date_test.txt
Normal file
@@ -0,0 +1 @@
|
||||
## $Date$
|
||||
1
date_test2.txt
Normal file
1
date_test2.txt
Normal file
@@ -0,0 +1 @@
|
||||
## $Date$
|
||||
4
expand_date
Executable file
4
expand_date
Executable file
@@ -0,0 +1,4 @@
|
||||
#! /usr/bin/env ruby
|
||||
data = STDIN.read
|
||||
last_date = `git log --pretty=format:"%ad" -1`
|
||||
puts data.gsub('$Date$', '$Date: ' + last_date.to_s + '$')
|
||||
48
index.html~
Normal file
48
index.html~
Normal file
@@ -0,0 +1,48 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
|
||||
<title>I Buy Properties</title>
|
||||
|
||||
|
||||
<!-- favicons -->
|
||||
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||
<link rel="apple-touch-icon-precomposed" href="img/home-152-177.png">
|
||||
<meta name="msapplication-TileColor" content="#ffffff" />
|
||||
<meta name="msapplication-TileImage" content="img/home-144-177.png">
|
||||
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="img/home-152-177.png">
|
||||
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="img/home-144-177.png">
|
||||
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="img/home-120-177.png">
|
||||
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="img/home-114-177.png">
|
||||
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="img/home-72-177.png">
|
||||
<link rel="apple-touch-icon-precomposed" href="img/home-57-177.png">
|
||||
<link rel="icon" href="img/home-32-177.png" sizes="32x32">
|
||||
|
||||
|
||||
<!-- Bootstrap -->
|
||||
<link href="css/bootstrap.min.css" rel="stylesheet">
|
||||
|
||||
<!-- 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:// -->
|
||||
<!--[if lt IE 9]>
|
||||
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
<link rel="stylesheet" href="./css/mainStyle.css" />
|
||||
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
|
||||
<script src="js/bootstrap.min.js"></script>
|
||||
<script src="js/handlebars-v4.0.5.js"></script>
|
||||
<script src="js/main.js"></script>
|
||||
<script src="js/router.js"></script>
|
||||
<script src="js/templates.js"></script>
|
||||
<script src="js/templateHelper.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="content"></div>
|
||||
EDGE3
|
||||
</body>
|
||||
</html>
|
||||
@@ -24,26 +24,19 @@
|
||||
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav">
|
||||
<li class="topNavmainScreen topNavHome active"><a class="navBarTab" mytargeturl="#Home" >Home</a></li>
|
||||
<li class="topNavmainScreen topNavSell"><a class="navBarTab" mytargeturl="#Sell">Sell</a></li>
|
||||
</ul>
|
||||
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">More<span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<!--li><a href="#">Login</a></li>
|
||||
<li><a href="#">logout</a></li>
|
||||
<li role="separator" class="divider"></li-->
|
||||
<li><a href="#" data-toggle="modal" data-target="#modalImpressum">Impressum</a></li>
|
||||
<li><a href="#" data-toggle="modal" data-target="#modalAbout">About</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<ul class="nav navbar-nav">
|
||||
<li class="topNavmainScreen topNavHome visible-sm visible-md visible-lg"><a class="navBarTab" mytargeturl="#Home" >Home</a></li>
|
||||
<li class="topNavmainScreen topNavSell visible-sm visible-md visible-lg"><a class="navBarTab" mytargeturl="#Sell">Sell</a></li>
|
||||
<li class="topNavmainScreen topNavHome visible-xs"><a class="navBarTab" mytargeturl="#Home" >Home</a></li>
|
||||
<li class="topNavmainScreen topNavSell visible-xs"><a class="navBarTab" mytargeturl="#Sell">Sell</a></li>
|
||||
|
||||
</ul>
|
||||
</div><!-- /.navbar-collapse -->
|
||||
</div><!-- /.container-fluid -->
|
||||
</div>
|
||||
</nav>
|
||||
<br class="visible-md visible-sm visible-lg"/><br class="visible-md visible-sm visible-lg"/><br class="visible-md visible-sm visible-lg"/>
|
||||
<br class="visible-md visible-sm visible-lg"/>
|
||||
<br class="visible-md visible-sm visible-lg"/>
|
||||
<br />
|
||||
<br />
|
||||
|
||||
Reference in New Issue
Block a user