Merge pull request #7 from MildHawk/feature-fix-css-#3

update css source
MildHawk · Feb 4, 2015 · e612557 · e612557
2 parents 99aed9a + 2cfcd7e
commit e612557
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 98 deletions.
diff --git a/public/index.html b/public/index.html
@@ -5,22 +5,14 @@
     <title></title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
-    <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
-    <!-- build:css(.) styles/vendor.css -->
-    <!-- bower:css -->
     <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
-    <!-- endbower -->
-    <!-- endbuild -->
-    <!-- build:css(.tmp) styles/main.css -->
-    <link rel="stylesheet" href="styles/main.css">
-    <!-- endbuild -->
+    <link rel="stylesheet" href="dist/css/app.css">
   </head>
   <body ng-app="pathleteApp">
     <!--[if lt IE 7]>
       <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->
 
-    <!-- Add your site or application content here -->
     <div class="container">
       <div class="header" ng-controller="ToolbarCtrl" ng-show="showing">
         <ul class="nav nav-pills pull-right">
@@ -55,26 +47,20 @@ <h3 class="text-muted">pathlete</h3>
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
 
-    <!-- build:js(.) scripts/vendor.js -->
-    <!-- bower:js -->
     <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
     <script src="bower_components/angular-route/angular-route.js"></script>
     <script src="bower_components/json3/lib/json3.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
-    <!-- endbower -->
-    <!-- endbuild -->
 
-        <!-- build:js({.tmp,app}) scripts/scripts.js -->
-        <script src="scripts/app.js"></script>
-        <script src="scripts/controllers/main.js"></script>
-        <script src="scripts/controllers/progress.js"></script>
-        <script src="scripts/controllers/achievements.js"></script>
-        <script src="scripts/controllers/everest.js"></script>
-        <script src="scripts/controllers/lutetia.js"></script>
-        <script src="scripts/controllers/usa.js"></script>
-        <script src="scripts/controllers/toolbar.js"></script>
-        <script src="scripts/services.js"></script>
-        <!-- endbuild -->
+    <script src="scripts/app.js"></script>
+    <script src="scripts/controllers/main.js"></script>
+    <script src="scripts/controllers/progress.js"></script>
+    <script src="scripts/controllers/achievements.js"></script>
+    <script src="scripts/controllers/everest.js"></script>
+    <script src="scripts/controllers/lutetia.js"></script>
+    <script src="scripts/controllers/usa.js"></script>
+    <script src="scripts/controllers/toolbar.js"></script>
+    <script src="scripts/services.js"></script>
 </body>
 </html>
diff --git a/server/public/app/index.html b/server/public/app/index.html