Commit 9cdf5e31 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Organiza y actualiza dependencias

See merge request redmic-project/client/style!17
parents 490da17e 27bfdde9

grunt/task/copyIconFonts.js

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ module.exports = function(grunt) { 
				'fontRedmic': 'submodules/Font-Awesome-Stylus/fonts',

				'fontAwesome': 'submodules/font-redmic/build',

				'iconMarkers': 'submodules/leaflet-awesome-markers/dist/images',

				'iconMeasure': 'submodules/leaflet-measure/dist/images',

				'iconMeasure': 'submodules/leaflet-measure/dist/assets',

				'iconFlags': 'submodules/redmic-flag-icon-css/flags',

				'iconDraw': 'submodules/leaflet-draw/dist/images',

				'iconDijit': 'submodules/dijit/themes/claro/images' // TODO no se usarán estas images

package.json

+27 −29
Original line number Diff line number Diff line 
{

  "name": "redmic-style",

  "version": "0.21.0",

  "version": "0.23.0",

  "author": "REDMIC",

  "homepage": "https://gitlab.com/redmic-project/client/style/blob/master/README.md",

  "description": "Estilos y recursos para REDMIC",
@@ -25,37 +25,35 @@ 
    "url": "https://gitlab.com/redmic-project/client/style.git"

  },

  "private": true,

  "dependencies": {

    "alertifyjs": "^1.11.0",

    "animate.css": "^3.5.2",

    "dijit": "^1.13.0",

    "dojox": "^1.13.0",

    "dropzone": "^5.2.0",

    "font-awesome-stylus": "^4.7.1",

    "leaflet": "^1.2.0",

    "leaflet-awesome-markers": "https://github.com/lvoogdt/Leaflet.awesome-markers.git#2.0/develop",

    "leaflet-draw": "^0.4.12",

    "leaflet-measure": "^2.1.7",

    "leaflet-minimap": "^3.5.0",

    "prunecluster": "^2.1.0"

  },

  "devDependencies": {

    "glob": "^7.1.2",

    "grunt": "^1.0.1",

    "grunt-contrib-clean": "^1.0.0",

    "grunt-contrib-copy": "^1.0.0",

    "grunt-contrib-cssmin": "^2.2.0",

    "grunt-contrib-stylus": "^1.2.0",

    "grunt-git": "^1.0.4",

    "grunt-shell": "^2.1.0",

    "load-grunt-tasks": "^3.5.2",

    "nib": "^1.1.2",

    "stylus": "^0.54.5",

    "webfont-dl": "^0.1.2"

    "alertifyjs": "1.13.1",

    "animate.css": "4.1.1",

    "dijit": "1.17.3",

    "dojox": "1.17.3",

    "dropzone": "5.9.3",

    "font-awesome-stylus": "4.7.1",

    "glob": "8.0.3",

    "grunt": "1.5.3",

    "grunt-contrib-clean": "2.0.1",

    "grunt-contrib-copy": "1.0.0",

    "grunt-contrib-cssmin": "4.0.0",

    "grunt-contrib-stylus": "1.2.0",

    "grunt-git": "1.1.1",

    "grunt-shell": "4.0.0",

    "leaflet": "1.7.1",

    "leaflet-awesome-markers": "https://github.com/lennardv2/Leaflet.awesome-markers.git#2.0/develop",

    "leaflet-draw": "1.0.4",

    "leaflet-measure": "3.1.0",

    "leaflet-minimap": "3.6.1",

    "load-grunt-tasks": "5.1.0",

    "nib": "1.2.0",

    "prunecluster": "2.1.0",

    "stylus": "0.59.0",

    "webfont-dl": "0.2.0"

  },

  "engines": {

    "node": ">=4.4",

    "npm": ">=3.10"

    "node": ">=14.0",

    "npm": ">=6.14"

  },

  "license": "Apache-2.0"

}

src/redmic-widgets/List.styl

+3 −2
Original line number Diff line number Diff line
@@ -181,9 +181,10 @@ 
						align-items center



						> img

							width 30px

							width 5rem

							height 5rem

							object-fit cover

							margin-right 0.7rem

							height 30px

							border-radius 10px

					.spanIcon

						font-size 3.2rem

src/redmic/Map.styl

+13 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
	z-index 1



.leaflet-marker-pane

	.animated

	.animate__animated

		animation-iteration-count 2



/*icons*/
@@ -87,7 +87,7 @@ 
	fill white





/*coordenates*/

/*coordinates*/



.leaflet-control-coordinates

	background-color $grayLighter
@@ -161,6 +161,17 @@ 
	padding 6px

	max-width 125px





/*leaflet-measure*/



.leaflet-control-measure > .leaflet-control-measure-interaction

	a.start

		width unset

		height unset

		line-height unset

		text-align unset





/*Botoneras*/



.botoneraH

src/redmic/Notification.styl

+4 −29
Original line number Diff line number Diff line
@@ -52,12 +52,16 @@ 
.userArea

	margin 0 1.5rem



	.templateDisplayer

		width auto



	i

		fontSize 2rem



	img

		width 2.5rem

		height 2.5rem

		object-fit cover

		border-radius 5px



.containerNotificationSidebar
@@ -171,35 +175,6 @@ 
	100%

		transform translateX(100%)



.swing

	animation-name swing

	animation-duration 2s

	animation-fill-mode forwards



@keyframes swing

	10%

		transform rotate3d(0, 0, 1, 15deg)

	20%

		transform rotate3d(0, 0, 1, -15deg)

	30%

		transform rotate3d(0, 0, 1, 15deg)

	40%

		transform rotate3d(0, 0, 1, -15deg)

	50%

		transform rotate3d(0, 0, 1, 15deg)

	60%

		transform rotate3d(0, 0, 1, -15deg)

	70%

		transform rotate3d(0, 0, 1, 15deg)

	80%

		transform rotate3d(0, 0, 1, -15deg)

	90%

		transform rotate3d(0, 0, 1, 7deg)

	100%

		transform rotate3d(0, 0, 1, -7deg)

	to

		transform rotate3d(0, 0, 1, 0deg)



.alertRestartAction

	.click

		color $blueStrong