From b36da567df0f32dca693f23f456173fe15f77612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 16 Aug 2020 17:43:21 +0200 Subject: [PATCH] Customize default bootstrap theme The bootstrap rules are imported from sao less file to override some variables. We embed a stripped version of the bootswatch paper theme. We also try to import an option custom.less file. issue9427 review294011002 --- CHANGELOG | 1 + COPYRIGHT | 1 + Gruntfile.js | 21 +- index.html | 29 ++- src/input-icon.less | 5 +- src/offcanvas.less | 6 +- src/sao-variables.less | 29 +++ src/sao.js | 30 +-- src/sao.less | 96 ++++++- src/screen.js | 2 +- src/tab.js | 3 +- src/theme.less | 568 +++++++++++++++++++++++++++++++++++++++++ src/view/tree.js | 2 +- 13 files changed, 738 insertions(+), 55 deletions(-) create mode 100644 src/sao-variables.less create mode 100644 src/theme.less diff --git a/CHANGELOG b/CHANGELOG index 782f9b061d..531961e1af 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Customize bootstrap default style * Set field's name as input's name attribute * Position copied records based on order * Sanitize translated RichtText fields content (issue9453) diff --git a/COPYRIGHT b/COPYRIGHT index 5e59971036..9cba55f27a 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -3,6 +3,7 @@ Copyright (C) 2012-2020 Cédric Krier. Copyright (C) 2012-2014 Bertrand Chenal. Copyright (C) 2012-2020 B2CK SPRL. Copyright (C) 2019 Jitbit. +Copyright (C) 2013 Thomas Park This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Gruntfile.js b/Gruntfile.js index 990c6c5901..d530bd03fb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -100,19 +100,32 @@ module.exports = function(grunt) { less: { dev: { options: { - paths: ['src', 'bower_components/bootstrap/less'] + paths: [ + 'src', + 'bower_components', + 'bower_components/bootstrap', + 'bower_components/bootstrap/less', + 'bower_components/bootstrap-rtl-ondemand/less', + 'bower_components/eonasdan-bootstrap-datetimepicker/src/less', + ] }, files: { - 'dist/<%= pkg.name %>.css': 'src/*.less' + 'dist/<%= pkg.name %>.css': 'src/sao.less' } }, 'default': { options: { - paths: ['src', 'bower_components/bootstrap/less'], + paths: [ + 'src', + 'bower_components', + 'bower_components/bootstrap/less', + 'bower_components/bootstrap-rtl-ondemand/less', + 'bower_components/eonasdan-bootstrap-datetimepicker/src/less', + ], yuicompress: true }, files: { - 'dist/<%= pkg.name %>.min.css': 'src/*.less' + 'dist/<%= pkg.name %>.min.css': 'src/sao.less' } } }, diff --git a/index.html b/index.html index d8d6d1b4ca..ef61807acd 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - + @@ -23,9 +23,6 @@ this repository contains the full copyright notices and license terms. --> - - - @@ -42,7 +39,7 @@ this repository contains the full copyright notices and license terms. --> -