Commit 09d051c8 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Arregla diseño tab de listado

See merge request redmic-project/client/style!1
parents 64455f69 0d920a89

src/redmic-widgets/List.styl

+26 −24
Original line number Diff line number Diff line
@@ -74,8 +74,33 @@ 
		.paginate .selectOption,

		.paginate .selectPage,

		.totalResult,

		.containerSelectionBox

		.containerSelectionBox,

		.orderZone

			margin-bottom 3px

			margin-left 3px



		.orderZone

			display flex

			justify-content center

			align-items center

			flex-wrap wrap

			> span

				display flex

				margin-right 1rem



			.containerOrder

				position relative

				display flex

				align-items center

				select

					padding-left 2rem

				span

					position absolute

					left 5px

					top 6px

					cursor pointer

					&:hover

						color $blue



		.paginate

			display flex
@@ -453,29 +478,6 @@ 
	div:last-child

		margin-right 0



.orderZone

	display flex

	justify-content center

	align-items center

	flex-wrap wrap

	> span

		display flex

		margin-right 1rem



	.containerOrder

		position relative

		display flex

		align-items center

		select

			padding-left 2rem

		span

			position absolute

			left 5px

			top 6px

			cursor pointer

			&:hover

				color $blue



.imageLayerList

	width 6rem !important

	min-width 6rem

src/redmic-widgets/Map.styl

+8 −6
Original line number Diff line number Diff line 
.mapSearch

	height 300px

	width 600px

	height 250px

	width 450px

	margin 0

	border-radius 5px

	box-shadow 0 5px 10px rgba(0,0,0,0.2)
@@ -37,7 +37,9 @@ 
	.leaflet-areaselect-handle

		display none



// Esto es necesario? Por lo que he visto no

// Además, todo este fichero hay que replantearlo, porque se aplica a cualquier mapa leaflet

//.leaflet-bottom.leaflet-right

//	display none !important
 
 No newline at end of file
 
.mapSearchInput

	.leftContainer

		margin-top 5px

		align-items end

		label

			padding-top 2px

src/redmic/Containers.styl

+6 −0
Original line number Diff line number Diff line
@@ -349,8 +349,14 @@ 


			.header

				@extend .titleRedmic

				overflow hidden

				text-overflow ellipsis

				display -webkit-box

				-webkit-line-clamp 3

				-webkit-box-orient vertical

				h1

					line-height 1

					margin 0



		.infoTitleBackground

			fondo degradado topbar

src/redmic/Forms.styl

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ 
		margin-right 5px

	.dijitTextBox

		width 8rem

	.rightContainer

		padding-left 0



.dateTime

	.dijitCalendar

src/redmic/Login.styl

+8 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ 
	.iconMargin

		margin-left 50px



.termCondition .contentTermCondition

.termCondition .contentTermCondition, .whatIsRedmic

	text-align justify

	padding 0 3%
@@ -248,6 +248,9 @@ 
				margin-left 3rem

				list-style-type square



.whatIsRedmic

	padding 1rem 15%



.noPadding

	noPadding()
@@ -271,6 +274,8 @@ 
			h4.subtitle

				font-size 1em

				margin 0.5em 0

	.whatIsRedmic

		padding 1rem 10%



@media (max-width: 960px)

	.outerApp .boxContainer .onlyBox
@@ -297,6 +302,8 @@ 
			div:first-child

				margin-right 0em

				margin-bottom 1em

	.whatIsRedmic

		padding 1rem 5%



@media (max-width: 480px)

	.outerApp