Skip to content

Commit f59041d

Browse files
committed
minor #1460 Tweaked some styles (javiereguiluz)
This PR was merged into the main branch. Discussion ---------- Tweaked some styles Some minor tweaks to make the app look like it was before the last big template/Bootstrap upgrade. Commits ------- fbdb19b Tweaked some styles
2 parents 38ad58e + fbdb19b commit f59041d

File tree

11 files changed

+46
-22
lines changed

11 files changed

+46
-22
lines changed

assets/styles/app.scss

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
--font-subtitle: 1.5rem;
1919
--font-default: 19px;
2020
--secondary-color: #ecf0f1;
21+
--text-color: #2c3e50;
2122
--blue: #007bff;
2223
--red: #dc3545;
2324
--yellow: #ffc107;
@@ -64,8 +65,10 @@ li:not(.nav-item) {
6465

6566
code {
6667
background: var(--secondary-color);
67-
color: var(--blue);
68+
border-radius: 4px;
69+
color: var(--text-color);
6870
font-size: 90%;
71+
padding: 2px 4px;
6972
}
7073

7174
.text-danger, .text-danger:hover {
@@ -97,12 +100,29 @@ a:hover {
97100
margin-bottom: 0;
98101
}
99102

103+
.btn {
104+
padding: 10px 15px;
105+
}
106+
107+
form legend {
108+
font-size: 22.5px;
109+
}
110+
100111
/* Utilities
101112
------------------------------------------------------------------------- */
102113
.jumbotron {
103114
padding: 1.5rem 1rem
104115
}
105116

117+
.well {
118+
background-color: var(--secondary-color);
119+
border: 1px solid transparent;
120+
border-radius: 4px;
121+
margin-bottom: 20px;
122+
min-height: 20px;
123+
padding: 19px;
124+
}
125+
106126
/* Page elements
107127
------------------------------------------------------------------------- */
108128
body {
@@ -129,7 +149,7 @@ header nav.navbar .nav-item {
129149
}
130150

131151
#locale-selector-modal {
132-
background: #2c3e50;
152+
background: var(--text-color);
133153
}
134154
@media (min-width: 768px) {
135155
#locale-selector-modal .modal-dialog {
@@ -141,7 +161,7 @@ header nav.navbar .nav-item {
141161
border: 0;
142162
}
143163
#locale-selector-modal .modal-header {
144-
background: #2c3e50;
164+
background: var(--text-color);
145165
border-bottom: 0;
146166
color: var(--white);
147167
}
@@ -150,7 +170,7 @@ header nav.navbar .nav-item {
150170
opacity: 1;
151171
}
152172
#locale-selector-modal .modal-body {
153-
background: #2c3e50;
173+
background: var(--text-color);
154174
}
155175
#locale-selector-modal .modal-body .locales {
156176
list-style: none;
@@ -303,7 +323,7 @@ footer #footer-resources i {
303323
/* Misc. elements
304324
------------------------------------------------------------------------- */
305325
.section.rss a {
306-
color: var(--yellow);
326+
color: var(--orange);
307327
font-size: 21px;
308328
}
309329

@@ -417,14 +437,18 @@ body#login .form-group-password input {
417437
body#login .form-group-password button {
418438
background: transparent;
419439
border: 0;
420-
color: #2C3E50;
440+
color: var(--text-color);
421441
height: 45px;
422442
outline: 0;
423443
position: absolute;
424444
bottom: 0;
425445
right: 0;
426446
}
427447

