Skip to content

Update bootswatch and bootstrap dependencies #1030

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

Closed
wants to merge 6 commits into from
Closed

Update bootswatch and bootstrap dependencies #1030

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
77fb32c
update bootstrap and bootswatch to version 4
abdounikarim Sep 17, 2019
03c4064
update links in assets directory
abdounikarim Sep 17, 2019
cdaa0ee
remove unused dependencies : bootstrap-sass and eonasdan-bootstrap-da…
abdounikarim Sep 17, 2019
7c15639
correcting templates
abdounikarim Sep 17, 2019
98f3881
correcting design and generate new assets files
abdounikarim Sep 22, 2019
a8404de
correcting dependencies in package.json
abdounikarim Sep 23, 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
4 changes: 2 additions & 2 deletions assets/js/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import '../scss/admin.scss';
import 'eonasdan-bootstrap-datetimepicker';
import 'tempusdominus-bootstrap-4';
import 'typeahead.js';
import Bloodhound from "bloodhound-js";
import 'bootstrap-tagsinput';

$(function() {
// Datetime picker initialization.
// See http://eonasdan.github.io/bootstrap-datetimepicker/
// See https://tempusdominus.github.io/bootstrap-4/
$('[data-toggle="datetimepicker"]').datetimepicker({
icons: {
time: 'fa fa-clock-o',
Expand Down
9 changes: 4 additions & 5 deletions assets/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import '../scss/app.scss';

// loads the Bootstrap jQuery plugins
import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/alert.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/collapse.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown.js';
import 'bootstrap-sass/assets/javascripts/bootstrap/modal.js';
import 'bootstrap/js/dist/alert.js';
import 'bootstrap/js/dist/collapse.js';
import 'bootstrap/js/dist/dropdown.js';
import 'bootstrap/js/dist/modal.js';
import 'jquery'

// loads the code syntax highlighting library
Expand Down
4 changes: 2 additions & 2 deletions assets/scss/admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~bootswatch/flatly/variables";
@import "~eonasdan-bootstrap-datetimepicker/src/sass/bootstrap-datetimepicker-build.scss";
@import "~bootswatch/dist/flatly/variables";
@import "~tempusdominus-bootstrap-4/src/sass/tempusdominus-bootstrap-4-build.scss";
@import "bootstrap-tagsinput.scss";

/* Page: 'Backend post index'
Expand Down
96 changes: 83 additions & 13 deletions assets/scss/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
$web-font-path: 'data:text/css;base64,';

// Make sure the bootstrap-sass and lato fonts are resolved correctly
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
$lato-font-path: '~lato-font/fonts';

@import "~bootswatch/flatly/variables";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "~bootswatch/flatly/bootswatch";
@import "~bootswatch/dist/flatly/variables";
@import "~bootstrap/scss/bootstrap";
@import "~bootstrap/scss/transitions";
Copy link
Member

Choose a reason for hiding this comment

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

isn't this already imported by the main bootstrap file ?

@import "~bootswatch/dist/flatly/bootswatch";
@import "~@fortawesome/fontawesome-free/css/all.css";
@import "~@fortawesome/fontawesome-free/css/v4-shims.css";
@import "~highlight.js/styles/solarized-light.css";
Expand All @@ -21,6 +21,11 @@ $lato-font-path: '~lato-font/fonts';

/* Basic styles
------------------------------------------------------------------------- */
h1 {
font-size: 39px;
margin-top: 21px;
margin-bottom: 10.5px
}
p, ul, ol {
font-size: 19px;
margin-bottom: 1.5em
Expand Down Expand Up @@ -68,16 +73,35 @@ header {
margin-bottom: 2em
}

header ul.nav li {
margin-bottom: 0
.navbar-expand-lg .navbar-collapse {
justify-content: flex-end;
}

header ul.nav li {
margin-bottom: 0;
}
.navbar-nav > li {
margin: 5px 10px;
}
header nav a {
color: white;
}
header nav a:hover {
color: #18BC9C;
text-decoration: none;
}
header .dropdown-menu a {
color: #212529 !important;
}
header .locales {
min-width: 190px;
min-width: 195px;
margin: 2px 5px;
}
header .locales a {
color: #212529;
padding: 3px 15px;
}
header .locales li, .user > li {
padding: 0 10px;
}
header .locales a small {
border-radius: 4px;
Expand Down Expand Up @@ -111,6 +135,19 @@ header .locales a:hover small {
margin-bottom: 2em
}

#sidebar .well {
min-height: 20px;
margin-bottom: 20px;
background-color: #ecf0f1;
border: 1px solid transparent;
box-shadow: none;
}

#sidebar .well-lg {
padding: 24px;
border-radius: 6px;
}

#sidebar p {
font-size: 15px
}
Expand Down Expand Up @@ -142,9 +179,29 @@ footer #footer-resources i {
margin-left: 0.5em
}

@media (min-width: 992px) {

.modal-lg, .modal-xl {
max-width: 900px;
}

.modal-dialog {
margin: 30px auto;
}

}

#sourceCodeModal .modal-header {
display: flex;
justify-content: space-between;
flex-direction: row-reverse;
}

#sourceCodeModal h3 {
font-size: 19px;
margin-top: 0
margin-top: 0;
display: flex;
justify-content: space-between;
}

#sourceCodeModal h3 small {
Expand All @@ -154,7 +211,13 @@ footer #footer-resources i {

#sourceCodeModal pre {
margin-bottom: 2em;
padding: 0
padding: 0;
border: 1px solid #ccc;
border-radius: 4px;
}

pre code {
white-space: pre-wrap;
}

#confirmationModal .modal-dialog {
Expand Down Expand Up @@ -224,6 +287,12 @@ body#homepage {
text-align: center
}

