Damian Mooyman
e7cd864ebc
Merge branch 'master'
2016-05-02 10:38:08 +12:00
Paul
9238bc5778
Added class to actions cell to reduce space ( #5404 )
2016-05-02 08:53:53 +12:00
Paul
2e056dd98b
media query to use mixin ( #5402 )
2016-05-02 08:50:29 +12:00
Damian Mooyman
d52db0ba34
Merge 3 into master
...
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
Paul Clarke
acb1b46a46
Add back button for smaller screens
2016-04-27 14:09:57 +12:00
Paul
fc8d94d789
Fix for toolbar-south width ( #5391 )
2016-04-26 17:41:07 +12:00
Ingo Schommer
5d26035a51
Update build artifacts
2016-04-26 15:34:11 +12:00
scott1702
97e672721d
Add AddToCampaign dialog box functionality
2016-04-26 13:33:06 +12:00
Ingo Schommer
21db18e7ef
Correct naming for JS and CSS files in client/
...
Removed some dist/js/*.js files since they're no longer built as individual files.
This was a side effect of them living in the toplevel folder of admin/client/src/,
which used to have all the legacy/*.js files in there (they do need to be built).
Following AirBnB convention: https://github.com/airbnb/javascript#naming--filename-matches-export
While it technically allows index.js files, we found them to be bad for dev and debugging in practice:
Depending on the used IDE, editor tabs all look the same. Other views like Chrome Dev Tools with
sourcemaps rely on path context, and are harder to auto-complete.
There's no direct rules for CSS files, but same principles apply here.
Also renamed the sections/ folder to containers/, which more clearly communicates
the distinction between components/ (shouldn't contain state-dependant, smart components).
Renamed state/ files to follow AirBnB naming conventions
https://github.com/airbnb/javascript#naming--filename-matches-export
https://github.com/airbnb/javascript#naming--camelCase-default-export
https://github.com/airbnb/javascript#naming--PascalCase-singleton
Leaving the folder name in state/<state-key> lowercase since
that's also the key to reducers in the actual state object.
References:
http://engineering.kapost.com/2016/01/organizing-large-react-applications/
https://github.com/erikras/react-redux-universal-hot-example/tree/master/src
https://github.com/RickWong/react-isomorphic-starterkit/tree/master/src
https://github.com/react-toolbox/react-toolbox/issues/98
https://github.com/react-bootstrap/react-bootstrap/tree/master/src
2016-04-25 15:43:19 +12:00
Damian Mooyman
0ed353a3df
Reformat code
2016-04-22 14:05:55 +12:00
Ingo Schommer
8c63ae3d68
Fix AssetAdmin icon reference
...
Needs to use namespaced class name (see LeftAndMain->Menu()).
Not replacing the old .icon-assetadmin rule since we want the old and new UI to co-exist for a short while.
Ideally we'd move these styles to the asset-admin module, but the whole way of referencing image sprites
is outdated anyway - so I'd prefer to merge this quick fix and think about SVG icons for menu entries instead.
2016-04-22 13:57:10 +12:00
David Craig
d376944d48
Fix regression with font-icon styles
2016-04-22 10:43:06 +12:00
Paul Clarke
3a778f23bf
Build and compile
2016-04-21 15:41:30 +12:00
Ingo Schommer
3594fa79c7
Include components/label in build
2016-04-21 11:19:30 +12:00
Paul Clarke
95e4415288
Fix for IE, added ability to adjust panel height based on the amount of toolbars
2016-04-21 11:19:30 +12:00
Paul Clarke
02bb158a27
Removed old typography, minor updates and rebase regressions
2016-04-21 11:19:20 +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
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
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
