Commit Graph

16039 Commits

Author SHA1 Message Date
Paul Clarke
cc7170d424 improved consistency of toolbars included in preview and other areas of cms 2016-04-21 11:03:45 +12:00
Paul Clarke
6cd5bf2f3f Preview panel as its own component, file preview styles, no preview message.
Improved layout reusability
Moved layout styles to its own stylesheet
Added scrollable panels
2016-04-21 11:03:42 +12:00
Ingo Schommer
4d43664057 Merge pull request #5318 from open-sausages/pulls/4.0/fix-page-routing
BUG fix routing for react sections
2016-04-21 09:11:20 +12:00
Damian Mooyman
dbd17bd49a API Remove routing from silverstripe-component
BUG Fix page routing in subdirectory
BUG Fix top level admin sections not causing ajax load
2016-04-21 08:43:03 +12:00
Ingo Schommer
869f438253 Merge pull request #5351 from open-sausages/pulls/minor-css-fixes
Minor fixes to CMS panels to use the newer variables and sizes
2016-04-21 08:28:41 +12:00
Paul Clarke
978369bd63 Update old cms toolbars and menu to use new variables and heights so everything lines up
Includes fixes for menu borders and preview border
2016-04-21 08:28:12 +12:00
Paul Clarke
0d1d8c5888 Remove text-decoration on focus for campaign items 2016-04-21 08:24:41 +12:00
Ingo Schommer
43040d5b05 Merge pull request #5346 from open-sausages/pulls/4.0/static-file-restructure
Static file restructure
2016-04-20 21:15:32 +12:00
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
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
Ingo Schommer
8215a9421e Merge pull request #5343 from IgorNadj/patch-4
minor: fix docs broken link
2016-04-19 23:24:17 +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
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
Ingo Schommer
75b2c7c360 BEM notation corrections, use Bootstrap vars
See comments on https://github.com/silverstripe/silverstripe-framework/pull/5317
2016-04-18 23:45:14 +12:00
Ingo Schommer
3c8960d88b Simplified breadcrumb component
The "multiline" variation was the only one actually used at the moment.
If we need a "singleline" one, we could make a "condensed" variation instead
2016-04-18 23:35:55 +12:00
Paul Clarke
40c98c6047 CSS updates to Campaign Admin
refactored breadcrumbs to use bootstrap
fix border lines on table
Layout variables updated for spacing, added toolbar heights
Added as part of campaigns as this area needs to use these variables.
Added action toolbar for content, swapped values to variables
toolbar action spacing
Adjustments of breadcrumb variable
Move accordion styles to its own component
Campaign items, styles for linked items and state badges
Small update to class name
Class name updates, convert values into variables
2016-04-18 23:35:31 +12:00
Damian Mooyman
2e90035771 API Campaign publish button 2016-04-18 14:47:04 +12:00
Damian Mooyman
68ffa40c69 Use configured SecurityToken 2016-04-18 14:03:53 +12:00