Permalink
Browse files

Upgrade to Bootstrap 4

  • Loading branch information...
lovett committed Dec 6, 2018
1 parent 84fbb49 commit 1f3d08e3677794eda94de93cf1c8b5e5353c650a
Showing with 50,897 additions and 45,306 deletions.
  1. +23 −2 app/Helpers/LinkHelper.php
  2. +4 −4 package-lock.json
  3. +1 −1 package.json
  4. +8,327 −4,262 public/css/app.css
  5. +42,233 −40,658 public/js/app.js
  6. +1 −1 resources/js/bootstrap.js
  7. +1 −1 resources/js/components/AutofillHint.vue
  8. +4 −4 resources/js/components/FacetSearch.vue
  9. +66 −64 resources/js/components/Pickable.vue
  10. +2 −35 resources/sass/_variables.scss
  11. +40 −78 resources/sass/app.scss
  12. +7 −7 resources/views/auth/login.blade.php
  13. +6 −6 resources/views/auth/passwords/email.blade.php
  14. +6 −6 resources/views/auth/passwords/reset.blade.php
  15. +6 −6 resources/views/auth/register.blade.php
  16. +3 −3 resources/views/client/form.blade.php
  17. +8 −8 resources/views/client/show.blade.php
  18. +19 −17 resources/views/dashboard.blade.php
  19. +10 −8 resources/views/estimate/form.blade.php
  20. +11 −8 resources/views/invoice/form.blade.php
  21. +2 −2 resources/views/invoice/table.blade.php
  22. +35 −42 resources/views/layouts/app.blade.php
  23. +1 −1 resources/views/list.blade.php
  24. +1 −1 resources/views/partials/formgroup-checkbox.blade.php
  25. +3 −3 resources/views/partials/formgroup-date.blade.php
  26. +3 −3 resources/views/partials/formgroup-menu.blade.php
  27. +14 −14 resources/views/partials/formgroup-standard.blade.php
  28. +3 −3 resources/views/partials/formgroup-textarea.blade.php
  29. +3 −3 resources/views/partials/formgroup-time.blade.php
  30. +1 −1 resources/views/partials/pagination.blade.php
  31. +1 −1 resources/views/partials/project-menu-filtered.blade.php
  32. +1 −1 resources/views/partials/save-button.blade.php
  33. +3 −3 resources/views/project/form.blade.php
  34. +43 −44 resources/views/project/show.blade.php
  35. +3 −3 resources/views/time/form.blade.php
  36. +2 −2 resources/views/time/table.blade.php
@@ -27,7 +27,17 @@ class LinkHelper
public static function primaryNavLink($route, $label, array $params = [], array $attribs = []) {
$resource = static::firstRouteSegment();
$linkedRoute = explode('.', $route);
$liClass = ($linkedRoute[0] === $resource) ? 'active' : '';
$liClass = 'nav-item';
$linkClass = 'nav-link';
if ($linkedRoute[0] === $resource) {
$liClass .= ' active';
}
if (isset($attribs['class'])) {
$linkClass .= ' ' . $attribs['class'];
}
$attribs['class'] = $linkClass;
return sprintf(
'<li class="%s">%s</li>',
@@ -74,7 +84,18 @@ public static function extraSmallButtonLink($route, $label, array $params = [],
* @return string
*/
public static function navLink($route, $label, array $params = [], array $attribs = []) {
$liClass = Request::routeIs($route) ? 'active' : '';
$liClass = 'nav-item';
$linkClass = 'nav-link';
if (Request::routeIs($route)) {
$linkClass .= ' active';
}
if (isset($attribs['class'])) {
$linkClass .= ' ' . $attribs['class'];
}
$attribs['class'] = $linkClass;
return sprintf(
'<li class="%s">%s</li>',

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -11,7 +11,7 @@
},
"devDependencies": {
"axios": "0.18",
"bootstrap-sass": "3.3.7",
"bootstrap": "4.1.3",
"browser-sync": "2.26.3",
"browser-sync-webpack-plugin": "2.2.2",
"jquery": "3.3.1",
Oops, something went wrong.

0 comments on commit 1f3d08e

Please sign in to comment.