Commit cc6c9d2d 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!14
parents 7b85a30a e849fcd5

package.json

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

  "name": "Style",

  "version": "0.11.0",

  "name": "redmic-style",

  "version": "0.21.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",

      "email": "nacho@oag-fundacion.org"

      "name": "Ignacio Lorenzo García"

    },

    {

      "name": "Pedro E. Trujillo Brito",
@@ -18,8 +17,7 @@ 
      "email": "noel@redmic.es"

    },

    {

      "name": "Carlos Alberto González Carballo",

      "email": "carlos@redmic.es"

      "name": "Carlos Alberto González Carballo"

    }

  ],

  "repository": {

src/Bootstrap.styl

+1 −1
Original line number Diff line number Diff line
@@ -1577,7 +1577,7 @@ output { 
	line-height: 1.428571429;

	color: #555555;

	vertical-align: middle;

	background-color: #ffffff;

	//background-color: #ffffff;

	background-image: none;

	border: 1px solid #cccccc;

	border-radius: 4px;

src/Functions.styl

+6 −1
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ textEllipsis() 
	white-space nowrap

	text-overflow ellipsis



multiTextEllipsis()

	display -webkit-box

	-webkit-line-clamp 3

	-webkit-box-orient vertical

	overflow hidden



// Funciones de compatibilidad



box-sizing()
@@ -332,7 +338,6 @@ maximizeFont() 


flexible(orientacion, justificado, alineado)

	display flex

	flex-wrap nowrap

	if orientacion == h

		flex-direction row

	if orientacion == hr

src/Main.styl

+4 −9
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ 
html

	font-family $baseFontFamily

	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

	width 100%
@@ -20,12 +14,13 @@ body 
	height inherit

	margin 0

	background inherit

	overflow hidden



*

	outline none



h1

	fontSize 2rem

	fontSize 1.5rem !important



a

	color $linkColor
@@ -56,7 +51,7 @@ a 


.titleRedmic

	font-family 'Exo 2',cursive

	color rgb(255,204,0)

	color $yellowTitleRedmic



// Cosas de la plantilla y cosas generales

src/Variables.styl

+11 −5
Original line number Diff line number Diff line
@@ -47,12 +47,19 @@ $colorLoginTextBox = #004e72 
$colorLoginButtonHover = #ffd503

$colorLoginButtonHover2 = #b09100

$colorGrayBlack = #494852

$colorBorderTemplateCatalog = #ddd



$blueStrong = #1c678a



$yellowTitleRedmic = #fc0



// INSPIRE

$inspireOrange = #f59e00

$inspireBrown = #b07e49

$inspireRed = #ea562c

$inspireBlue = #36a9e0

$inspireGreen = #94c11f

$inspireGray = #b1b1b1





// Gráficos
@@ -117,7 +124,7 @@ $detailsWindowMinWidth = 15rem 
$baseFontFamily = 'Open Sans', sans-serif;

$fa-font-path = '/stylesheets/submodules/Font-Awesome-Stylus/fonts'

$baseFontSize = 14px

$baseLineHeight = 120%

$baseLineHeight = 130%

$tinyFontSize = 0.6rem

$smallFontSize = 0.8rem

$normalFontSize = 1rem
@@ -196,10 +203,9 @@ $layerThumbnailHeight = 67px 


// Clases abstractas

.highlightOnHover

	transition transform 0.2s ease-in-out

	transition filter 0.3s ease-in-out

	&:hover

		filter drop-shadow(0 0 0.3rem $grayLighter)

		transform scale(1.1)

		filter drop-shadow(0 0 0.1rem $grayLighter)