Skip to content

Commit

Permalink
Tidy up for version 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
colintucker committed Sep 25, 2016
1 parent 90fc029 commit 00d501e
Show file tree
Hide file tree
Showing 9 changed files with 624 additions and 1,352 deletions.
36 changes: 19 additions & 17 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# For more information about the properties used in this file,
# please see the EditorConfig documentation:
# http://editorconfig.org

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{*.ss,*.css,*.yml,package.json}]
indent_size = 2

# The indent size used in the package.json file cannot be changed:
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
# For more information about the properties used in this file,
# please see the EditorConfig documentation:
# http://editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{*.ss,*.css,*.yml,package.json}]
indent_size = 2

# The indent size used in the package.json file cannot be changed:
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015, Praxis Interactive
Copyright (c) 2016, Praxis Interactive
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -24,4 +24,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ A [SilverStripe](http://silverstripe.org) module to give the CMS a more modern,
#### Composer:

```
require: "praxisnetau/silverstripe-moderno-admin": "dev-master"
require: "praxisnetau/silverstripe-moderno-admin": "~1.0"
```

#### Manual:

To install this module manually, clone or download the repo, copy it to your document root ensuring the folder is called `silverstripe-moderno-admin` and finally run a `/dev/build`.
To install this module manually, clone or download the repo, copy it to your document root ensuring the folder is called `moderno-admin` and finally run a `/dev/build`.

## Usage ##

Expand Down Expand Up @@ -88,4 +88,4 @@ This module started as a simple CSS file of tweaks that quickly got way out of h
## Attribution ##

* Uses some icons by [Yusuke Kamiyamane](http://p.yusukekamiyamane.com/). Licensed under a [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/).
* Uses [Font Awesome](http://fontawesome.io) by [Dave Gandy](https://github.com/davegandy).
* Uses [Font Awesome](http://fontawesome.io) by [Dave Gandy](https://github.com/davegandy).
2 changes: 1 addition & 1 deletion _config/icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -727,4 +727,4 @@ AwesomeIconExtension:
fa-yoast: f2b1
fa-youtube: f167
fa-youtube-play: f16a
fa-youtube-square: f166
fa-youtube-square: f166
10 changes: 5 additions & 5 deletions _config/moderno.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
LeftAndMain:
extra_requirements_javascript:
- silverstripe-moderno-admin/javascript/moderno.js
- moderno-admin/javascript/moderno.js
extra_requirements_css:
- silverstripe-moderno-admin/css/moderno.min.css
- silverstripe-moderno-admin/css/moderno-editor.min.css
- silverstripe-moderno-admin/css/font-awesome.min.css
- moderno-admin/css/moderno.min.css
- moderno-admin/css/moderno-editor.min.css
- moderno-admin/css/font-awesome.min.css
extensions:
- AwesomeIconExtension
- ModernoAdminExtension
Expand All @@ -30,4 +30,4 @@ SecurityAdmin:
awesome_icon: user

CMSSettingsController:
awesome_icon: cog
awesome_icon: cog
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"tractorcow/silverstripe-colorpicker": "3.0.*@dev"
},
"extra": {
"installer-name": "silverstripe-moderno-admin"
"installer-name": "moderno-admin"
},
"target-dir": "silverstripe-moderno-admin"
}
"target-dir": "moderno-admin"
}
Loading

0 comments on commit 00d501e

Please sign in to comment.