Skip to content

Get rid of bootstrap overrides #230

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

Merged
Nyholm merged 3 commits into from
May 26, 2018
Merged

Get rid of bootstrap overrides #230

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
316a37c
Get rid of bootstrap overrides
FabienPapet May 22, 2018
475b138
Update webui.css
FabienPapet May 23, 2018
cb84669
Update base.html.twig
FabienPapet May 23, 2018
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
6 changes: 3 additions & 3 deletions Resources/public/css/webui.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/* Navigation */
.navbar {
.configs {
padding: 0 2rem;
}
.navbar-nav .nav-text{
.configs .navbar-nav .nav-text{
font-weight: bold;
padding-top: 0.2rem;
padding-bottom: 0;
display: inline-block;
width: 6rem;
}

.navbar-nav .nav-link {
Copy link
Member

@bocharsky-bw bocharsky-bw May 23, 2018

Choose a reason for hiding this comment

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

And the same here

.configs .navbar-nav .nav-link {
padding-top: 0.1rem;
padding-bottom: 0.1rem;
}
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/WebUI/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</head>
<body>

<nav class="navbar navbar-light bg-faded">
Copy link
Member

@bocharsky-bw bocharsky-bw May 23, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Hm, it may be that devs already have configs ID somewhere in their template. I'd rather use CSS class here too like:
<nav class="configs navbar navbar-light bg-faded">

Possible CSS classes duplicating is much better than ID duplicating IMO

Copy link
Contributor Author

@FabienPapet FabienPapet May 23, 2018

Choose a reason for hiding this comment

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

Agree, will fix this this evening

<nav class="navbar navbar-light bg-faded configs">
<ul class="nav navbar-nav">
<li class="nav-item"><span class="nav-text">Configs:</span></li>
{% for c in configNames %}
Expand Down