-
Notifications
You must be signed in to change notification settings - Fork 9
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
Grids #271
Merged
Grids #271
Changes from 138 commits
Commits
Show all changes
139 commits
Select commit
Hold shift + click to select a range
aa63577
Start of the new homepage.
sherakama aa88353
Start of the new homepage.
sherakama aeb3122
fixup! wip.
sherakama 9f21173
fixup! wip.
sherakama ce7f21a
Merge branch 'master' into 246-homepage
sherakama 54e91c8
fixup! wip.
sherakama 2b13b59
fixup! wip.
sherakama 44d933a
It is not pretty but it is something.
sherakama 4116532
Merge branch '246-homepage' into 202-sticky
sherakama fd5510a
Merge branch 'master' of github.com:SU-SWS/decanter into 246-homepage
4ca3a38
fixup! wip.
sherakama 2bb7cfe
fixup! wip.
sherakama 51b1b9e
Sticky footer mixin.
sherakama 56ee82b
Merge branch '246-homepage' of github.com:SU-SWS/decanter into 202-st…
sherakama dd4c3c7
Sticky footer mixin.
sherakama 7702e1f
Update core/scss/utilities/mixins/layout/_sticky-footer.scss
JBCSU d9296af
Update core/scss/utilities/mixins/layout/_sticky-footer.scss
JBCSU c8576e4
Update core/scss/utilities/mixins/layout/_sticky-footer.scss
JBCSU 8c63bf7
New grid stuff.
sherakama b5ccbb8
Sort of refactored.
sherakama 0b97f4b
Layout - Bricks
sherakama 20c3e0b
Layout - Basic
sherakama 6879fcc
Layout - Battleship.
sherakama 5f5afac
Layout - Blastila.
sherakama 2dc79b0
Layout - Frogger.
sherakama 3433c3c
Layout - Pacman.
sherakama aa4066e
Layout - Plakes.
sherakama 40dbd8d
Layout - Wedge.
sherakama 68ec671
Remove three-column layout from Richard.
sherakama d094dbf
Merged with master.
sherakama 77431e5
More 2 column layouts.
sherakama 8c2ae9d
Merge branch 'master' into 202-sticky
JBCSU 5188038
Layout - Sunset Delorean.
sherakama d2b5b93
Layout - Valmer.
sherakama 280021a
Refactored Flex Grid with Helpers.
sherakama 5ab1b3d
fixup! wip.
sherakama 644546b
@mixin sticky-footer now accepts the footer's selector as a parameter
JBCSU b430d82
make styleguide's footer be sticky
JBCSU 417a050
if the brand bar is position:fixed then we really need padding to acc…
JBCSU e632c99
fixup! wip.
sherakama 019ea87
grid and breakpoint updates WIP
336ab98
Sticky footer and template updates.
sherakama dc1fc2d
More documentation and comments.
sherakama fa6a0cc
clean up
a1a8fff
added new modular spacing for 2xl
b5a69e9
Update _alert.scss
sherakama 9921c06
new flex grid approach WIP
657cbf8
grid column calculation update
8cfe63c
Merge branch 'master' of github.com:SU-SWS/decanter into grids
sherakama 83f6e3c
fixup! wip.
sherakama c4dcfb3
Merge branch 'grids' of github.com:SU-SWS/decanter into grids
sherakama fdc9457
fixup! wip.
sherakama 84f938f
fixup! wip.
sherakama 72f54d3
Responsive gutters on flex columns.
sherakama 3ac144e
Layout names.
sherakama ce5b68e
fixup! wip.
sherakama b5bb006
Grid mixin-a-fied the lockup.
sherakama 14f464d
Solidify layout names.
sherakama 82d78d4
Update _sticky-footer.scss
sherakama 1319b4e
Fix centered column alignment.
sherakama f949435
Updates.
sherakama c6ab16d
Conditional regions.
sherakama 76dd7de
Added type checking and a slightly different parameter to grid-gap.
sherakama 9294329
Global footer sticky merge in.
sherakama a3d6942
wip with kss theme.
sherakama 48891d5
comment and general cleanup and additions
8605354
Refactor KSS theme scss.
sherakama 4cdeee1
Sort of working new theme.
sherakama fa4ba71
Revisited KSS theme.
sherakama 2387aa1
More KSS theme tweaks.
sherakama 0373e4b
More KSS theme tweaks.
sherakama 09cc1d3
More KSS theme tweaks.
sherakama 4956ed2
Removed debug.
sherakama f9111ca
Update _modular-spacing-get-value.scss
sherakama 58c84a2
breakpoints functions folder
4ed6b8f
link variants for button options
9d91d62
rm unstyled button
8b1e92e
empty line CC FIXUP
2f7bc4d
CC FIXUP
6341f57
CC FIXUP
9635562
Added more documentation.
sherakama 17beaf3
worked string comments into kss
21c4429
layout FIXUP
f4c251d
minor layout comment FIXUPs
db19391
wip!.
sherakama 7e8b853
Fixers to autoprefixer and updates for IE 11 compatibility.
sherakama 505b7e1
Merge branch 'grids' of github.com:SU-SWS/decanter into grids
sherakama 244c24f
Merge branch 'master' of github.com:SU-SWS/decanter into grids
sherakama 89058c6
More IE Fixes.
sherakama 9a70cd8
More IE Fixes.
sherakama 212b1a8
More IE Fixes.
sherakama 3228b6c
More IE Fixes.
sherakama 48eb572
More IE Fixes.
sherakama 5be0f16
Update core/scss/components/lockup/_lockup.scss
yvonnetangsu 3b1be2b
flexbox layouts for 1col 2col 4col and fw ; 3col to come
b05968b
Merge branch 'grids' of github.com:SU-SWS/decanter into grids
sherakama 8a6a54b
Flex grid behaviour.
sherakama f611456
Flex grid behaviour.
sherakama bf96f7a
Flex grid behaviour fixes.
sherakama c2ad808
Flex grid behaviour fixes.
sherakama fec3812
Auto IE fix for lockup to false.
sherakama 551ff71
Fix for repsonsive colors section.
sherakama f7a92a4
updated flex grid demo
737187e
fw 1col 2col and 4col FIXUP and intro of 3col layouts with new flexbo…
52c61c8
Resolve duplicate twig file name issue by md5 hashing template path a…
sherakama 8b886bb
Update template file names.
sherakama b789447
Update template file names.
sherakama d40b839
Updated blastilla right grid scss.
sherakama cc9f36e
Updated blastilla right grid scss.
sherakama b6b5e9f
Flexbox layouts
bcac752
Updated NPM packages and fixed dupe template issue.
sherakama 2ed0718
Updated NPM packages and fixed dupe template issue.
sherakama 03ddae5
--no-outter-gutter class for flex container
d792d80
sr-only FIXUP and rm padding class for flex items
3fa945b
IE11: Fixes for grid gap.
sherakama 55be43b
More IE fixes.
sherakama 086ca57
Remove margin on flex grid display of KSS.
sherakama 1301951
wip! flex grid padding rething in progress.
sherakama c3629a2
Flex grid margin gap fixes.
sherakama 7fd8137
flex container grid row gap.
sherakama d44e3f3
Flex grid vertical rows to bottom only.
sherakama d9ac5e3
Flex grid vertical rows molive and blastila.
sherakama 657539b
Added some documentation to layouts section.
sherakama 252b801
Code climate fixes.
sherakama 586ee5c
Change URL on developer resources main nav item to go to wiki page.
sherakama 45a3e33
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 08d580d
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 2f5f192
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 434c381
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 61d16ea
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 4ad86a0
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu f1d32f8
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 10ffd03
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 370671d
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 88a8309
Update core/scss/utilities/variables/core/_gutter.scss
yvonnetangsu 17cf81c
Update core/templates/layout/flex/four-column/molive/molive.twig
yvonnetangsu 19c1b70
nom install
7e54dbf
Update core/scss/utilities/variables/core/_grid.scss
yvonnetangsu af74538
Merge with master.
sherakama File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,24 @@ | ||
/** | ||
* Gruntfile. | ||
* @type {[type]} | ||
*/ | ||
module.exports = function(grunt) { | ||
|
||
/** | ||
* [sass description] | ||
* @type {[type]} | ||
*/ | ||
const sass = require('node-sass'); | ||
|
||
/** | ||
* [pkg description] | ||
* @type {[type]} | ||
*/ | ||
grunt.initConfig({ | ||
pkg: grunt.file.readJSON('package.json'), | ||
sass: { | ||
options: { | ||
implementation: sass, | ||
includePaths: [ | ||
"node_modules/bourbon/core", | ||
"node_modules/bourbon-neat/app/assets/stylesheets", | ||
|
@@ -20,7 +36,7 @@ module.exports = function(grunt) { | |
'core/css/decanter.css': 'core/scss/decanter.scss', | ||
'core/css/decanter-no-markup.css': 'core/scss/decanter-no-markup.scss', | ||
'core/css/decanter-grid.css': 'core/scss/decanter-grid.scss', | ||
'kss/builder/decanter/kss-assets/css/kss.css': 'kss/builder/decanter/scss/kss.scss' | ||
'kss/builder/decanter/kss-assets/css/kss.css': 'kss/builder/decanter/scss/kss.scss', | ||
} | ||
} | ||
}, | ||
|
@@ -39,13 +55,16 @@ module.exports = function(grunt) { | |
}, | ||
postcss: { | ||
options: { | ||
map: true, | ||
map: true, // inline sourcemaps | ||
processors: [ | ||
require('autoprefixer') | ||
require('autoprefixer')({ grid: true, browsers: ['last 2 versions', 'ie 11']}) // add vendor prefixes | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. New version of prefixer settings to make sure to include IE. |
||
] | ||
}, | ||
dist: { | ||
src: 'core/css/*.css' | ||
src: [ | ||
'core/css/*.css', | ||
'kss/builder/decanter/kss-assets/css/*.css' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added compiler for KSS theme. |
||
] | ||
} | ||
}, | ||
watch: { | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
New version of grunt-sass needs this.
FYI:
https://davidgracieweb.co.uk/node-sass-vs-grunt-sass-vs-dart-sass-vs-ruby-sass/