Permalink
Browse files

[MERGE] *: use SCSS as language for design (instead of LESS)

The main reason this is done is to prepare the migration to bootstrap 4.
It has other advantages though, like speed to compute the css and more
convenient language features (if/else/maps/...).

Detailed information about this merge can be found in the merge's
sub-commits.
  • Loading branch information...
qsm-odoo committed Apr 18, 2018
2 parents 5ea27d4 + 16ddf4a commit e41bcb0e311bfa67c78a13e377ae5c4931ecf24e
Showing 470 changed files with 18,807 additions and 20,171 deletions.
@@ -13,7 +13,6 @@ recursive-include odoo *.ico
recursive-include odoo *.jpeg
recursive-include odoo *.jpg
recursive-include odoo *.js
recursive-include odoo *.less
recursive-include odoo *.md
recursive-include odoo *.mp3
recursive-include odoo *.ogg
@@ -26,7 +25,7 @@ recursive-include odoo *.po
recursive-include odoo *.rml
recursive-include odoo *.rng
recursive-include odoo *.rst
recursive-include odoo *.sass
recursive-include odoo *.scss
recursive-include odoo *.sql
recursive-include odoo *.svg
recursive-include odoo *.template

This file was deleted.

Oops, something went wrong.
@@ -1,24 +1,24 @@
.o_kanban_view.o_kanban_dashboard.o_account_kanban {
&.o_kanban_ungrouped .o_account_dashboard_header {
margin: (0 - @o-kanban-record-margin) (@o-kanban-record-margin - @odoo-horizontal-padding) @o-kanban-record-margin;
margin: (0 - $o-kanban-record-margin) ($o-kanban-record-margin - $o-horizontal-padding) $o-kanban-record-margin;
}
.o_account_dashboard_header {
.o-flex(1, 0, 100%);
.o-flex-flow(column, nowrap);
.o-align-self(flex-start);
@include o-flex(1, 0, 100%);
@include o-flex-flow(column, nowrap);
@include o-align-self(flex-start);
width: 100%;
height: auto; // cancel o_form_view height 100%, which hides the help tip message at the bottom of the screen
min-height: 0%; // cancel o_form_view min-height 100%, which hides the help tip message at the bottom of the screen
background-color: @odoo-view-background-color;
background-color: $o-view-background-color;
.o_form_statusbar {
padding-right: @odoo-horizontal-padding;
padding-right: $o-horizontal-padding;
}
h4 {
font-size: @font-size-base;
font-size: $font-size-base;
font-weight: 500;
}
@@ -30,31 +30,31 @@
}
.o_arrow_button.btn-default {
color: @text-muted;
color: $text-muted;
text-transform: none;
font-weight: 500;
.o_account_dashboard_index {
color: @gray-dark;
color: $gray-dark;
}
&.o_action_done {
color: @gray-dark;
background-color: @gray-lighter;
color: $gray-dark;
background-color: $gray-lighter;
&:after {
border-left-color: @gray-lighter;
border-left-color: $gray-lighter;
}
.fa-check {
color: @brand-success;
color: $brand-success;
}
}
&:last-of-type {
margin-left: @odoo-horizontal-padding;
padding-left: @odoo-horizontal-padding*.5;
border-left: 1px solid @gray-lighter-dark;
margin-left: $o-horizontal-padding;
padding-left: $o-horizontal-padding*.5;
border-left: 1px solid $gray-lighter-dark;
}
}
}
@@ -6,17 +6,17 @@
}
.o_kanban_card_settings {
padding-top: @odoo-horizontal-padding/2;
padding-bottom: @odoo-horizontal-padding/2;
padding-top: $o-horizontal-padding/2;
padding-bottom: $o-horizontal-padding/2;
border-top: 1px solid;
border-color: @odoo-brand-lightsecondary;
border-color: $o-brand-lightsecondary;
}
.o_dashboard_star {
font-size: 12px;
&.fa-star-o {
color: @odoo-main-color-muted;
color: $o-main-color-muted;
&:hover {
color: gold;
}
@@ -27,7 +27,7 @@
}
.o_dashboard_graph {
margin-bottom: -@odoo-horizontal-padding/2;
margin-bottom: -$o-horizontal-padding/2;
}
}
@@ -58,7 +58,7 @@
}
g.tick.major {
// Don't know why, but leads to strange bold text
// stroke: @odoo-brand-primary;
// stroke: $o-brand-primary;
line {
display: none;
@@ -72,13 +72,13 @@
g.nv-linesWrap {
g.nv-group.nv-series-0 {
fill-opacity: 0.3 !important;
fill: @odoo-brand-primary !important;
stroke: @odoo-brand-primary !important;
fill: $o-brand-primary !important;
stroke: $o-brand-primary !important;
.nv-point {
visibility: hidden;
r: 3;
stroke: @odoo-brand-primary !important;
stroke: $o-brand-primary !important;
fill: white;
stroke-width: 2;
}
@@ -99,11 +99,11 @@
g.nv-group.nv-series-0 {
g.past {
opacity: 0.5;
fill: @odoo-brand-primary !important;
fill: $o-brand-primary !important;
}
g.future {
opacity: 0.5;
fill: @odoo-brand-optional !important;
fill: $o-brand-optional !important;
}
}
}
@@ -1,11 +1,3 @@
@actionColWidth: 15px;
@mainTableBordersPadding: 3px;
@lightBorder: 1px solid #bbb;
@accountingBorder: 1px solid #000;
@initialLineBackground: #f0f0f0;
@infoColor: #44c;
.o_reconciliation {
h1 {
width: 48%;
@@ -16,9 +8,9 @@
height: 1.5em;
line-height: 1.5em;
&.statement_name {
.o-text-overflow();
@include o-text-overflow;
&.editable:hover {
outline: 1px dashed @odoo-brand-optional;
outline: 1px dashed $o-brand-optional;
outline-offset: -1px;
cursor: pointer;
}
@@ -51,7 +43,7 @@
.o_view_noreconciliation {
max-width: none;
padding: 0 10%;
color: @odoo-main-color-muted;
color: $o-main-color-muted;
font-size: 125%;
}
@@ -110,16 +102,16 @@
cursor: pointer;
}
tr.already_reconciled {
color: @infoColor;
color: $o-account-info-color;
}
tr.invalid {
text-decoration: line-through;
}
thead td {
border-top: @lightBorder;
border-top: $o-account-light-border;
padding-top: 4px;
padding-bottom: 5px;
background-color: @initialLineBackground;
background-color: $o-account-initial-line-background;
}
tfoot td {
color: #bbb;
@@ -129,7 +121,7 @@
.cell_action {
width: 15px;
color: @gray;
color: $gray;
background: #fff;
border: 0;
.fa-add-remove:before {
@@ -182,29 +174,19 @@
td {
padding-top: 10px;
text-align: center;
color: @infoColor;
color: $o-account-info-color;
}
}
/* Icons */
.toggle_match, .toggle_create {
.o-transform(rotate(0deg));
.o-transition(transform, 300ms);
@include o-transform(rotate(0deg));
@include o-transition(transform, 300ms);
}
.visible_toggle {
.visible_toggle, &[data-mode="match"] .toggle_match, &[data-mode="create"] .toggle_create {
visibility: visible !important;
.o-transform(rotate(90deg));
}
&[data-mode="match"] {
.toggle_match {
.visible_toggle;
}
}
&[data-mode="create"] {
.toggle_create {
.visible_toggle;
}
@include o-transform(rotate(90deg));
}
/* Match view & Create view */
@@ -214,18 +196,18 @@
overflow: hidden;
margin-top: 5px;
margin-bottom: 5px;
.o-transition(max-height, 250ms);
@include o-transition(max-height, 250ms);
}
&[data-mode="match"] > .match {
max-height: none;
.o-transition(max-height, 400ms);
@include o-transition(max-height, 400ms);
}
&[data-mode="create"] > .create {
max-height: 210px;
.o-transition(max-height, 400ms);
@include o-transition(max-height, 400ms);
}
}
/* Match view */
.match {
@@ -241,7 +223,7 @@
content: "\f067";
}
.match_controls {
padding: 0 0 5px (@actionColWidth+@mainTableBordersPadding);
padding: 0 0 5px ($o-account-action-col-width+$o-account-main-table-borders-padding);
.filter {
width: 240px;
@@ -264,15 +246,15 @@
}
.show_more {
display: inline-block;
margin-left: (@actionColWidth+@mainTableBordersPadding);
margin-left: ($o-account-action-col-width+$o-account-main-table-borders-padding);
margin-top: 5px;
}
}
/* Create view */
.create {
> div {
margin: 0 @actionColWidth;
margin: 0 $o-account-action-col-width;
padding: 10px;
overflow: auto;
border: 1px solid #ddd;
@@ -304,7 +286,7 @@
.add_line_container {
text-align: center;
clear: both;
color: @infoColor;
color: $o-account-info-color;
cursor: pointer;
}
}
@@ -0,0 +1,5 @@
$o-account-action-col-width: 15px !default;
$o-account-main-table-borders-padding: 3px !default;
$o-account-light-border: 1px solid #bbb !default;
$o-account-initial-line-background: #f0f0f0 !default;
$o-account-info-color: #44c !default;
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="_assets_backend_helpers" inherit_id="web._assets_backend_helpers">
<xpath expr="//link" position="before">
<link rel="stylesheet" type="text/scss" href="/account/static/src/scss/variables.scss"/>
</xpath>
</template>
<template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<link rel="stylesheet" href="/account/static/src/css/account_bank_and_cash.css"/>
<link rel="stylesheet" href="/account/static/src/css/account.css"/>
<link rel="stylesheet" href="/account/static/src/less/account_reconciliation.less"/>
<link rel="stylesheet" href="/account/static/src/less/account_journal_dashboard.less"/>
<link rel="stylesheet" href="/account/static/src/less/account_dashboard.less"/>
<link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_reconciliation.scss"/>
<link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_journal_dashboard.scss"/>
<link rel="stylesheet" type="text/scss" href="/account/static/src/scss/account_dashboard.scss"/>
<script type="text/javascript" src="/account/static/src/js/reconciliation/reconciliation_action.js"></script>
<script type="text/javascript" src="/account/static/src/js/reconciliation/reconciliation_model.js"></script>
@@ -29,7 +29,7 @@
</t>
</div>
<t t-if="journal_type == 'bank' || journal_type == 'cash' || journal_type == 'sale' || journal_type == 'purchase'" t-call="JournalBodyGraph"/>
</div><div class="container o_kanban_card_manage_pane">
</div><div class="container o_kanban_card_manage_pane dropdown-menu">
<t t-call="JournalManage"/>
</div>
</div>
@@ -1,9 +1,9 @@
.o_web_client .o_deprec_lines_toggler {
color: @brand-danger;
color: $brand-danger;
&.o_is_posted {
color: @brand-success;
color: $brand-success;
}
&.o_unposted {
color: @brand-warning;
color: $brand-warning;
}
}
@@ -2,7 +2,7 @@
<odoo>
<template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<link rel="stylesheet" href="/account_asset/static/src/less/account_asset.less"/>
<link rel="stylesheet" type="text/scss" href="/account_asset/static/src/scss/account_asset.scss"/>
<script type="text/javascript" src="/account_asset/static/src/js/account_asset.js"></script>
</xpath>
</template>
@@ -27,7 +27,7 @@
<label for="auth_oauth_google_client_id" string="Client ID:" class="col-md-3 o_light_label"/>
<field name="auth_oauth_google_client_id" placeholder="e.g. 1234-xyz.apps.googleusercontent.com"/>
</div>
<a href="https://www.odoo.com/documentation/user/online/general/auth/google.html" target="_blank" class="oe_link"><i class="fa fa-fw fa-arrow-right"/>Tutorial</a>
<a href="https://www.odoo.com/documentation/user/online/general/auth/google.html" target="_blank"><i class="fa fa-fw fa-arrow-right"/>Tutorial</a>
</div>
</div>
</div>
Oops, something went wrong.

0 comments on commit e41bcb0

Please sign in to comment.