Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate Bootstrap/Ant styling #3279

Merged
merged 6 commits into from
Jan 15, 2019
Merged

Separate Bootstrap/Ant styling #3279

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5615cd
Separate Ant less dependency tree
gabrieldutra Jan 13, 2019
1d44496
Change order between variables and ant imports
gabrieldutra Jan 13, 2019
81209e7
Remove inc/variables from ant.less
gabrieldutra Jan 14, 2019
e00d4d0
Merge remote-tracking branch 'master' into ant-bootstrap
gabrieldutra Jan 14, 2019
ab683a5
Update input-height-base for antd
gabrieldutra Jan 14, 2019
5f4f579
Set same input-color for Ant and Bootstrap
gabrieldutra Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/app/assets/less/redash/ant.less → client/app/assets/less/ant.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import '~antd/lib/button/style/index.less';
@import '~antd/lib/radio/style/index.less';
@import '~antd/lib/time-picker/style/index.less';
@import 'inc/variables';
ranbena marked this conversation as resolved.
Show resolved Hide resolved

// Overwritting Ant Design defaults to fit into Redash current style
@font-family-no-number : @redash-font;
Expand Down
12 changes: 12 additions & 0 deletions client/app/assets/less/inc/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@
@boxed-width: 1170px;
@body-bg: #edecec;

/* --------------------------------------------------------
Redash New Style (TODO: organize this better)
-----------------------------------------------------------*/
@redash-gray: rgba(102, 136, 153, 1);
@redash-orange: rgba(255, 120, 100, 1);
@redash-black: rgba(0, 0, 0, 1);
@redash-yellow: rgba(252, 252, 161, 0.75);
@redash-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@spacing: 15px;
@redash-space: 10px;
@redash-radius: 3px;
@redash-input-radius: 2px;

/* --------------------------------------------------------
Branding
Expand Down
2 changes: 0 additions & 2 deletions client/app/assets/less/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import 'redash/ant';

/** LESS Plugins **/
@import 'inc/less-plugins/for';

Expand Down
15 changes: 0 additions & 15 deletions client/app/assets/less/redash/redash-newstyle.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
@import (reference, less) '~bootstrap/less/labels.less';

// Variables
@redash-gray: rgba(102, 136, 153, 1);
@redash-orange: rgba(255, 120, 100, 1);
@redash-black: rgba(0, 0, 0, 1);
@redash-yellow: rgba(252, 252, 161, 0.75);
@redash-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;

@spacing: 15px;

//Default spacing (between tiles)
@redash-space: 10px;

@redash-radius: 3px;
@redash-input-radius: 2px;

// General
body {
padding-top: 0;
Expand Down
6 changes: 5 additions & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ const extensionPath = fs.realpathSync(path.join(__dirname, extensionsRelativePat
const config = {
mode: isProduction ? "production" : "development",
entry: {
app: ["./client/app/index.js", "./client/app/assets/less/main.less"],
app: [
"./client/app/index.js",
"./client/app/assets/less/main.less",
"./client/app/assets/less/ant.less"
],
server: ["./client/app/assets/less/server.less"]
},
output: {
Expand Down