Skip to content
Snippets Groups Projects
Commit e766f870 authored by uhensler's avatar uhensler
Browse files

OO-3929: Refactoring CSS, delete unused stuff

parent 0dd50662
No related branches found
No related tags found
No related merge requests found
Showing
with 79 additions and 78 deletions
<div class="o_vfseditor_config"> <div class="o_doceditor_config">
<div class="navbar-collapse"> <div class="navbar-collapse">
#if($r.available("backLink")) #if($r.available("backLink"))
<ul class="nav navbar-nav navbar-left"> <ul class="nav navbar-nav navbar-left">
......
<div class="o_vfseditor $!cssClass"> <div class="o_doceditor $!cssClass">
$r.render("config") $r.render("config")
#if($r.available("editor")) #if($r.available("editor"))
$r.render("editor") $r.render("editor")
......
<div class="o_vfseditor_config">
<div class="navbar-collapse">
#if($r.available("backLink"))
<ul class="nav navbar-nav navbar-left">
<li>
$r.render("backLink")
</li>
</ul>
#end
#if($r.available("editor.selection"))
<ul class="nav navbar-nav navbar-right">
<li>
$r.render("editor.selection")
</li>
</ul>
#end
</div>
</div>
\ No newline at end of file
<div class="o_vfseditor $!cssClass">
$r.render("config")
#if($r.available("editor"))
$r.render("editor")
#else
<div class="o_warning">
$r.translate("error.no.editor")
</div>
#end
</div>
\ No newline at end of file
error.no.editor=Die Datei kann nicht angezeigt werden.
error.no.editor=The content of the document cannot be displayed.
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
@import "modules/lecture"; @import "modules/lecture";
@import "modules/edubase"; @import "modules/edubase";
@import "modules/edusharing"; @import "modules/edusharing";
@import "modules/collabora"; @import "modules/doceditor";
@import "modules/taxonomy"; @import "modules/taxonomy";
@import "modules/thirdparty"; @import "modules/thirdparty";
......
.o_vfseditor { .o_doceditor {
margin-top: 10px;
.o_doceditor_config {
.nav {
button {
margin-top: 8px;
}
}
}
// Avoid collapsing the navbar on small devices
.navbar-collapse.collapse {
display: block!important;
}
.navbar-nav>li, .navbar-nav {
float: left !important;
}
.navbar-nav.navbar-right:last-child {
margin-right: -15px !important;
}
.navbar-right {
float: right!important;
}
.navbar-nav > li > .dropdown-menu {
background-color: $navbar-default-bg;
border-color: $navbar-default-border;
position: absolute;
}
/** Collabora Online **/
.o_collabora { .o_collabora {
iframe { iframe {
width: 100%; width: 100%;
...@@ -30,4 +61,10 @@ ...@@ -30,4 +61,10 @@
} }
} }
} }
} }
\ No newline at end of file
.o_web_content {
.o_doceditor {
margin-top: 0px;
}
}
...@@ -194,45 +194,6 @@ ul.o_dropdown { ...@@ -194,45 +194,6 @@ ul.o_dropdown {
} }
} }
/* VFS */
.o_vfseditor {
margin-top: 10px;
.o_vfseditor_config {
.nav {
button {
margin-top: 8px;
}
}
}
// Avoid collapsing the navbar on small devices
.navbar-collapse.collapse {
display: block!important;
}
.navbar-nav>li, .navbar-nav {
float: left !important;
}
.navbar-nav.navbar-right:last-child {
margin-right: -15px !important;
}
.navbar-right {
float: right!important;
}
.navbar-nav > li > .dropdown-menu {
background-color: $navbar-default-bg;
border-color: $navbar-default-border;
position: absolute;
}
}
.o_web_content {
.o_vfseditor {
margin-top: 0px;
}
}
/* notifications and subscription */ /* notifications and subscription */
.o_notifications_news_wrapper { .o_notifications_news_wrapper {
.o_notifications_news_subscription { .o_notifications_news_subscription {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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