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

Searchbar height #6207

Merged
merged 3 commits into from
Feb 11, 2016
Merged

Searchbar height #6207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e78735f
[SearchBar] Fixed the height on the search bar
panda01 Feb 11, 2016
bcb4a0f
Merge remote-tracking branch 'upstream/feature/design' into fix/heade…
panda01 Feb 11, 2016
5259b63
[Navbar] Made the navbar spacing universal, also properly sized the l…
panda01 Feb 11, 2016
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
3 changes: 0 additions & 3 deletions src/plugins/kibana/public/dashboard/styles/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
navbar[name="dashboard-options"] {
padding-bottom: 0;
}
navbar[name="dashboard-search"] {
padding-bottom: 10px;
}
}

dashboard-grid {
Expand Down
3 changes: 0 additions & 3 deletions src/plugins/kibana/public/discover/styles/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
navbar[name="discover-options"] {
padding-bottom: 0;
}
navbar[name="discover-search"] {
padding-bottom: 10px;
}
}

.discover {
Expand Down
3 changes: 0 additions & 3 deletions src/plugins/kibana/public/visualize/editor/styles/_editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@
padding-bottom: 0;
}

navbar[name="visualize-search"] {
padding-bottom: 10px;
}

&-actions {
margin-left: auto;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/styles/control_group.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}

button {
padding: @padding-base-vertical @padding-base-horizontal;
padding: 4px 10px;
font-size: @font-size-base;
color: @control-group-link-color;
background-color: @control-group-bg;
Expand Down
7 changes: 6 additions & 1 deletion src/ui/public/styles/navbar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ navbar {
max-height: @navbar-collapse-max-height;
margin-bottom: @navbar-margin-bottom;
// top and bottom padding are normally calcuated and stored in @navbar-padding-vertical, but flexbox
padding: @padding-base-vertical @navbar-padding-horizontal;
padding: 0 @navbar-padding-horizontal 6px @navbar-padding-horizontal;
color: @navbar-default-color;
background-color: @navbar-default-bg;
border: none;
Expand All @@ -20,6 +20,11 @@ navbar {
padding-right: @navbar-padding-horizontal;
}

.navbar-text {
margin-top: 6px;
margin-bottom: 6px;
}

// the "brand" that is displayed, usually on the left of the navbar
> .name {
align-self: center;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/styles/variables/bootstrap-mods.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
@navbar-height: 45px;
@navbar-margin-bottom: 0px;
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-horizontal: 10px;
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@navbar-collapse-max-height: 340px;

Expand Down