Skip to content
This repository has been archived by the owner on Nov 12, 2017. It is now read-only.

Commit

Permalink
Slå sammen css-filer -- unødvendig mange requests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@olav
olav committed Mar 13, 2012
1 parent 4df7af4 commit 0674418
Show file tree
Hide file tree
Showing 6 changed files with 306 additions and 311 deletions.
313 changes: 305 additions & 8 deletions src/main/resources/webapp/css/jz.css
View file
@@ -1,27 +1,32 @@
/* ----------------------------------------------------- */
/* JavaZone 2012 */
/* ----------------------------------------------------- */

@keyframes swingy {
0% { opacity:1; }
25% { opacity:0.9; }
50% { opacity:1; }
75% { opacity:0.85; }
75% { opacity:0.95; }
100% { opacity:0.9; }
}

@-moz-keyframes swingy {
0% { opacity:1; }
25% { opacity:0.9; }
50% { opacity:1; }
75% { opacity:0.85; }
75% { opacity:0.95; }
100% { opacity:0.9; }
}

@-webkit-keyframes swingy {
0% { opacity:1; }
25% { opacity:0.9; }
50% { opacity:1; }
75% { opacity:0.85; }
75% { opacity:0.95; }
100% { opacity:0.9; }
}

/* ----------------------------------------------------- */

body, html {
margin:0;
Expand Down Expand Up @@ -93,6 +98,7 @@ hr {
}


/* ----------------------------------------------------- */

#menu {
font-family: "proxima-nova-condensed",helvetica,arial,sans-serif;
Expand Down Expand Up @@ -178,7 +184,6 @@ hr {
}

#main {
display:none;
font-family: "ff-meta-web-pro", helvetica, arial, sans-serif;
}

Expand All @@ -201,10 +206,6 @@ hr {
border-left:5px solid rgba(255,255,255,0.05);
}

.no-js #main {
display:block;
}

#main .body {
width:63%;
float:left;
Expand Down Expand Up @@ -353,4 +354,300 @@ hr {

#partners img:hover {
opacity:1;
}


/* Min width */
/* ----------------------------------------------------- */

@media screen and (max-width: 859px) {

.max, .med {
display:none;
}

body {
min-width:460px;
font-size:22px;
}

#minsplash {
display:block;
background:url("../img/splashclean.jpg") top center no-repeat;
padding:600px 50px 50px 50px;
animation: swingy 2s linear infinite alternate;
-moz-animation: swingy 2s linear infinite alternate;
-webkit-animation: swingy 2s linear infinite alternate;
}

#sidesplashtext {
display:none;
}

#splashlogo {
position:absolute;
top:20px;
left:50%;
margin-left:-170px;
}

#line {
text-shadow:0 0 8px rgba(0,0,0,1);
position:absolute;
top:310px;
left:0;
font-size:24px;
width:100%;
text-align:center;
font-family: "proxima-nova-condensed",helvetica,arial,sans-serif;
z-index:500;
}

#line a {
color:#fff;
}

#menu {
position:absolute;
top:380px;
width:520px;
left:50%;
margin-left:-251px;
}

#menu .middle {
clear:left;
}

#menu div {
margin-bottom:30px;
width:115px;
height:90px;
}

#menu div a {
padding-top:50px;
font-size:18px;
font-weight:bold;
}

#main #submenu {
text-align:center;
top:590px;
font-size:70%;
}

#main #submenu a {
padding:10px;
}

#main {
padding:0 0 50px 0;
max-width:500px;
margin:0 auto;
}

#main .side, #main .body {
float:left;
width:100%;
margin-bottom:20px;
}

#partners a {
width:160px;
}

}


/* Medium width */
/* ----------------------------------------------------- */

@media screen and (min-width: 860px) and (max-width:1349px) {

.min, .max {
display:none;
}

#c4 {
padding:0 20px 100px 20px;
}

#menu {
width:820px;
position:absolute;
top:450px;
left:50%;
margin-left:-410px;
}

#menu div.last {
float:right;
margin-right:0;
}

#main {
margin:0 auto;
width:820px;
}

#main .bigbody {
width:100%;
}

#main .side2 {
clear:both;
width:100%;
}

#main #submenu {
top:550px;
}

#splash {
display:block;
position:relative;
width:100%;
height:620px;
margin:0px auto 0 auto;
background:url("../img/splashclean.jpg") top center no-repeat;
background-position:fixed;
animation: swingy 2s linear infinite alternate;
-moz-animation: swingy 2s linear infinite alternate;
-webkit-animation: swingy 2s linear infinite alternate;
z-index:0;
}

#splashlogo {
position:absolute;
top:100px;
left:50%;
margin-left:-400px;
}

#text-horizontal {
position:absolute;
top:185px;
left:50%;
margin-right:-400px;
}


#top {
position:absolute;
width:100%;
height:590px;
margin:50px auto 0 auto;
background:url("../img/top.png") top left repeat-x;
background-position:fixed;
}

}


/* Max width */
/* ----------------------------------------------------- */

@media screen and (min-width: 1350px) {

.min, .med {
display:none;
}

#sidesplash {
position:absolute;
width:300px;
height:100%;
left:-100px;
background:url("../img/sidesplash.png") 0 0 no-repeat;
background-position:fixed;
animation: swingy 2s linear infinite alternate;
-moz-animation: swingy 2s linear infinite alternate;
-webkit-animation: swingy 2s linear infinite alternate;
z-index:1;
}

#side {
position:fixed;
top:0;
left:-100px;
background:url("../img/side.png") 0px 0px repeat-y;
background-position:fixed;
width:300px;
height:100%;
z-index:0;
}

#splashlogo {
position:absolute;
left:1060px;
top:40px;
width:280px;
z-index:2;
}

#longtext {
position:absolute;
top:30px;
left:187px;
z-index:100;
}

#menu {
position:absolute;
left:200px;
top:190px;
z-index:100;
}

#menu div {
width:93px;
height:93px;
}

#main {
padding-top:340px;
padding-left:200px;
max-width:1500px;
z-index:100;
}

#main .body {
width:40%;
margin-right:10px;
}

#main .bigbody {
width:780px;
margin-right:10px;
}

#main .side {
width:320px;
margin-right:1%;
float:left;
}

#main .side2 {
width:320px;
}

#partners p {
background:rgba(255,255,255,0.05);
padding:10px;
border-left:5px solid rgba(255,255,255,0.05);
}

#partners a {
width:170px;
}

#footer {
padding-left:200px;
}

#footer p {
text-align:left;
}

}

0 comments on commit 0674418

Please sign in to comment.