Commit cdebe86a authored by Leonardo Menezes's avatar Leonardo Menezes
Browse files

organise js/css structure

parent 06c00016

Gruntfile.js

+16 −4
Original line number Diff line number Diff line
@@ -3,7 +3,10 @@ module.exports = function(grunt) { 
  grunt.initConfig({

    clean: {

      dist: {

        src: ['_site/dist']

        src: [

          'public/css',

          'public/js'

        ]

      }

    },

    watch: {
@@ -32,10 +35,13 @@ module.exports = function(grunt) { 
          'src/assets/libs/typeahead/typeahead.min.js',

          'src/assets/libs/ace/ace.min.js'

        ],

        dest: 'public/lib.js'

        dest: 'public/js/lib.js'

      },

      vendorcss: {

        src: [],

        src: [

          'src/assets/css/bootstrap.min.css',

          'src/assets/css/font-awesome.min.css'

        ],

        dest: 'public/css/lib.css'

      },

      appjs: {
@@ -45,7 +51,13 @@ module.exports = function(grunt) { 
          'src/app/shared/*.js',

          'src/app/shared/*/*.js'

        ],

        dest: 'public/app.js'

        dest: 'public/js/app.js'

      },

      appcss: {

        src: [

          'src/app/css/app.css'

        ],

        dest: 'public/css/app.css'

      },

    },

    jshint: {

app/views/Index.scala.html

+5 −6
Original line number Diff line number Diff line
@@ -7,12 +7,11 @@ 
        <meta name="description" content="">

        <meta name="author" content="">

        <title>{{title}}</title>

        <link rel="icon" type="image/png" href='@routes.Assets.versioned("img/favicon.png")'>

        <link rel="stylesheet" href='@routes.Assets.versioned("css/bootstrap.min.css")'>

        <link rel="stylesheet" href='@routes.Assets.versioned("css/font-awesome.min.css")'>

        <link rel="stylesheet" href='@routes.Assets.versioned("css/app.css")'>

        <script src='@routes.Assets.versioned("lib.js")'></script>

        <script src='@routes.Assets.versioned("app.js")'></script>

        <link rel="icon" type="image/png" href="img/favicon.png">

        <link rel="stylesheet" href="css/lib.css">

        <link rel="stylesheet" href="css/app.css">

        <script src="js/lib.js"></script>

        <script src="js/app.js"></script>

    </head>

    <body>

        <div ng-include src="'alerts.html'" ng-controller="AlertsController" class="alerts"></div>

conf/routes

+1 −1
Original line number Diff line number Diff line
@@ -45,5 +45,5 @@ GET /apis/hosts @controllers.HostsController.index 




# Map the JS resource paths

GET        /assets/*file                     controllers.Assets.at(path="/public", file)

GET        /public/*file                     controllers.Assets.at(path="/public", file)

GET        /*file                            controllers.Assets.versioned(path="/public", file: Asset)

public/css/app.css

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

public/css/font-awesome.min.css

deleted100644 → 0
+0 −4

File deleted.

Preview size limit exceeded, changes collapsed.