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 all 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
10 changes: 8 additions & 2 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 @@ -10,14 +10,20 @@
@import '~antd/lib/time-picker/style/index.less';

// Overwritting Ant Design defaults to fit into Redash current style
@redash-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;

@font-family-no-number : @redash-font;
@font-family : @redash-font;
@code-family : @redash-font;
@font-size-base : 13px;
@text-color : #767676;

@border-radius-base : @redash-input-radius;
@input-height-base : 35px;
@input-color : #9E9E9E;
@border-radius-base : 2px;
@border-color-base : #e8e8e8;

@primary-color : @blue;
@primary-color : #2196F3;

// Fix for disabled button styles inside Tooltip component.
// Tooltip wraps disabled buttons with `<span>` and moves all styles
Expand Down
1 change: 1 addition & 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 @@ -55,6 +55,7 @@
/* --------------------------------------------------------
Form
-----------------------------------------------------------*/
@input-color: #9E9E9E;
@input-color-placeholder: #b4b4b4;
@input-border: #e8e8e8;
@input-border-radius: 0;
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
2 changes: 0 additions & 2 deletions client/app/assets/less/redash/redash-newstyle.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,11 +811,9 @@ page-header, .page-header--new {
// Forms
.form-control {
border-radius: @redash-input-radius;
color: #9E9E9E;
arikfr marked this conversation as resolved.
Show resolved Hide resolved

&:focus {
box-shadow: none !important;
color: #111;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was about to comment this line to ask 😂. Ant has no color styling for focused inputs, I could either create a selector with a different color for antd or remove this to have the same behavior.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Well, if we switch to Ant's darker color everywhere, then we don't need this. Otherwise better to keep as without it the text is harder to read.

Copy link
Member Author

@gabrieldutra gabrieldutra Jan 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. Well, if we switch to Ant's darker color everywhere, then we don't need this. Otherwise better to keep as without it the text is harder to read.

D'accord 👍. Do you have a reason to update to Ant's darker color later (wait for discussion or ath) or should I update it here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason I suggested to do it in a follow up before was to be able to merge this already. But considering you did the heavy lifting already, we can do this. Or we can merge this and still do the change to darker color in a follow up.

I will let @ranbena decide :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge this bad-boy as is and follow up on colors later.

border-color: @blue;
}

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