448+
body#login #login-help table td {
449+
vertical-align: middle;
450+
}
451+
428452
/* Common Blog page elements
429453
------------------------------------------------------------------------- */
430454
.post h2 {

public/build/app.151d1f5e.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

public/build/app.943c2cf3.css renamed to public/build/app.51a62e82.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/app.e1219b00.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/entrypoints.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"/build/runtime.c56be18b.js",
66
"/build/608.626b1a4f.js",
77
"/build/691.00474683.js",
8-
"/build/app.151d1f5e.js"
8+
"/build/app.e1219b00.js"
99
],
1010
"css": [
1111
"/build/691.5d22d6da.css",
12-
"/build/app.943c2cf3.css"
12+
"/build/app.51a62e82.css"
1313
]
1414
},
1515
"admin": {
@@ -28,9 +28,9 @@
2828
"/build/runtime.c56be18b.js": "sha384-Cdl61iQY709LV5xk4fjbcXyComo/jpLrd2Q4lyCXTBFRFq4AqQsmJkF6DyKpj9tr",
2929
"/build/608.626b1a4f.js": "sha384-E2b89OD+49Lsk6EXg/KCDPqwEd43B8Qjc8SdqMEdGdS7LQyDTw0KXV/PjfA1/njZ",
3030
"/build/691.00474683.js": "sha384-IebcSy563+wytSYXkK+fxDGaR3Q7j+zmBrvadQzX3tHevDTxSKFhv29BMJkywEAS",
31-
"/build/app.151d1f5e.js": "sha384-qOCs9Ye5CRGRR+pX1T7aZzle7EaX4tR1nicFOXSmjapcKKQF3hojmQvHfqwFMlMY",
31+
"/build/app.e1219b00.js": "sha384-iK1sIjHtpmBy68MlhjNSPSuLPH2UVhpVU4v/7fpM8H8LwxVUWlmYX0Ly5XVBLsMC",
3232
"/build/691.5d22d6da.css": "sha384-Aj2DvjS/WxFSIf9uLVnmH9Dw6pixHWGKWrOnGxgr2eRW82BIPnXYihtUQyUMQmGm",
33-
"/build/app.943c2cf3.css": "sha384-rv0bqeqU66U5XVk/gfrJApDMZTqC49IsRO7N/jtXOuccmxS0mjwUWEqeRYkJhrJ5",
33+
"/build/app.51a62e82.css": "sha384-kXZooqI0TAfGp91O2YFZ2Vu0rjfyiSXuhEDxhXBpWXSt5kKzYRhjZr9E2teL7KLa",
3434
"/build/673.a8a6034c.js": "sha384-hsruohAAUG973CEl8FPGEzptQtqKi2m4i5/f7AK0WdjVA2HABqo4PDIl5F0ADoI2",
3535
"/build/admin.2e00d7c6.js": "sha384-YdDZ6+TI8dzJ9EiFd0aE8XviYeBOqUkEs1AL2l+Xxwyr8bU/KuUdxdGefgKpJIYq",
3636
"/build/admin.fd62a737.css": "sha384-fvoGdQq5TDnWkCaATqeO2OTzoej/gs53cfF+zl4mhBgy0Vf39tFB0tBXaVf/Ijno"

public/build/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"build/app.css": "/build/app.943c2cf3.css",
3-
"build/app.js": "/build/app.151d1f5e.js",
2+
"build/app.css": "/build/app.51a62e82.css",
3+
"build/app.js": "/build/app.e1219b00.js",
44
"build/admin.css": "/build/admin.fd62a737.css",
55
"build/admin.js": "/build/admin.2e00d7c6.js",
66
"build/runtime.js": "/build/runtime.c56be18b.js",

templates/blog/about.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="section about">
2-
<div class="jumbotron">
2+
<div class="well">
33
<p>
44
{{ 'help.app_description'|trans|raw }}
55
</p>

templates/blog/comment_form_error.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% block main %}
66
<h1 class="text-danger">{{ 'title.comment_error'|trans }}</h1>
77

8-
<div class="jumbotron">
8+
<div class="well">
99
{{ include('blog/_comment_form.html.twig') }}
1010
</div>
1111
{% endblock %}

templates/blog/post_show.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
{{ include('blog/_post_tags.html.twig') }}
1616

17-
<div id="post-add-comment" class="jumbotron">
17+
<div id="post-add-comment" class="well">
1818
{# The 'IS_AUTHENTICATED_FULLY' role ensures that the user has entered
1919
their credentials (login + password) during this session. If they
2020
are automatically logged via the 'Remember Me' functionality, they won't

templates/security/login.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#}
1818
<div class="row" {{ stimulus_controller('login') }}{# @see assets/controllers/login-controller.js #}>
1919
<div class="col-sm-5">
20-
<div class="jumbotron">
20+
<div class="well">
2121
<form action="{{ path('security_login') }}" method="post">
2222
<fieldset>
2323
<legend><i class="fa fa-lock" aria-hidden="true"></i> {{ 'title.login'|trans }}</legend>
@@ -83,8 +83,8 @@
8383
</tbody>
8484
</table>
8585

86-
<div id="login-users-help" class="panel panel-default">
87-
<div class="panel-body">
86+
<div id="login-users-help" class="card">
87+
<div class="card-body">
8888
<p>
8989
<span class="badge badge-success">{{ 'note'|trans }}</span>
9090
{{ 'help.reload_fixtures'|trans }}<br/>

0 commit comments

Comments
 (0)