[Kimchi-devel] [PATCH 5/7] [WOK] Adding new-ui libraries after merge conflict
Aline Manera
alinefm at linux.vnet.ibm.com
Wed Sep 16 16:09:21 UTC 2015
On 15/09/2015 16:56, sguimaraes943 at gmail.com wrote:
> From: samhenri <samuel.guimaraes at eldorado.org.br>
>
> Adding new-ui libraries again after merge conflict.
>
> Signed-off-by: samhenri <samuel.guimaraes at eldorado.org.br>
> ---
> ui/libs/bootstrap.js | 2345 ++++
> ui/libs/jquery-ui.js | 16617 +++++++++++++++++++++++++++++
> ui/libs/modernizr.js | 1406 +++
Is this file imported from somewhere? From which project?
> ui/libs/themes/base/bootstrap.custom.css | 8502 +++++++++++++++
> ui/libs/themes/base/jquery-ui.custom.css | 203 +
> ui/libs/vendor.js | 5523 ++++++++++
> ui/pages/browserconfig.xml | 12 +
> ui/pages/manifest.json | 41 +
The same I asked before.
It is better to group the files according to its project due license issues.
Example:
ui/libs/bootstrap/ => to hold all the bootstrap files
ui/libs/jquery-ui/ => to hold all the jquery-ui files
We also need to update the COPYING file according to those changes.
> 8 files changed, 34649 insertions(+)
> create mode 100644 ui/libs/bootstrap.js
> create mode 100644 ui/libs/jquery-ui.js
> create mode 100644 ui/libs/modernizr.js
> create mode 100755 ui/libs/themes/base/bootstrap.custom.css
> create mode 100644 ui/libs/themes/base/jquery-ui.custom.css
> create mode 100644 ui/libs/vendor.js
> create mode 100644 ui/pages/browserconfig.xml
> create mode 100644 ui/pages/manifest.json
>
>
More information about the Kimchi-devel
mailing list