Commit c25ab401 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!11
parents 63a87c8d 70dd8bab

src/Dijit.styl

+4 −15
Original line number Diff line number Diff line
@@ -18,21 +18,10 @@ 


	.dijitA11ySideArrow

		display inline-block !important

		font small-caption



	.dijitCalendarIncrementArrow, .dijitCalendarDecrementArrow

		position relative

		line-height 4rem

		padding 0 10px

		cursor pointer



	.dijitCalendarIncrementArrow

		float right

		right 3%



	.dijitCalendarDecrementArrow

		float left

		left 3%



	.dijitCalendar

		font-size inherit !important
 
 No newline at end of file
 
		position relative

		fontSize 2rem

		padding 0 1rem

		cursor pointer

src/Dropzone.styl

+12 −9
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


.dropzone

	bordeRedondeado()

	fondo color rgba($black, $lowOpacity)

	fondo textura medium

	background-color $color13

	border 1px solid $inputBorder

	miniPadded()

	min-height 80px

	padding 0.1rem

	min-height 15rem

	flex-direction column

	.dz-preview

		miniMargined()

		miniPadded()
@@ -34,16 +34,19 @@ 


	.dz-default.dz-message

		fullSize()

		noMargin()

		miniPadded()

		display flex

		flex-direction row

		justify-content space-between

		align-items center

		margin 0

		padding 0.5rem

		top 0

		left 0

		flexible h space-between center

		color $color6

		fondo none

		span

			display block

		.uploadIcon

			fontSize 3rem

			semiMargined h

			fontSize 2rem

			margin 0 1rem

			cursor pointer

src/Functions.styl

+9 −14
Original line number Diff line number Diff line
@@ -3,12 +3,17 @@ 
*/





fontSize()

	font-size (arguments * $baseFontSize)px

	font-size (arguments)rem

	line-height $baseLineHeight



// Funciones de compatibilidad

textEllipsis()

	overflow hidden

	white-space nowrap

	text-overflow ellipsis



fontSize()

	font-size (arguments * 10)px

	font-size arguments

// Funciones de compatibilidad



box-sizing()

	-webkit-box-sizing arguments
@@ -374,16 +379,6 @@ flexibleGrow(tasa) 
fondo(tipo, tono = 0)

	if tipo == none

		background none

	if tipo == textura

		background-repeat repeat

		if tono == hard-opa

			background-image $linen-gray-opa

		if tono == hard

			background-image $linen-gray

		if tono == medium

			background-image $linen-light

		if tono == soft

			background-image $linen-lighter

	if tipo == degradado

		background-size 100%

		if tono == topbar

src/Main.styl

+19 −27
Original line number Diff line number Diff line 
/*

	Autor: Pedro E. Trujillo Brito



	Archivo: redmic\public\stylesheets\redmic\Main.styl



	Plantilla para elementos base.



	Fecha última modificación: 12/12/2014 - Pedro

*/







// Global



html

	font-size $baseFontSize !important

	font-family $baseFontFamily

	fullSize()



	/*-webkit-user-select none

	-moz-user-select none

	-khtml-user-select none

	-ms-user-select none*/



body

	fullSize()

	noMargin()

	noPadding()

	noScroll()

	fontSize $normalFontSize

	font-size $baseFontSize

	@media (max-width $media-high-size)

		font-size $baseFontSize * 0.9

	@media (max-width $media-medium-size)

		font-size $baseFontSize * 0.8

	@media (max-width $media-low-size)

		font-size $baseFontSize * 0.7

	line-height $baseLineHeight

	color $textColor

	fondo textura soft

	width 100%

	height 100%

	background $grayLight



body

	width inherit

	height inherit

	margin 0

	background inherit



*

	outline none



h1

	fontSize 2rem



a

	color $linkColor

	text-decoration none

src/Reset.styl

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ video 
	vertical-align baseline

	background transparent



body

	line-height 1



article

aside

details