Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e113f26
Zurb Foundation version update changes (auto-created).
csj1012 Apr 8, 2019
be6c370
Strip out CSS and SCSS files and comment out imports.
csj1012 Apr 16, 2019
13617de
Re-theme the top bar.
csj1012 Apr 17, 2019
241611d
Re-theme the nav drawer toggle and the search bar.
csj1012 Apr 20, 2019
63466fa
Re-theme the nav drawer and menus.
csj1012 Apr 22, 2019
337dfb7
Change the layout so that NavDrawer doesn't overlap the main frame wh…
csj1012 Apr 23, 2019
b2979e5
Re-theme the component top bar.
csj1012 Apr 23, 2019
87ad2fa
Re-theme the Component Top Bar buttons, etc.
csj1012 Apr 29, 2019
74414f0
Re-theme Component Info and Code Block.
csj1012 Apr 29, 2019
63501b6
Re-theme the code toggle buttons and consolidate button styles.
csj1012 Apr 30, 2019
53b88a9
Re-theme layout wrapper/scaffolding.
csj1012 Apr 30, 2019
d1dbe36
Fix NavDrawer menu padding; Re-add Branding styling and adjust some l…
csj1012 Apr 30, 2019
86fe71e
Correct the Search Form spacing.
csj1012 Apr 30, 2019
a8970e6
Recolor the Component Top Bar and change border thickness on View Inf…
csj1012 May 1, 2019
4f63609
Adjust ComponentInfo (UX).
csj1012 May 1, 2019
031ed69
Replace Landing Page styles.
csj1012 May 6, 2019
cd89ae9
Change Nav Drawer to always overlay the layout using a min-width.
csj1012 May 6, 2019
548a913
Re-theme Branding.
csj1012 May 6, 2019
8b1134a
Style the Quick Links.
csj1012 May 7, 2019
7484bc6
Add the 'Get Started' button for when there are no patterns.
csj1012 May 7, 2019
9ef1890
Re-add the Component Info transition and style the View Info button b…
csj1012 May 7, 2019
6fafcda
Remove errant comments.
csj1012 May 7, 2019
7f37578
Add Fontello package and implement (troubleshooting); start refactori…
csj1012 May 10, 2019
7660f1a
Consolidate (hopefully) all the buttons.
csj1012 May 10, 2019
66f7243
Update Fontello package and remove unused SVG icons.
csj1012 May 10, 2019
d4b234f
Added phpstorm` .idea folder to gitignore
saurabh-vijayvargiya Jun 16, 2021
ff46aa1
Corrections to js files as per the test suggestions
saurabh-vijayvargiya Jun 16, 2021
89a1acc
Merge branch 'master' into new-theming
saurabh-vijayvargiya Jun 16, 2021
2f30701
testing a fix for circleci exit code
mrossi113 Sep 4, 2021
d3180f5
upgrade the node version from 11 to 12 for a package
mrossi113 Sep 4, 2021
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
COMMIT_RANGE=`echo $CIRCLE_COMPARE_URL | cut -d/ -f7`
CHANGED_FILES=$(git diff --name-only --diff-filter=ACMRTUXB "${COMMIT_RANGE}")
if ! echo "${CHANGED_FILES}" | grep -qE "^(\\.php_cs(\\.dist)?|composer\\.lock)$"; then IFS=$'\n' EXTRA_ARGS=('--path-mode=intersection' '--' ${CHANGED_FILES[@]}); fi
vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no "${EXTRA_ARGS[@]}"
vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -v --dry-run --stop-on-violation --using-cache=no "${EXTRA_ARGS[@]}"
- run: |
composer validate
for dir in src/*; do
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
test_ui:
working_directory: /srv
docker:
- image: node:11
- image: node:12
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:

build_site:
working_directory: /srv
docker: [image: "node:11"]
docker: [image: "node:12"]
steps:
- checkout
- restore_cache: { key: 'site-package-v4-{{ checksum "site/package.json" }}' }
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
deploy_ui:
working_directory: /srv
docker:
- image: node:11
- image: node:12
steps:
- checkout
- attach_workspace:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ vendor/
/cache/
composer.lock
.php_cs.cache
.idea
3 changes: 2 additions & 1 deletion .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
new \SplFileInfo(__DIR__.'/demo/.mannequin.php'),
]));

return PhpCsFixer\Config::create()
$config = new PhpCsFixer\Config();
return $config
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
Expand Down
2 changes: 1 addition & 1 deletion site/src/scss/_init.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// current directory. It only initializes Foundation
// and any mixins we have declared. Do not write CSS
// here.
@import "variables";
@import "../../theme/variables";
@import "~foundation-sites/scss/foundation";

$breakpoints: (
Expand Down
30 changes: 0 additions & 30 deletions site/src/scss/_variables.scss

This file was deleted.

2 changes: 2 additions & 0 deletions theme/_base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../node_modules/foundation-sites/scss/foundation";
@import "./variables";
Loading