Home Explore Help
Sign In
david
/
alexis2
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix merge conflicts

Tati 10 years ago
parent
e53e769f34
commit
ac7f27433e
2 changed files with 2 additions and 5 deletions
Split View Show Diff Stats
  1. 1 2
      front/index.html
  2. 1 3
      front/style.css

+ 1 - 2
front/index.html
View File 

@@ -15,8 +15,7 @@
 
 		<script src="js/app.js"></script>
 
 	</head>
 
 <body>
 
-	<div ng-view="">
 
-	</div>
 
+	<div ng-view=""></div>
 
 </body>
 
 </html>

+ 1 - 3
front/style.css
View File 

@@ -68,7 +68,6 @@ body {
 
 .filter li {
 
 	display: block;
 
 	padding: 5px;
 
-	margin-bottom: 10px;
 
 }
 
 
 .filter li:last-child{
 
@@ -98,7 +97,7 @@ body {
 
 	border-bottom: 1px solid;
 
 	padding-bottom: 1px;
 
 	margin-top: 5px;
 
-	margin-bottom: 2px;
 
+	margin-bottom: 10px;
 
 }
 
 .filter input[type="text"], .filter select {
 
 	width: 100%;
 
@@ -199,7 +198,6 @@ ul.news-meta {
 
 	font-size: 12px;
 
 	border-bottom: 1px solid rgba(0,0,0,0.05);
 
 	padding-bottom: 3px;
 
-	margin-bottom: 10px;
 
 }
 
 
 ul.news-meta li {