Browse Source

Update .gitattributes

pull/3369/merge
Unknwon 9 years ago
parent
commit
72dd299ca0
  1. 9
      .gitattributes
  2. 11
      public/config.codekit
  3. 0
      public/js/libs/jquery.are-you-sure.js
  4. 2
      templates/base/head.tmpl

9
.gitattributes vendored

@ -1,2 +1,11 @@
public/conf/gitignore/* linguist-vendored
public/conf/license/* linguist-vendored
public/assets/* linguist-vendored public/assets/* linguist-vendored
public/plugins/* linguist-vendored public/plugins/* linguist-vendored
public/plugins/* linguist-vendored
public/css/themes/* linguist-vendored
public/css/github.min.css linguist-vendored
public/css/semantic-2.2.1.min.css linguist-vendored
public/js/libs/* linguist-vendored
public/js/jquery-1.11.3.min.js linguist-vendored
public/js/semantic-2.2.1.min.js linguist-vendored

11
public/config.codekit

@ -150,17 +150,6 @@
"outputStyle": 1, "outputStyle": 1,
"syntaxCheckerStyle": 1 "syntaxCheckerStyle": 1
}, },
"\/js\/jquery.are-you-sure.js": {
"fileType": 64,
"ignore": 1,
"ignoreWasSetByUser": 1,
"inputAbbreviatedPath": "\/js\/jquery.are-you-sure.js",
"outputAbbreviatedPath": "\/js\/min\/jquery.are-you-sure-min.js",
"outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0,
"outputStyle": 1,
"syntaxCheckerStyle": 1
},
"\/js\/semantic-2.2.1.min.js": { "\/js\/semantic-2.2.1.min.js": {
"fileType": 64, "fileType": 64,
"ignore": 1, "ignore": 1,

0
public/js/jquery.are-you-sure.js → public/js/libs/jquery.are-you-sure.js vendored

2
templates/base/head.tmpl

@ -17,7 +17,7 @@
<link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" /> <link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
<script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script> <script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script>
<script src="{{AppSubUrl}}/js/jquery.are-you-sure.js"></script> <script src="{{AppSubUrl}}/js/libs/jquery.are-you-sure.js"></script>
<link rel="stylesheet" href="{{AppSubUrl}}/assets/font-awesome-4.6.3/css/font-awesome.min.css"> <link rel="stylesheet" href="{{AppSubUrl}}/assets/font-awesome-4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="{{AppSubUrl}}/assets/octicons-4.3.0/octicons.min.css"> <link rel="stylesheet" href="{{AppSubUrl}}/assets/octicons-4.3.0/octicons.min.css">

Loading…
Cancel
Save