Commit a6a16816 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Limpia estilos y recursos en desuso, cambia rutas

See merge request redmic-project/client/style!21
parents cd252c55 55de289e

.gitignore

+3 −1
Original line number Diff line number Diff line 
node_modules

dist

.gitmodules.old

style.css

.gitmodules.old

*.tgz

*.log

.gitlab-ci.yml

+2 −3
Original line number Diff line number Diff line
@@ -15,10 +15,9 @@ build-package: 
    WEB_BUILD_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/web-build

    WEB_BUILD_IMAGE_TAG: latest

  before_script:

    - type yarn grunt

    - yarn install

    - type npm

  script:

    - grunt

    - npm install

  dependencies: []

  artifacts:

    name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}

.gitmodules

+3 −8
Original line number Diff line number Diff line 
[submodule "submodules/redmic-flag-icon-css"]

	path = submodules/redmic-flag-icon-css

	url = ../../third-party/flag-icon-css.git

	branch = master

	ignore = dirty

[submodule "submodules/font-redmic"]

	path = submodules/font-redmic

	url = ../../Font-Redmic.git

[submodule "dep/font-redmic"]

	path = dep/font-redmic

	url = ../font-redmic.git

	branch = master

	ignore = dirty

submodules/Leaflet-MiniMap→dep/Leaflet-MiniMap

+0 −0

File moved.

View file