Skip to content
Snippets Groups Projects
Commit 501b0d1d authored by Florian Gnaegi - frentix GmbH's avatar Florian Gnaegi - frentix GmbH
Browse files

OO-1068 refactor class naming

parent db72754c
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
<div id="o_beta_logo"></div>
## ---- START #o_header ---
<div id="o_header">
<div id="o_header_wrapper">
<div id="o_logo"></div>
<div id="o_right_logo"></div>
......@@ -14,7 +14,7 @@
## ---- END #o_header ---
## ---- START #o_navbar ---
<div id="o_navbar" class="navbar navbar-default" role="navigation">
<div id="o_navbar_wrapper" class="navbar navbar-default" role="navigation">
<div id="o_navbar_container" class="container-fluid">
<div id="o_navbar_header" class="navbar-header">
......@@ -48,8 +48,8 @@
</div>
#end
## ------ START #o_main -----
<div id="o_main">
## ------ START #o_page -----
<div id="o_main_wrapper">
<div id="o_main_container" class="container-fluid">
$r.render("main")
<a id="o_toplink" href="#o_top" onclick="jQuery('#b_body').scrollTop(0);" title="$r.translateInAttribute("top.alt")">
......@@ -61,7 +61,7 @@
## END #o_main -----
## ----- START #b_footer ----------
<div id="o_footer">
<div id="o_footer_wrapper">
#if($r.available("footerComponent"))
$r.render("footerComponent")
#end
......
#o_footer {
#o_footer_wrapper {
@if $o-footer-position-absolute == true {
position: absolute; bottom: 0;
}
......
......@@ -17,7 +17,7 @@ body {
bottom: 10px; right: 10px;
}
#o_main {
#o_main_wrapper {
background: $o-main-outer-bg;
#o_main_container {
max-width: $o-page-width-max;
......
#o_navbar {
#o_navbar_wrapper {
// @extend .navbar-inverse;
}
#o_navbar_container {
position: relative;
max-width: $o-page-width-max;
#o_navbar_header {
a.navbar-brand {
font-size: 40px;
vertical-align: top;
font-weight: bold;
color: #31729B;
&:after {
content: "\221E";
}
}
}
#o_navbar_container {
position: relative;
max-width: $o-page-width-max;
#o_navbar_tabs {
li a {
padding-right: ($grid-gutter-width);
#o_navbar_header {
a.navbar-brand {
font-size: 40px;
vertical-align: top;
font-weight: bold;
color: #31729B;
&:after {
content: "\221E";
}
}
}
.o_navbar_tab_close {
position: absolute;
top: floor($grid-gutter-width / 2);
right:0.5em;
padding: 0;
width: 1em; height: 1em;
span {
@extend .glyphicon;
@extend .glyphicon-minus-sign;
&:before { color: #A87E7E; }
#o_navbar_tabs {
li a {
padding-right: ($grid-gutter-width);
}
&:hover {
span:before { color: #CC0000; }
.o_navbar_tab_close {
position: absolute;
top: floor($grid-gutter-width / 2);
right:0.5em;
padding: 0;
width: 1em; height: 1em;
span {
@extend .glyphicon;
@extend .glyphicon-minus-sign;
&:before { color: #A87E7E; }
}
&:hover {
span:before { color: #CC0000; }
}
}
}
}
#o_navbar_tools {
#o_navbar_search_opener a.dropdown-toggle span {
@extend .glyphicon;
@extend .glyphicon-search;
}
#o_navbar_langchooser {
color: $navbar-default-color;
padding: floor($grid-gutter-width / 2);
form span + div {
display: inline;
#o_navbar_tools {
#o_navbar_search_opener a.dropdown-toggle span {
@extend .glyphicon;
@extend .glyphicon-search;
}
}
#o_navbar_help a span {
@extend .glyphicon;
@extend .glyphicon-question-sign;
margin-right: 0.4em;
}
#o_navbar_my_menu {
.dropdown-toggle {
padding-left: floor($grid-gutter-width / 2) + 30px;
#o_navbar_langchooser {
color: $navbar-default-color;
padding: floor($grid-gutter-width / 2);
form span + div {
display: inline;
}
}
img {
position: absolute;
left: floor($grid-gutter-width / 4);
top: floor(30px - $line-height-computed);
height: 30px;
width: 30px;
@extend .img-circle;
#o_navbar_help a span {
@extend .glyphicon;
@extend .glyphicon-question-sign;
margin-right: 0.4em;
}
}
#o_navbar_my_menu {
.dropdown-toggle {
padding-left: floor($grid-gutter-width / 2) + 30px;
}
img {
position: absolute;
left: floor($grid-gutter-width / 4);
top: floor(30px - $line-height-computed);
height: 30px;
width: 30px;
@extend .img-circle;
}
}
}
}
}
\ No newline at end of file
source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -30,4 +30,4 @@
@import "all_modules";
/* -------- imports of all print and mobile overrides -------*/
@import "all_print_and_mobile";
//@import "all_print_and_mobile";
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment