tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,841 Commits 31 Branches 527 Tags 162 MiB
87ee4365e7
Commit Graph

594 Commits

Author SHA1 Message Date
Steve Boyd
7887be704e Changed CMS close from an 'x' to a silverstripe font icon 2016-04-01 13:52:28 +13:00
scott1702
6b1444709f Fix menu dropdown icon 2016-03-29 11:28:38 +13:00
David Craig
d4ad1504a9 Fix bottom toolbar height 2016-03-29 11:28:05 +13:00
Paul Clarke
dce31d7235 initial updates to main nav styles for 4.0 
Conflicts:
	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/dist/bundle-leftandmain.js
	admin/javascript/src/LeftAndMain.Menu.js
	admin/scss/_spritey.scss
	css/GridField.css
 2016-03-29 10:29:33 +13:00
scott1702
13d581dea5 Include bootstrap throughout the CMS 2016-03-29 10:29:27 +13:00
Paul Clarke
ae31619695 New styles for main nav 2016-03-14 10:18:32 +13:00
David Craig
5a42a4181a Added Bootstrap Alpha.2 
- Managed by npm
- Created an `npm run css` task to compile
- Updated shrinkwrap
- Updated changelog
 2016-02-23 11:11:24 +13:00
Damian Mooyman
f20ad434ce API Update TinyMCE to 4.x 
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
 2016-02-23 10:10:02 +13:00
scott1702
38b1c0a162 Replace Compass with gulp-sass 2016-02-16 18:35:57 +13:00
Damian Mooyman
230d017677 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/css/ie7.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/font/icon-reference.html
#	admin/font/silverstripe.eot
#	admin/font/silverstripe.svg
#	admin/font/silverstripe.ttf
#	admin/font/silverstripe.woff
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
 2016-02-12 15:41:45 +13:00
Damian Mooyman
d5b4c90cb4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_fonts.scss
#	admin/scss/_retina.scss
 2016-02-09 18:25:47 +13:00
Damian Mooyman
35b5c03fbc Merge branch 3.3.0 into 3.3 2016-02-09 18:22:58 +13:00
Daniel Hensby
cb39c41872 Merge pull request #5015 from webbuilders-group/3.3-datetime-search-fix 
BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel
 2016-02-05 15:31:37 +00:00
UndefinedOffset
0c252af334 BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel 2016-02-05 10:53:35 -04:00
Loz Calver
70f8343475 Re-instate back button for item edit forms 2016-02-05 09:39:57 +00:00
scott1702
f39989a396 Add new font icons to set 
Add .no-text class for icons which have no text
 2016-02-04 10:34:30 +13:00
scott1702
15fba5a4cb Remove old logout icon on retina screens 
Remove background rules for old preview icons
 2016-02-03 16:36:21 +13:00
Daniel Hensby
c5fc9dd650 FIX CMS actions alignment 2016-01-26 14:38:48 +00:00
Damian Mooyman
69c9ad1428 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_style.scss
#	css/AssetUploadField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
#	lang/fi.yml
 2016-01-25 16:15:41 +13:00
Damian Mooyman
e091bb8474 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	tests/model/VersionedTest.yml
 2016-01-25 15:57:37 +13:00
scott1702
1a1c7b2f55 Update background colors 2016-01-22 17:50:01 +13:00
divzpatel123@gmail.com
7ead6f0ca9 Minor: changed px value on tabs (border-bottom) 2016-01-22 17:22:31 +13:00
Meeeeeeow
d8ee25c39c Minor: Remove Boxshadows 2016-01-22 17:18:02 +13:00
divzpatel123@gmail.com
fbc68f433f Minor: update background colors 2016-01-22 16:32:52 +13:00
Damian Mooyman
bc2a4dd652 Merge pull request #4953 from lry6003/search-icon 
Search Icon Hover/Active/Focus changes
 2016-01-21 14:57:13 +13:00
divzpatel123@gmail.com
4dee924432 Minor:updated the menu on the top left; changed styles 2016-01-20 15:44:40 +13:00
Luke Ryley
38e2cb5b6d Search Icon Hover/Active/Focus changes 
Changed the color of the search icon when it is in Hover/Active/Focus state and removed backgroup color changes in these states
 2016-01-20 14:35:54 +13:00
Damian Mooyman
eeb110a04f Merge pull request #4939 from lry6003/unbold-labels 
Minor: Unbolded labels in CMS
 2016-01-20 13:31:13 +13:00
Damian Mooyman
e6b877df27 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
 2016-01-20 13:16:27 +13:00
Damian Mooyman
8c1cafd1a0 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	admin/scss/_tree.scss
#	javascript/TreeDropdownField.js
 2016-01-19 17:08:26 +13:00
Meeeeeeow
4301ae20bf Changed the link colours 2016-01-19 15:46:29 +13:00
Luke Ryley
2701248387 Minor: Unbolded labels in CMS 
- updated _forms.scss removed font-weight
- also removed drop-shadow include
Luke Ryley - open source academy
 2016-01-19 12:04:55 +13:00
scott1702
4a0e157479 Remove focus outline when clicking tabs 2016-01-08 15:11:17 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:15:54 +13:00
scott1702
b64d73dcbf color updates to meet contrast requirements 2016-01-05 11:20:30 +13:00
Damian Mooyman
9fcca5c7e2 Merge pull request #4842 from open-sausages/icon-tabs 
Update icon-button-group css
 2015-12-22 16:20:38 +13:00
Damian Mooyman
48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3 
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
 2015-12-22 14:07:52 +13:00
scott1702
78190f213d Update icon-button-group css 2015-12-11 18:20:33 +13:00
scott1702
4f8b061b59 Remove drag handle from non-draggable js-trees 2015-11-05 13:09:47 +13:00
scott1702
9f9d0089df Send user to new area when inserting url 2015-10-29 11:37:59 +13:00
scott1702
1f64631bfc Update asset admin toolbar 2015-10-23 17:39:42 +13:00
scott1702
4f72b5cfb6 Add thumbnails font-icon 2015-10-08 10:22:14 +13:00
scott1702
23baa288ba Sticky footer on insert media/link elements 2015-10-01 15:35:56 +13:00
scott1702
3f85c57013 Move 'upload new file' section to main files area 
Optimise and fix drag drop on upload fields

Combine 3 tabs from the 'insert media' dialog box into 1
 2015-09-28 12:02:33 +13:00
scott1702
48c48d703d Disable split view mode when not enough room 2015-09-15 10:28:37 +12:00
Damian Mooyman
f10785350e Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
 2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php
 2015-09-09 14:35:29 +12:00
scott1702
9cbb235daa update cms notifications 
New style - text now wraps instead of overflowing
Now stay on screen longer
Hovering causes notification to stay on screen
 2015-09-02 15:47:48 +12:00
scott1702
5f56f204f1 Update view mode section w/ font icons 2015-09-01 10:54:52 +12:00
scott1702
17ab371ffa Update font icon library 2015-08-28 15:15:06 +12:00