Ingo Schommer
19de22f427
API Moved frontend assets into admin/client/
...
admin/javascript => admin/client
admin/javascript/src => admin/client/src/legacy (mostly)
admin/scss/_variables.scss => admin/client/styles/_variables.scss
admin/scss => admin/client/styles/legacy/
admin/css/editor.css => admin/client/dist/css/editor.css
admin/css/screen.css => admin/client/dist/css/bundle.css
admin/images => admin/client/dist/images
admin/images/sprites/src => admin/client/src/sprites
admin/images/sprites/dist => admin/client/dist/sprites
admin/font => admin/client/dist/font
2016-04-20 21:13:10 +12:00
Ingo Schommer
cb7b2b09a8
Don't generate separate bootstrap.css files
...
We only need them in the main.css build file.
The bootstrap.scss already includes reboot and grid.
We're not using flex (yet), and can be built alongside main.css as well.
Reordered includes to ensure they bootstrap reboot gets included early.
2016-04-20 21:13:09 +12:00
Ingo Schommer
32dbd1d2b5
Consolidated style locations
2016-04-20 21:13:08 +12:00
Ingo Schommer
c5a20ab5fc
Restructure main SCSS includes
...
Makes more sense to go from generic to specific
2016-04-20 21:13:08 +12:00
Ingo Schommer
4c734abac9
Removed unused GridFieldPaginator.scss
...
Refactored a while ago through 3c516b7b97
2016-04-20 21:13:08 +12:00
Ingo Schommer
55d7e78875
Removed unused "grayscale" theme
...
Was never in active use, and has outdated variables
2016-04-20 21:13:08 +12:00
Ingo Schommer
dbf90b5e64
Removed _ieShared.scss
...
Already removed usage in 429682e
, but forgot to remove the underlying file.
Did a sanity check in IE10 on the areas addressed in this stylesheet,
and they look fine.
2016-04-20 21:13:08 +12:00
Ingo Schommer
5b96decb5c
Removed unused CSS files
...
UnitTesting.css was referring to web-based dev/tests runs which is no longer supported
SubmittedFormReportField.css was a user-forms specific sheet!
2016-04-20 21:13:07 +12:00
assertchris
ec247cefd8
Changed comments in forms\ToggleField.php
2016-04-20 18:31:17 +12:00
Damian Mooyman
30894eb4cf
Merge pull request #5357 from assertchris/cast-heading-level-to-int-in-forms-toggle-composite-field
...
Cast heading level to int, in forms\ToggleCompositeField.php
2016-04-20 18:01:43 +12:00
Damian Mooyman
61db5c8f76
Merge pull request #5356 from assertchris/forms-toggle-composite-field-comment-changes
...
Changed comments in forms\ToggleCompositeField.php
2016-04-20 18:01:31 +12:00
Damian Mooyman
b83293d2e4
Merge pull request #5354 from assertchris/forms-toggle-field-style-changes
...
Changed style in forms\ToggleField.php
2016-04-20 18:00:59 +12:00
Damian Mooyman
697ac4c441
Merge pull request #5352 from assertchris/forms-validator-comment-changes
...
Changed comments in forms\Validator.php
2016-04-20 17:58:18 +12:00
assertchris
6fd11f584d
Cast heading level to int, in forms\ToggleCompositeField.php
2016-04-20 16:16:59 +12:00
assertchris
f6effb9347
Changed comments in forms\ToggleCompositeField.php
2016-04-20 16:02:40 +12:00
assertchris
8e7e783dd0
Changed style in forms\ToggleField.php
2016-04-20 15:00:38 +12:00
assertchris
29ee58abc3
Changed comments in forms\Validator.php
2016-04-20 14:27:50 +12:00
Hamish Friedlander
1b8b869754
Merge pull request #5350 from open-sausages/pulls/4.0/fix-chosen-behat-use
...
Fix Chosen.js selector for Behat feature
2016-04-20 14:22:22 +12:00
Ingo Schommer
8cf38720b5
Fix Chosen.js selector for Behat feature
...
The recent upgrade to Chosen.js 1.5 changes the generated markup:
It still renders an <a> tag, but without the "href" attribute.
This attribute isn't actually required to uniquely identify
the link in this structure.
2016-04-20 13:52:51 +12:00
Damian Mooyman
43b00520fe
API Remove artifact datalist overrides from UnsavedRelationList
2016-04-20 08:55:32 +12:00
Ingo Schommer
8215a9421e
Merge pull request #5343 from IgorNadj/patch-4
...
minor: fix docs broken link
2016-04-19 23:24:17 +12:00
Daniel Hensby
f49c0b58d9
Merge pull request #5344 from sminnee/new-committers
2016-04-19 12:11:26 +01:00
Sam Minnee
82a89a94f4
Add 2 new committers, remove 1 who has left.
2016-04-19 23:05:59 +12:00
Igor
ec5464a6dc
minor docs broken link
2016-04-19 22:21:26 +12:00
Ingo Schommer
ac88bf57b1
Merge pull request #5339 from IgorNadj/patch-3
...
Update CONTRIBUTING.md
2016-04-19 21:58:56 +12:00
Igor
654c133913
Update CONTRIBUTING.md
...
minor grammar
2016-04-19 21:29:18 +12:00
Devlin
93da45f699
Prevent Upload from showing default controller template ( fixes #4613 ) ( #4615 )
2016-04-19 19:10:57 +12:00
Daniel Hensby
4240785fc7
Check whether run from cli or from web request within cli-script.php ( #3984 )
...
* ENHANCEMENT - Improved access determination
* ENHANCEMENT - Added an additional check for the existence of the mod_rewrite module
2016-04-19 18:54:11 +12:00
Ingo Schommer
2d119f021d
Merge pull request #5338 from open-sausages/pulls/4.0/bug-btn-toolbar
...
Fixes a spacing issue for grouped buttons within btn-toolbar
2016-04-19 18:39:02 +12:00
JorisDebonnet
72a014d933
Allow '0' in DropdownField ( #5199 )
...
Display falsey values as option titles when they have been included.
2016-04-19 17:40:14 +12:00
Damian Mooyman
0bd62735bc
BUG Fix issue with Requirements mangling custom scripts ( #5337 )
...
API Remove deprecated $template parameter from Requirements::includeInHTML
2016-04-19 17:20:30 +12:00
Paul Clarke
d9519983f8
build js
2016-04-19 15:07:06 +12:00
Paul Clarke
4d9e38c62b
toolbar improvements
2016-04-19 15:01:38 +12:00
Paul Clarke
47ca889567
bugfix for Add campaign button spacing
2016-04-19 14:22:50 +12:00
Ingo Schommer
6ccfbb7c52
Fixed breadcrumbs test
2016-04-19 13:40:57 +12:00
Ingo Schommer
7c126a80b6
Whitespaces fixes in _variables.scss
...
No point aligning the values when they're all over the show
from commenting and mixed indentation
2016-04-19 13:40:57 +12:00
Ingo Schommer
fb46e65681
Merge pull request #5321 from open-sausages/features/OSS-1749-grid-field
...
Converted grid-field to table markup and SCSS to BEM
2016-04-19 13:19:38 +12:00
Ingo Schommer
e939452129
Update build artifacts
2016-04-19 12:15:14 +12:00
Paul Clarke
7f59a7e6f7
Converted grid-field to table markup and SCSS to BEM
...
Also added tab index
2016-04-19 12:15:09 +12:00
Ingo Schommer
ccb4041326
Merge pull request #5292 from open-sausages/features/cms-panel-and-layout
...
Panel and layout adjustments, swapped cms typography styles for bootstrap typography
2016-04-19 11:16:18 +12:00
Ingo Schommer
ca77dd2657
Updated build artifacts
2016-04-19 11:13:57 +12:00
Paul Clarke
cc897d0f85
fix for add page steps and 1px out in southbar
2016-04-19 11:13:56 +12:00
Paul Clarke
82207f82be
Added panel close btn
2016-04-19 11:13:56 +12:00
Paul Clarke
e0fe90b3c8
General CMS typography swap to bootstrap
...
Start of using bootstrap variables and typography styles, remove old
cms reset in favour of bootstrap reboot
2016-04-19 11:13:53 +12:00
Paul Clarke
74454a7557
CMS layout changes
...
Panel adjustments to south and site tree collapsed so that everything
aligns.
Start of bootstrap tab styles
Fix for pages batch action alignment issue
2016-04-19 11:13:53 +12:00
Paul Clarke
6a53fe0fb7
small improvement to success button
2016-04-19 11:13:53 +12:00
Ingo Schommer
4a100fdc3c
Editorconfig for CSS ( #5336 )
2016-04-19 11:00:53 +12:00
Ingo Schommer
bf37899045
Removed IE CSS files
...
Leftover from https://github.com/silverstripe/silverstripe-framework/pull/5293
2016-04-19 09:16:21 +12:00
Ingo Schommer
e83a7c7de5
Merge pull request #5317 from open-sausages/pulls/4.0/campaign-admin-css-updates
...
CSS updates to Campaign Admin
2016-04-18 23:49:47 +12:00
Ingo Schommer
b2516ae7d0
Updated build artifacts
2016-04-18 23:45:24 +12:00