Merge branch 'dev' into 'master' (550fca39) · Commits · REDMIC Project / Client / Style

package.json

+2 −8

Original line number	Diff line number	Diff line
		{
		"name": "redmic-style",
		"version": "0.23.0",
		"version": "0.24.0",
		"author": "REDMIC",
		"homepage": "https://gitlab.com/redmic-project/client/style/blob/master/README.md",
		"description": "Estilos y recursos para REDMIC",
		"contributors": [
		{
		"name": "Ignacio Lorenzo García"
		},
		{
		"name": "Pedro E. Trujillo Brito",
		"email": "pedro@redmic.es"
		@@ -15,9 +12,6 @@
		{
		"name": "Noel Alonso Expósito",
		"email": "noel@redmic.es"
		},
		{
		"name": "Carlos Alberto González Carballo"
		}
		],
		"repository": {
		@@ -40,7 +34,7 @@
		"grunt-contrib-stylus": "1.2.0",
		"grunt-git": "1.1.1",
		"grunt-shell": "4.0.0",
		"leaflet": "1.7.1",
		"leaflet": "1.9.3",
		"leaflet-awesome-markers": "https://github.com/lennardv2/Leaflet.awesome-markers.git#2.0/develop",
		"leaflet-draw": "1.0.4",
		"leaflet-measure": "3.1.0",

src/form/Common.styl

+4 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,10 @@
		bordeRedondeado()
		fondo color $color1

		.dijitMenuPopup
		> table
		padding .5rem

		.dj_webkit
		.db
		.dijitInputField .dijitInputInner

src/redmic/Catalog.styl

+31 −46

Original line number	Diff line number	Diff line
		.topZone
		@extend .fWidth
		noScroll()
		min-height 2rem
		padding 0.5rem 0
		min-height 3rem
		padding .5rem 0
		fondo color $color13
		border-radius 5px 5px 0 0
		border-radius unquote('0\9')
		@@ -10,22 +10,27 @@
		justify-content space-between
		flex-wrap wrap

		> div
		flex-grow 1
		padding .2rem 0
		max-width 100%

		.dijitIcon
		@extend .fWidth

		.textSearchZone
		display flex
		padding 0 0.5rem
		align-items center
		max-width 30%

		> div
		margin 0 .5rem

		.titleZone
		padding 0
		fontSize 1.2rem
		display flex
		justify-content flex-start
		align-items center
		max-width 40%
		max-width calc(100% - 1rem)

		span
		padding-left 1rem
		@@ -36,7 +41,7 @@

		.optionZone
		display flex
		justify-content space-between
		justify-content end
		padding-right 2rem

		.buttonsZone
		@@ -177,35 +182,15 @@
		.centerContent
		border-top 1px solid #4a4a54

		.dualContent
		display flex
		flex-flow column

		.topZone
		justify-content start

		.buttonZone
		padding 0
		display flex
		align-items center
		& > *
		margin 0.5rem

		.dualCenterZone
		.nestedContent
		position relative
		height calc(100% - 3rem)
		noScroll()

		.dualListZone
		display flex
		& > *
		position absolute
		@extend .fHeight
		@extend .fWidth

		& > *
		display flex
		flex-grow 1

		.primaryIn
		animation enterFromLeftToRight 0.6s
		animation-fill-mode forwards

src/redmic/Designs.styl

+33 −4

Original line number	Diff line number	Diff line
		.designLayoutContainer
		.genericDisplayer
		@extends .flexContainer
		max-width 100%
		max-height 100%
		@@ -21,6 +22,8 @@
		flex-grow 1
		@media (orientation landscape)
		margin-right 0.3rem
		height 100%
		width 65%

		@media (min-resolution $mobile-min-density)
		@media (max-aspect-ratio 4/3), (min-aspect-ratio 6/1)
		@@ -28,6 +31,8 @@

		@media (orientation portrait)
		margin-bottom 0.3rem
		height 40%
		width 100%

		> .mapSideContainer
		@media (orientation landscape)
		@@ -41,7 +46,7 @@
		max-width 100%

		@media (orientation portrait)
		height 35%
		height 60%
		width 100%

		.mapAndContentAndTopbarLayoutMapWithSideContentDesign
		@@ -51,26 +56,48 @@
		> :first-child
		display flex
		align-items center
		height 3rem
		padding 0.3rem
		padding .3rem
		overflow auto

		> .mapCenterContainer
		@extend .designLayoutContainer
		@extend .mapAndContentLayoutMapWithSideContentDesign
		position relative
		margin-top 0.3rem
		margin-top .3rem


		.layoutListDesign
		.layoutTextSearchListDesign
		.layoutTextSearchFacetsListDesign
		.layoutExternalTextSearchListDesign
		.genericDisplayer
		flex-flow column

		.centerZone
		flex-grow 1

		.genericDisplayer
		.topZone
		flex-flow row
		justify-content space-between
		flex-wrap wrap
		padding .5rem 0

		.titleContent
		fontSize 1.2
		font-weight bold
		color $yellowTitleRedmic
		padding-left .5rem

		.compactContent
		max-width 7rem

		> *
		display flex
		flex-grow 1
		align-items center
		margin 0 .5rem

		.speciesMainTextSearchFacetsListDesign
		.facetsZone
		width 25rem !important
		@@ -191,6 +218,8 @@


		.atlasContainer
		.queryOnMapContainer
		.nestedContentContainer
		@extends .flexContainer
		height 100%
		overflow hidden

src/redmic/Forms.styl

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		noDisplay()

		.formContainer
		width 100%
		max-height 100%

		.formContainerWithKeypad