Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cambios-estilo #1

Merged
merged 1 commit into from
Dec 19, 2017
Merged

cambios-estilo #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added assets/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added assets/images/lucile.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
101 changes: 87 additions & 14 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,86 @@
* {
margin: 0;
padding: 0;
/*margin: 0;
padding: 0;*/
box-sizing: border-box;
font-family: 'Lato', sans-serif;
}

#logo-laboratoria {
width: 200px;
margin: auto;
html {

}

nav {
width: 100%;
}

.logo {/*estilo de logo cabecera*/
background-image: url(../assets/images/logo-laboratoria.svg);
width: 250px;
height: 90px;
background-repeat: no-repeat;
margin-left: auto;
margin-right: auto;
}

.general-container {/*estilo de menu gen-sede*/
display: flex;
padding: 1em;
justify-content: space-around;
font-size: 10px;
}

.info-container {/*estilo de menu gen-sede*/
width: 20%;
background-color: orange;
border-radius: 10px;
text-align: center;
height: 80px;

}

.profile-container {/*estilo de menu gen-sede*/
width: 20%;
background-color: #DCDCDC;
border-radius: 10px;
height: 80px;
}

.profile-pic{
width: 60px;
border-radius: 50%;
margin-left: 5%;
margin-top: 4%;
}

.profile-data{
text-align: left;
font-size: 17px;
display:inline-block;
margin-left: 5%;
}


#generacion{/*estilo de menu gen-sede*/
font-family: 'Lato', sans-serif;
font-size: 15px;
}

#go{/*estilo de menu gen-sede*/
border: none;
width: 170%;
height: 25px;
border-radius: 1em;
font-weight: 800;
font-size: 20px;
margin-top: 1.5em;
margin-left: 120%;
}

#sede{/*estilo de menu gen-sede*/
font-family: 'Lato', sans-serif;
font-size: 15px;
}

/*tamaño de icons de kpis*/
.icon {
width:15px;
Expand All @@ -31,6 +105,7 @@
}
.result {
color:red;
font-size: 18px;
}

#kpis-section {
Expand All @@ -43,14 +118,14 @@
}

#end-kpis {
margin-top: 80px;
margin-top: 100px;
}

.tabs li {
display: inline-block;
width: 16%;
text-align: center;
height:20px;
height: 30px;
}

.tabs li a {
Expand All @@ -59,20 +134,21 @@
}

#menu {
background: #FFC107;
height: 20px;
background: orange;
height: 30px;
text-align: center;
}

.active {
display: initial;
/*display: initial;*/
}

.inactive {
display: none;
}

.highlighted {
background: #CCCCCC;
background: #8e8e8e;
}

/*dashboard por sede*/
Expand All @@ -87,6 +163,3 @@
margin-top: 5px;
font-weight: bold;
}



Loading