.page-header {
padding-bottom: 9.5px;
margin: 42px 0 21px;
border-bottom: 1px solid transparent;
}

/* Page: 'Login'
------------------------------------------------------------------------- */
body#login #login-users-help p {
Expand Down Expand Up @@ -276,12 +345,13 @@ body#blog_index .post-metadata {
margin-bottom: 8px;
}

body#blog_index .post-tags .label-default {
.badge-light {
background-color: #e9ecec;
color: #6d8283;
}
body#blog_index .post-tags .label-default i {
color: #a3b2b2;

.pagination {
justify-content: center;
}

/* Page: 'Blog post show'
Expand Down
Binary file modified data/database.sqlite
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"@fortawesome/fontawesome-free": "^5.8.1",
"@symfony/webpack-encore": "^0.28.0",
"bloodhound-js": "^1.2.3",
"bootstrap-sass": "^3.3.7",
"bootstrap": "^4.3.1",
"bootstrap-tagsinput": "^0.7.1",
"bootswatch": "^3.3.7",
"bootswatch": "^4.3.1",
"core-js": "^3.0.0",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
"highlight.js": "^9.12.0",
"imports-loader": "^0.8.0",
"jquery": "^3.3.1",
"lato-font": "^3.0.0",
"node-sass": "^4.9.3",
"sass-loader": "^7.1.0",
"tempusdominus-bootstrap-4": "^5.1.2",
"typeahead.js": "^0.11.1"
},
"license": "UNLICENSED",
Expand Down
21 changes: 10 additions & 11 deletions public/build/2.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions public/build/admin.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/build/admin.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions public/build/app.css
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 56 additions & 1 deletion public/build/app.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions public/build/entrypoints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"/build/runtime.js": "sha384-/Zh0hTCgqMfXwZfeMIiueZzsKiHkvtqEOzKpZAuznIbgqg1DQpUQAwwNlO/9ToVH",
"/build/0.js": "sha384-Dt6rncfcL40e91sPDLy/fZ8XgfH6ZZmLY1+ajXaPmGFGTb5XNtWS5jmf84NoZT/f",
"/build/1.js": "sha384-bmKW9QGT6CjdvJr6hoYLCByhKzyjU+g+gUJ5SGOSxqUm4jzLuBhDpl0hImY/1R3M",
"/build/app.js": "sha384-/3gf9IHx1zzgGuRgdnnW/2AJBU896jAJn1dDLJLb3vBkLQkE8WvI3ycZt0l0GECV",
"/build/app.css": "sha384-NGTdnyfcvVpvCvvEryRps/xU6Mb67YeTf1pvFrUkd80uXKIuxzYmcXzvzttKu4d0",
"/build/app.js": "sha384-IbSMr0A1SgsOkSrDv7nQHjMIxqO1BsP3Dz+TaXZEwDv+HDyQkKxrx6izrF5tkQ2v",
"/build/app.css": "sha384-5xhJRWtDjbJyMr1e6K7mlzEw4keh4Oz9Ot+aPtPqZytMTM7D4/rVXPxteLZFW9pM",
"/build/login.js": "sha384-tCP53hf/3uu7W5h5syxKODJjjos7AyGM/lENitUwFKSXMxQsWP+50V0mN6bcImAo",
"/build/2.js": "sha384-zrtPryvCde+sRepOgkuLELopii2NoIgS3rrkpCfY8e7nT359Sc0tXRG2QqsKLfEO",
"/build/admin.js": "sha384-My30UK7GowsN0RikK0XGQk7gvdtxxZsz2f52md+YoV4YZu4yjMArjwO7ZwE7K4av",
"/build/admin.css": "sha384-NMnc2b6jJOZO4QiUk4TgitF+ipl41B2+0TFmAwGqpQ6cinY6Q6mb1watPtAAWkAZ",
"/build/2.js": "sha384-YwPOakbSR1RJpiSi89xXUIqPeU8wzfYI8UQwcmeSESx93FXEycwozpNfU6yM9HOM",
"/build/admin.js": "sha384-rmH4Z/gCRxsY1DgieUuTFJ8bMyWu8Tr74ifeD2T9lrLbKgwlfNGRQxNJdW2+PF9x",
"/build/admin.css": "sha384-ouJGJIyX9JD4fZecHxA8ej9HjSkG7zOgVN3KWgqHtEhIrpHAR3CkPD2VdUTFOvoD",
"/build/search.js": "sha384-R/BW5h0YHjTYt/CVNZNOPDSuk0IQsvSSQZeP9hPpBtEkI4pBWMkBX4CAQnQQkFvt"
}
}
7 changes: 1 addition & 6 deletions public/build/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
"build/fonts/fa-solid-900.eot": "/build/fonts/fa-solid-900.42e1fbd2.eot",
"build/fonts/fa-solid-900.ttf": "/build/fonts/fa-solid-900.896e20e2.ttf",
"build/fonts/fa-solid-900.woff2": "/build/fonts/fa-solid-900.d6d8d5da.woff2",
"build/fonts/glyphicons-halflings-regular.woff2": "/build/fonts/glyphicons-halflings-regular.448c34a5.woff2",
"build/fonts/glyphicons-halflings-regular.ttf": "/build/fonts/glyphicons-halflings-regular.e18bbf61.ttf",
"build/fonts/glyphicons-halflings-regular.eot": "/build/fonts/glyphicons-halflings-regular.f4769f9b.eot",
"build/fonts/glyphicons-halflings-regular.woff": "/build/fonts/glyphicons-halflings-regular.fa277232.woff",
"build/fonts/lato-bold-italic.woff2": "/build/fonts/lato-bold-italic.0b6bb672.woff2",
"build/fonts/lato-bold-italic.woff": "/build/fonts/lato-bold-italic.9c7e4e9e.woff",
"build/fonts/lato-bold.woff2": "/build/fonts/lato-bold.cccb8974.woff2",
Expand All @@ -35,6 +31,5 @@
"build/fonts/lato-normal.woff2": "/build/fonts/lato-normal.bd03a2cc.woff2",
"build/images/fa-brands-400.svg": "/build/images/fa-brands-400.bfa9c38b.svg",
"build/images/fa-regular-400.svg": "/build/images/fa-regular-400.95f13e0b.svg",
"build/images/fa-solid-900.svg": "/build/images/fa-solid-900.6ed5e3bc.svg",
"build/images/glyphicons-halflings-regular.svg": "/build/images/glyphicons-halflings-regular.89889688.svg"
"build/images/fa-solid-900.svg": "/build/images/fa-solid-900.6ed5e3bc.svg"
}
28 changes: 10 additions & 18 deletions templates/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,17 @@

{% block header %}
<header>
<div class="navbar navbar-default navbar-static-top" role="navigation">
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<div class="container">
<div class="navbar-header col-md-3 col-lg-2">
<a class="navbar-brand" href="{{ path('homepage') }}">
Symfony Demo
</a>

<button type="button" class="navbar-toggle"
data-toggle="collapse"
data-target=".navbar-collapse">
<span class="sr-only">{{ 'menu.toggle_nav'|trans }}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<a class="navbar-brand" href="{{ path('homepage') }}">
Symfony Demo
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav">
{% block header_navigation_links %}
<li>
<a href="{{ path('blog_index') }}">
Expand Down Expand Up @@ -98,7 +90,7 @@
</ul>
</div>
</div>
</div>
</nav>
</header>
{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion templates/blog/_post_tags.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p class="post-tags">
{% for tag in post.tags %}
<a href="{{ path('blog_index', {'tag': tag.name == app.request.query.get('tag') ? null : tag.name}) }}"
class="label label-{{ tag.name == app.request.query.get('tag') ? 'success' : 'default' }}"
class="badge badge-{{ tag.name == app.request.query.get('tag') ? 'success' : 'light' }}"
>
<i class="fa fa-tag"></i> {{ tag.name }}
</a>
Expand Down
Loading