From 4dfd14ed0090937e0ac4d9a73b3cd9280b59c0bc Mon Sep 17 00:00:00 2001
From: Romain Estievenart <res@odoo.com>
Date: Wed, 31 Oct 2018 11:09:42 +0000
Subject: [PATCH 1/2] [REF] web: extract calendar mobile styling

Extract mobile calendar styling into dedicated SCSS file.

Task ID: 1891955
---
 addons/web/static/src/scss/web_calendar.scss  | 22 -------------------
 .../static/src/scss/web_calendar_mobile.scss  | 21 ++++++++++++++++++
 addons/web/views/webclient_templates.xml      |  1 +
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 addons/web/static/src/scss/web_calendar_mobile.scss

diff --git a/addons/web/static/src/scss/web_calendar.scss b/addons/web/static/src/scss/web_calendar.scss
index ae22efb2675..540b8710df3 100644
--- a/addons/web/static/src/scss/web_calendar.scss
+++ b/addons/web/static/src/scss/web_calendar.scss
@@ -197,25 +197,3 @@
         display: none;
     }
 }
-
-// Mobile rules
-@include media-breakpoint-down(sm) {
-    .o_calendar_container {
-        padding: 0;
-    }
-}
-@include media-breakpoint-down(sm) {
-    .o_control_panel {
-        .o_calendar_button_today {
-            float: right;
-            > .o_calendar_text {
-                margin-top: 3px;
-            }
-        }
-    }
-    .o_calendar_view {
-        .fc-day-header {
-            word-spacing: 1000px; // force line break in week mode
-        }
-    }
-}
diff --git a/addons/web/static/src/scss/web_calendar_mobile.scss b/addons/web/static/src/scss/web_calendar_mobile.scss
new file mode 100644
index 00000000000..55d44257666
--- /dev/null
+++ b/addons/web/static/src/scss/web_calendar_mobile.scss
@@ -0,0 +1,21 @@
+@include media-breakpoint-down(sm) {
+    .o_calendar_container {
+        padding: 0;
+    }
+
+    .o_control_panel {
+        .o_calendar_button_today {
+            float: right;
+            > .o_calendar_text {
+                margin-top: 3px;
+            }
+        }
+    }
+
+    .o_calendar_view {
+        .fc-day-header {
+            word-spacing: 1000px; // force line break in week mode
+        }
+    }
+
+}
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 4e560e53980..6ee489b56e4 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -174,6 +174,7 @@
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/kanban_view.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/kanban_view_mobile.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/web_calendar.scss"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/web_calendar_mobile.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/search_view.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/search_view_mobile.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/dropdown_menu.scss"/>

From 41b8a6a5637135c445cc9d7754629d2788bf637e Mon Sep 17 00:00:00 2001
From: Romain Estievenart <res@odoo.com>
Date: Wed, 31 Oct 2018 11:13:25 +0000
Subject: [PATCH 2/2] [IMP] web: mobile calendar today button alignment

The "today" button should be aligned (both size and position) with the
view switcher icon.

Task ID: 1891955
---
 addons/web/static/src/scss/web_calendar_mobile.scss |  3 ++-
 addons/web/static/src/xml/web_calendar.xml          | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/scss/web_calendar_mobile.scss b/addons/web/static/src/scss/web_calendar_mobile.scss
index 55d44257666..af1aa3d7145 100644
--- a/addons/web/static/src/scss/web_calendar_mobile.scss
+++ b/addons/web/static/src/scss/web_calendar_mobile.scss
@@ -5,7 +5,8 @@
 
     .o_control_panel {
         .o_calendar_button_today {
-            float: right;
+            font-size: 0.7em;
+            line-height: 1.9em;
             > .o_calendar_text {
                 margin-top: 3px;
             }
diff --git a/addons/web/static/src/xml/web_calendar.xml b/addons/web/static/src/xml/web_calendar.xml
index dad48fd15ff..e0cb81c6e9b 100644
--- a/addons/web/static/src/xml/web_calendar.xml
+++ b/addons/web/static/src/xml/web_calendar.xml
@@ -85,10 +85,12 @@
     </t>
 
     <t t-name="CalendarView.TodayButtonMobile">
-        <span class="fa-stack o_calendar_button_today">
-            <i class="fa fa-calendar-o fa-stack-2x" role="img" aria-label="Today" title="Today"></i>
-            <strong class="o_calendar_text fa-stack-1x"><t t-esc="moment().date()"/></strong>
-        </span>
+        <button class="btn btn-sm btn-link">
+            <span class="fa-stack o_calendar_button_today">
+                <i class="fa fa-calendar-o fa-stack-2x" role="img" aria-label="Today" title="Today"/>
+                <strong class="o_calendar_text fa-stack-1x"><t t-esc="moment().date()"/></strong>
+            </span>
+        </button>
     </t>
 
     <main t-name="CalendarView.quick_create" class="o_calendar_quick_create">