Skip to content

Removing foundation and writing custom css. #6

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###

###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###
2 changes: 0 additions & 2 deletions assets/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import './styles/app.scss';
// start the Stimulus application
import './bootstrap';

import 'foundation-sites/dist/js/foundation.js'

import $ from 'jquery'
$(document).foundation();

Expand Down
1 change: 1 addition & 0 deletions assets/controllers.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"fetch": "eager",
"autoimport": {
"tom-select/dist/css/tom-select.default.css": true,
"tom-select/dist/css/tom-select.bootstrap4.css": false,
"tom-select/dist/css/tom-select.bootstrap5.css": false
}
}
Expand Down
117 changes: 55 additions & 62 deletions assets/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,64 +1,57 @@
@import 'variables.scss';
@import '~foundation-sites/scss/foundation';

/// include all modules of foundation
// @include foundation-everything(true);

/// or use just particular modules
// Global styles
@include foundation-global-styles;
@include foundation-forms;
@include foundation-typography;

// Grids (choose one)
@include foundation-xy-grid-classes;
// @include foundation-grid;
// @include foundation-flex-grid;

// Generic components
@include foundation-button;
@include foundation-button-group;
@include foundation-close-button;
@include foundation-label;
@include foundation-progress-bar;
@include foundation-slider;
@include foundation-switch;
@include foundation-table;
// Basic components
@include foundation-badge;
@include foundation-breadcrumbs;
@include foundation-callout;
@include foundation-card;
@include foundation-dropdown;
@include foundation-pagination;
@include foundation-tooltip;

// Containers
// @include foundation-accordion;
// @include foundation-media-object;
// @include foundation-orbit;
// @include foundation-responsive-embed;
// @include foundation-tabs;
// @include foundation-thumbnail;

// Menu-based containers
@include foundation-menu;
@include foundation-menu-icon;
@include foundation-accordion-menu;
@include foundation-drilldown-menu;
@include foundation-dropdown-menu;

// Layout components
@include foundation-off-canvas;
@include foundation-reveal;
@include foundation-sticky;
@include foundation-title-bar;
@include foundation-top-bar;

// Helpers
@include foundation-float-classes;
// @include foundation-flex-classes;
@include foundation-visibility-classes;
// @include foundation-prototype-classes;

@import 'layout.scss';
@import './custom.scss';

// Navigation

