diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
new file mode 100644
index 00000000000..b4b8a4b518f
--- /dev/null
+++ b/addons/website/static/src/css/snippets.css
@@ -0,0 +1,171 @@
+/*
+.oe_snippet_demo .oe_page{
+ margin-top: 50px;
+ margin-bottom: 300px;
+ padding-bottom: 10px;
+
+}
+.oe_snippet_demo .oe_page .oe_container{
+ min-height: 200px;
+}
+.oe_snippet_demo .oe_page *{
+ outline: 1px solid transparent;
+ -webkit-transiton: all 150ms linear;
+}
+.oe_snippet_demo .oe_page .oe_selected{
+ position: relative;
+ outline: 2px dashed rgba(151, 137, 255,0.5) !important;
+ cursor: pointer;
+}
+.oe_snippet_demo .oe_page .oe_selected:after{
+ content:'Insert Snippet Here';
+ position: absolute;
+ height:20px; left:-2px; right:-2px; bottom:-10px;
+ background: rgba(151, 137, 255, 1);
+ border-radius: 2px;
+ z-index: 800;
+ pointer-events :none;
+ color: white;
+ text-shadow: none;
+ font-size: 14px;
+ line-height: 20px;
+ text-align: center;
+}
+.oe_snippet_demo.oe_new .oe_page .oe_selected:after{
+ content:'';
+ height:100%;
+ top:0px; left:0px; right:0px; bottom:0px;
+ background: rgba(151, 137, 255, 0.2);
+}
+
+.oe_snippet_editor{
+ position: fixed;
+ z-index: 1000;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ height: 214px;
+ background: rgb(160,160,160);
+ box-shadow: 0px 1px 3px rgb(100,100,100) inset;
+ overflow-y: hidden;
+ overflow-x: scroll;
+}
+*/
+
+.oe_snippet_list{
+ width: auto;
+ white-space: nowrap;
+ margin-left: 20px;
+}
+.oe_snippet_editor .oe_snippet{
+ box-sizing: border-box;
+ display: inline-block;
+ width: 220px;
+ height: 160px;
+ border-radius: 3px;
+ background: white;
+ margin: 20px;
+ margin-left: 0px;
+ cursor: pointer;
+ border: 2px solid transparent;
+ box-shadow: 0px 1px 3px rgb(100,100,100);
+ position: relative;
+ top: 0px;
+ -webkit-transition: all 150ms linear;
+ overflow: hidden;
+ vertical-align: top;
+ user-select: none;
+ white-space: normal;
+}
+
+
+
+.oe_snippet_editor .oe_snippet:after{
+ content: attr(name);
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ background: rgba(255,255,255,0.8);
+ text-align: center;
+ color: black;
+ padding: 8px;
+
+}
+.oe_snippet_editor .oe_snippet.oe_selected{
+ border: 2px solid rgb(151, 137, 255);
+ box-shadow: 0px 3px 17px rgba(99, 53, 150, 0.59);
+
+}
+.oe_snippet_editor .oe_snippet > *{
+ pointer-events: none;
+ margin-top: 16px;
+ line-height: 1em;
+ zoom: 0.6;
+}
+.oe_snippet_editor .oe_snippet > .oe_container{
+ margin-top: 0px;
+ zoom: 0.23;
+ line-height: 0.999em;
+ line-height: 1em;
+}
+.oe_snippet_editor .oe_snippet > .oe_row{
+ margin-top: 0px;
+ zoom: 0.23;
+ line-height: 0.999em;
+}
+.oe_snippet_editor .oe_snippet > .oe_span6{
+ margin-top: 16px;
+ zoom: 0.47;
+}
+.oe_snippet_editor .oe_snippet > .oe_span12{
+ margin-top: 16px;
+ zoom: 0.23;
+}
+.oe_snippet_editor .oe_snippet > p{
+ position: absolute;
+ top: 0;
+ right: 0;
+ left: 0;
+ bottom: 0;
+ font-size: 20px;
+ padding: 16px;
+ zoom: 1;
+ margin: 0px;
+}
+.oe_snippet_editor .oe_snippet.oe_new{
+ background: gray;
+ box-shadow: 0px 1px 3px rgb(90,90,90) inset;
+ border: 0px;
+}
+.oe_snippet_editor .oe_snippet.oe_new.oe_selected{
+ box-shadow: 0px 2px 0px 0px rgb(151,137,255) inset, 0px 3px 17px rgba(99, 53, 150, 0.59) inset;
+}
+.oe_snippet_editor .oe_snippet.oe_new > *{
+ zoom:1;
+ margin: 0;
+ line-height: 160px;
+ text-align: center;
+ color: white;
+ font-size: 48px;
+}
+.oe_snippet_editor .oe_snippet.oe_new:after{
+ position: absolute;
+ left: 0px;
+ right: 0px;
+ top: 0px;
+ bottom: 0px;
+ background: transparent;
+ color: white;
+ text-shadow: 0px 1px 3px black;
+ line-height: 160px;
+ padding: 0px;
+}
+/*
+[class*="span"]{
+ margin-left: 0px !important;
+}
+*/
+
+
+
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 4d674569c01..2e1d5876489 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -72,3 +72,7 @@ header.navbar-fixed-top {
background: #eff8f8;
padding: 64px;
}
+
+.nav > .pull-right {
+ float: right !important;
+}
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 95c5448440e..de9bb526d32 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -50,3 +50,6 @@ header.navbar-fixed-top
.dark
background: rgb(239, 248, 248)
padding: 64px
+
+.nav > .pull-right
+ float: right !important //bugfix for flatly theme
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index fc9ee60fbfe..248213b79da 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -10,9 +10,9 @@
OpenERP
-