mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-12-27 04:51:14 +00:00
Fixes firefox rendering issues:
Header z-index Gather page columns
This commit is contained in:
parent
0fe7a8330e
commit
91f3161eff
9 changed files with 39 additions and 47 deletions
|
@ -109,8 +109,6 @@
|
|||
.gather-columns {
|
||||
@include span-columns(12);
|
||||
@include row(table);
|
||||
margin-left: - $column-border-width;
|
||||
width: $max-width - ($column-border-width*2);
|
||||
}
|
||||
|
||||
.data {
|
||||
|
@ -118,9 +116,11 @@
|
|||
@include pad;
|
||||
border-radius: $column-border-width + $column-border-radius;
|
||||
padding-bottom: 20px;
|
||||
padding: 0px;
|
||||
position: relative;
|
||||
z-index: 100;
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
border: 10px solid transparent;
|
||||
background-clip: padding-box;
|
||||
|
||||
h4 {
|
||||
padding-bottom: 20px;
|
||||
|
@ -135,22 +135,6 @@
|
|||
ul {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.contents {
|
||||
margin: 20px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.contents:before {
|
||||
border-radius: $base-border-radius;
|
||||
content: '';
|
||||
background: rgba(0, 0, 0, 0.15);
|
||||
position: absolute;
|
||||
width: 90%;
|
||||
height: 100%;
|
||||
z-index: -1;
|
||||
margin: -20px;
|
||||
}
|
||||
}
|
||||
|
||||
.players {
|
||||
|
|
|
@ -28,6 +28,10 @@ body#tinymce {
|
|||
|
||||
.wrapper {
|
||||
@include outer-container;
|
||||
|
||||
&.body {
|
||||
z-index: 10;
|
||||
}
|
||||
}
|
||||
|
||||
#content {
|
||||
|
|
|
@ -3,24 +3,11 @@
|
|||
*/
|
||||
|
||||
header .banner {
|
||||
height: 125px;
|
||||
|
||||
#logo {
|
||||
@include span-columns(7 of 12);
|
||||
min-height: 180px;
|
||||
position: relative;
|
||||
|
||||
img {
|
||||
height: 180px;
|
||||
position: absolute;
|
||||
top: 30px;
|
||||
left: -10px;
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
height: 180px;
|
||||
|
||||
#authentication {
|
||||
@include span-columns(5 of 12);
|
||||
@include shift(7);
|
||||
padding: 30px 0;
|
||||
padding-top: 50px;
|
||||
color: white;
|
||||
|
@ -159,12 +146,9 @@ header .banner {
|
|||
|
||||
&.authenticated {
|
||||
|
||||
#logo {
|
||||
@include span-columns(9 of 12);
|
||||
}
|
||||
|
||||
#authentication {
|
||||
@include span-columns(3 of 12);
|
||||
@include shift(9);
|
||||
padding: 30px 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,9 +11,29 @@ $navigation-height: 50px;
|
|||
margin-top: -50px;
|
||||
background: image-url('layout/nav-background.png') top center repeat-x;
|
||||
height: 100px;
|
||||
|
||||
nav {
|
||||
@include outer-container;
|
||||
position: relative;
|
||||
z-index: 25;
|
||||
|
||||
.wrapper {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#logo {
|
||||
position: absolute;
|
||||
bottom: -15px;
|
||||
left: -10px;
|
||||
|
||||
a {
|
||||
height: 180px;
|
||||
display: block;
|
||||
float: left;
|
||||
position: relative;
|
||||
z-index: 50;
|
||||
|
||||
img {
|
||||
height: 180px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
<header>
|
||||
<div class="banner <%= 'authenticated' if cuser %>">
|
||||
<div class="wrapper">
|
||||
<div id="logo">
|
||||
<%= link_to image_tag('logo.png'), root_path %>
|
||||
</div>
|
||||
<div id="authentication" class="<%= 'admin' if cuser && cuser.admin? %>">
|
||||
<% if cuser %>
|
||||
<%= render partial: "widgets/logged" %>
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
<nav id="menu">
|
||||
<div class="wrapper">
|
||||
<div id="logo">
|
||||
<%= link_to image_tag('logo.png'), root_path %>
|
||||
</div>
|
||||
<ul class="navigation">
|
||||
<li class="icon">
|
||||
<%= active_link_to root_path, active: ["articles", "news_index"], class: 'news' do %>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<%= render partial: "messages" %>
|
||||
<%= render partial: "header" %>
|
||||
<%= render partial: "navigation" %>
|
||||
<div class="wrapper">
|
||||
<div class="body wrapper">
|
||||
<div id="content" class="<%= yield :main_class %>">
|
||||
<div id="main">
|
||||
<%= yield %>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<div id="container">
|
||||
<%= render partial: "header" %>
|
||||
<%= render partial: "navigation" %>
|
||||
<div class="wrapper">
|
||||
<div class="body wrapper">
|
||||
<div id="content" class="full <%= yield :content_class %>">
|
||||
<%= render partial: "messages" %>
|
||||
<div id="forums">
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<div id="container">
|
||||
<%= render partial: "header" %>
|
||||
<%= render partial: "navigation" %>
|
||||
<div class="wrapper">
|
||||
<div class="body wrapper">
|
||||
<div id="content" class="full">
|
||||
<%= render partial: "messages" %>
|
||||
<%= yield %>
|
||||
|
|
Loading…
Reference in a new issue