Commit 8150cf44 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/client/style!3
parents 09d051c8 163df915

package.json

+4 −4
Original line number Diff line number Diff line 
{

  "name": "Style",

  "version": "0.10.1",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "version": "0.11.0",

  "author": "REDMIC",

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

  "description": "Estilos y recursos para REDMIC",

  "contributors": [

    {
@@ -24,7 +24,7 @@ 
  ],

  "repository": {

    "type": "git",

    "url": "http://git.redmic.net/redmic-client/style.git"

    "url": "https://gitlab.com/redmic-project/client/style.git"

  },

  "private": true,

  "dependencies": {

src/redmic/Containers.styl

+4 −0
Original line number Diff line number Diff line
@@ -642,3 +642,7 @@ 
		width 16rem

		> div

			width 8rem



.kibana-dashboard

	width calc(100% - 4px)

	height calc(100% - 4px)

yarn.lock

+258 −0

File changed.

Preview size limit exceeded, changes collapsed.