nav {
background-color: $third;
ul {
font-size: 0;
list-style-type: none;

// initial li
li {
font-size: 1rem;
font-weight: 400;

display: inline-block;
padding: 15px;
position: relative;

// secondary ul
ul {
display: none;
}

// initial li:hover
&:hover {
cursor: pointer;

// secondary ul visibility change
ul {
display: block;
margin-top: 15px;

width: 200px;
left: 0;

position: absolute;

// secondary li
li {
display: block;

span {
float: right;
padding: 2px 5px;
text-align: center;
font-size: .8rem;
border-radius: 3px;
}
}
}
}
}
}
}
8 changes: 5 additions & 3 deletions assets/styles/custom.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
h1, h2, h3 {
h1,
h2,
h3 {
font-weight: bold;
}

Expand All @@ -18,6 +20,6 @@ main {
padding: $global-padding;
}

.menu{
.menu {
font-weight: 500;
}
}
61 changes: 61 additions & 0 deletions assets/styles/foundation.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import '~foundation-sites/scss/foundation';

/// include all modules of foundation
// @include foundation-everything(true);

/// or use just particular modules
// Global styles
@include foundation-global-styles;
@include foundation-forms;
@include foundation-typography;

// Grids (choose one)
@include foundation-xy-grid-classes;
// @include foundation-grid;
// @include foundation-flex-grid;

// Generic components
@include foundation-button;
@include foundation-button-group;
@include foundation-close-button;
@include foundation-label;
@include foundation-progress-bar;
@include foundation-slider;
@include foundation-switch;
@include foundation-table;
// Basic components
@include foundation-badge;
@include foundation-breadcrumbs;
@include foundation-callout;
@include foundation-card;
@include foundation-dropdown;
@include foundation-pagination;
@include foundation-tooltip;

// Containers
// @include foundation-accordion;
// @include foundation-media-object;
// @include foundation-orbit;
// @include foundation-responsive-embed;
// @include foundation-tabs;
// @include foundation-thumbnail;

// Menu-based containers
@include foundation-menu;
@include foundation-menu-icon;
@include foundation-accordion-menu;
@include foundation-drilldown-menu;
@include foundation-dropdown-menu;

// Layout components
@include foundation-off-canvas;
@include foundation-reveal;
@include foundation-sticky;
@include foundation-title-bar;
@include foundation-top-bar;

// Helpers
@include foundation-float-classes;
// @include foundation-flex-classes;
@include foundation-visibility-classes;
// @include foundation-prototype-classes;
17 changes: 17 additions & 0 deletions assets/styles/layout.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@media screen and (min-width: 640px){
.container {
display: flex;
}
}

.content {
flex: 4;
}
.sidebar {
flex: 1;
}

.wrapper {
margin: auto;
max-width: 75rem;
}
2 changes: 2 additions & 0 deletions assets/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ $fifth:#E0D8DE;
$topbar-background:$fifth;

$body-font-family: 'Source Sans Pro', 'Noto Sans', Roboto, Arial, sans-serif !default;

$global-padding: 5px;
63 changes: 32 additions & 31 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,47 @@
"doctrine/orm": "^2.10",
"friendsofsymfony/ckeditor-bundle": "^2.4",
"phpdocumentor/reflection-docblock": "^5.2",
"symfony/asset": "6.3.*",
"symfony/console": "6.3.*",
"symfony/dotenv": "6.3.*",
"symfony/expression-language": "6.3.*",
"symfony/asset": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/flex": "^1.3.1",
"symfony/form": "6.3.*",
"symfony/framework-bundle": "6.3.*",
"symfony/http-client": "6.3.*",
"symfony/intl": "6.3.*",
"symfony/mailer": "6.3.*",
"symfony/mime": "6.3.*",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/mailer": "6.4.*",
"symfony/mime": "6.4.*",
"symfony/monolog-bundle": "^3.1",
"symfony/notifier": "6.3.*",
"symfony/process": "6.3.*",
"symfony/property-access": "6.3.*",
"symfony/property-info": "6.3.*",
"symfony/proxy-manager-bridge": "6.3.*",
"symfony/runtime": "6.3.*",
"symfony/security-bundle": "6.3.*",
"symfony/serializer": "6.3.*",
"symfony/string": "6.3.*",
"symfony/translation": "6.3.*",
"symfony/twig-bundle": "6.3.*",
"symfony/notifier": "6.4.*",
"symfony/process": "6.4.*",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/proxy-manager-bridge": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/string": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/ux-autocomplete": "^2.10",
"symfony/validator": "6.3.*",
"symfony/web-link": "6.3.*",
"symfony/validator": "6.4.*",
"symfony/web-link": "6.4.*",
"symfony/webpack-encore-bundle": "^2.0",
"symfony/yaml": "6.3.*",
"symfony/yaml": "6.4.*",
"twig/extra-bundle": "^2.12|^3.0",
"twig/twig": "^2.12|^3.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "6.3.*",
"symfony/css-selector": "6.3.*",
"symfony/debug-bundle": "6.3.*",
"rector/rector": "^1.0",
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"symfony/maker-bundle": "^1.0",
"symfony/phpunit-bridge": "^5.3",
"symfony/stopwatch": "6.3.*",
"symfony/web-profiler-bundle": "6.3.*"
"symfony/phpunit-bridge": "^6.4",
"symfony/stopwatch": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*"
},
"config": {
"optimize-autoloader": true,
Expand Down Expand Up @@ -101,7 +102,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.3.*"
"require": "6.4.*"
}
}
}
Loading
Loading