update current version

This commit is contained in:
Felix Förtsch
2017-08-25 10:11:25 +02:00
parent c19344e1dc
commit 6e258f9bdb
6 changed files with 10 additions and 12 deletions

View File

@@ -43,7 +43,6 @@ body {
border-color: #00CC66; border-color: #00CC66;
} }
<<<<<<< HEAD
.mt-5 { .mt-5 {
margin-top: 5px; margin-top: 5px;
} }
@@ -53,8 +52,3 @@ body {
.mt-50 { .mt-50 {
margin-top: 50px; margin-top: 50px;
} }
=======
.m-t-5 {
margin-top: 5px;
}
>>>>>>> feat_9

View File

@@ -22,8 +22,10 @@ if(isset($_POST['count'])){
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content=""> <meta content="">
<link href="css/jef.min.css" rel="stylesheet" media="screen">
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700" rel="stylesheet">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="css/font-awesome.min.css">
<link href="css/jef.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="css/style.css"> <link rel="stylesheet" type="text/css" href="css/style.css">
</head> </head>

View File

@@ -18,6 +18,7 @@ $baseurl = "http://" . $_SERVER['SERVER_NAME'] . $uri_parts[0];
<meta property="og:site-name" content="eurom.at"/> <meta property="og:site-name" content="eurom.at"/>
<meta property="og:description" content="Der EUromat ist ein Angebot JEF Sachsen zur Bundestagswahl. Er ermöglicht es, zu europapolitischen Themen die eigenen Standpunkte mit denen der Parteien abzugleichen, die zur Wahl antreten."/> <meta property="og:description" content="Der EUromat ist ein Angebot JEF Sachsen zur Bundestagswahl. Er ermöglicht es, zu europapolitischen Themen die eigenen Standpunkte mit denen der Parteien abzugleichen, die zur Wahl antreten."/>
<link href="css/jef.min.css" rel="stylesheet" media="screen"> <link href="css/jef.min.css" rel="stylesheet" media="screen">
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700" rel="stylesheet">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css"> <link rel="stylesheet" type="text/css" href="css/style.css">
<link href="shariff/shariff.min.css" rel="stylesheet"> <link href="shariff/shariff.min.css" rel="stylesheet">

View File

@@ -48,6 +48,7 @@ if(!$data_content){
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content="EUromat"> <meta content="EUromat">
<link href="css/jef.min.css" rel="stylesheet" media="screen"> <link href="css/jef.min.css" rel="stylesheet" media="screen">
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700" rel="stylesheet">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css"> <link rel="stylesheet" type="text/css" href="css/style.css">
</head> </head>

View File

@@ -54,8 +54,10 @@ if (!$data_content) {
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<meta content=""> <meta content="">
<link href="css/jef.min.css" rel="stylesheet" media="screen"> <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700" rel="stylesheet">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="css/font-awesome.min.css">
<link href="css/jef.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="css/style.css"> <link rel="stylesheet" type="text/css" href="css/style.css">
</head> </head>
<body> <body>

View File

@@ -94,11 +94,9 @@ if(!$data_content){
<meta property="og:site-name" content="eurom.at"/> <meta property="og:site-name" content="eurom.at"/>
<meta property="og:description" content="Mein EUromat-Ergebnis"/> <meta property="og:description" content="Mein EUromat-Ergebnis"/>
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700" rel="stylesheet">
<link href="css/jef.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="css/font-awesome.min.css"> <link rel="stylesheet" href="css/font-awesome.min.css">
<link href="css/jef.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="css/style.css"> <link rel="stylesheet" type="text/css" href="css/style.css">
<script src="js/jquery-2.0.2.min.js"></script> <script src="js/jquery-2.0.2.min.js"></script>