Skip to content

Commit f75a730

Browse files
committed
sass-lint and placeholder/output choices added for the predefined classes
1 parent 07b6b41 commit f75a730

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+976
-638
lines changed

.gitignore

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,89 @@ output
55
codekit-project-icon.png
66
bower_components
77
npm-debug.log
8+
### OSX template
9+
*.DS_Store
10+
.AppleDouble
11+
.LSOverride
12+
13+
# Icon must end with two \r
14+
Icon
15+
16+
# Thumbnails
17+
._*
18+
19+
# Files that might appear in the root of a volume
20+
.DocumentRevisions-V100
21+
.fseventsd
22+
.Spotlight-V100
23+
.TemporaryItems
24+
.Trashes
25+
.VolumeIcon.icns
26+
.com.apple.timemachine.donotpresent
27+
28+
# Directories potentially created on remote AFP share
29+
.AppleDB
30+
.AppleDesktop
31+
Network Trash Folder
32+
Temporary Items
33+
.apdisk
34+
35+
### Windows template
36+
# Windows image file caches
37+
Thumbs.db
38+
ehthumbs.db
39+
40+
# Folder config file
41+
Desktop.ini
42+
43+
# Recycle Bin used on file shares
44+
$RECYCLE.BIN/
45+
46+
# Windows Installer files
47+
*.cab
48+
*.msi
49+
*.msm
50+
*.msp
51+
52+
# Windows shortcuts
53+
*.lnk
54+
55+
### Node template
56+
# Logs
57+
logs
58+
*.log
59+
npm-debug.log*
60+
61+
# Runtime data
62+
pids
63+
*.pid
64+
*.seed
65+
66+
# Directory for instrumented libs generated by jscoverage/JSCover
67+
lib-cov
68+
69+
# Coverage directory used by tools like istanbul
70+
coverage
71+
72+
# nyc test coverage
73+
.nyc_output
74+
75+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
76+
.grunt
77+
78+
# node-waf configuration
79+
.lock-wscript
80+
81+
# Compiled binary addons (http://nodejs.org/api/addons.html)
82+
build/Release
83+
84+
# Dependency directories
85+
node_modules
86+
jspm_packages
87+
88+
# Optional npm cache directory
89+
.npm
90+
91+
# Optional REPL history
92+
.node_repl_history
93+

.sass-lint.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
files:
2+
ignore: 'rocket-engine/styles/gui/overwrites/**'
3+
4+
# Rules Configuration
5+
rules:
6+
# Mixins
7+
mixins-before-declarations: 0
8+
9+
# Disallows
10+
no-color-literals: 0
11+
no-css-comments: 0
12+
no-vendor-prefixes: 0
13+
14+
# Style
15+
indentation: 0
16+
hex-notation:
17+
- 1
18+
-
19+
style: lowercase
20+
nesting-depth:
21+
- 1
22+
-
23+
max-depth: 3
24+
property-sort-order:
25+
- 1
26+
-
27+
order: smacss # https://gist.github.com/chipcullen/b014d9d6885e1e785a31
28+
29+
clean-import-paths:
30+
leading-underscore: true
31+
32+
# Inner Spacing
33+
space-around-operator: 0
34+
35+
# Final Items
36+
final-newline: 0

VERSION.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
# Melange Change Log
2+
## Version 0.7.0
3+
- NEW: sass-lint added for better standardization
4+
- NEW: `%melange-*` placeholders added for most of the melange default classes.
5+
- NEW: `$predefined-classes` variable added to control if Melange classes will stay as placeholders for the project `@extend`s or css outputs. To prevent major breakdowns, default value set to `true`
6+
- CHANGE: Normalize version updated to `4.1.1`
7+
- CHANGE: Underscored variable names changed to their dashed versions.
8+
- FIX: Coding style revised according to sass-lint configurations.
9+
10+
211
## Version 0.6.1
3-
- Fix: Missing "disabled" styles in input elements
12+
- FIX: Missing "disabled" styles in input elements
413

514
## Version 0.6.0
6-
- New: Field radius settings added for field styles. Use `$base-field-border-radius` variable to set.
7-
- New: woff2 font type support settings added for `font-face` mixins.
8-
- New: Border Radius setting added for button styles. Use `$base-button-border-radius` variable to set one. Default is `null`
9-
- New: `button-colors` mixin added for button styles.
10-
- New: Breakpoints settings added. `$base-widescreen`, `$base-desktop`, `$base-tablet`, `$base-tablet-landscape`, `$base-tablet-portrait` and `$base-phone` variables added both to default variables and settings.
11-
- New: `.mobile-hidden`, `.mobile-visible` auxiliary classes added.
12-
- Change: Predefined font-size definitions from _normalize.css_ removed
13-
- Fix: `text-decoration: underline` problem for anchor buttons resolved.
15+
- NEW: Field radius settings added for field styles. Use `$base-field-border-radius` variable to set.
16+
- NEW: woff2 font type support settings added for `font-face` mixins.
17+
- NEW: Border Radius setting added for button styles. Use `$base-button-border-radius` variable to set one. Default is `null`
18+
- NEW: `button-colors` mixin added for button styles.
19+
- NEW: Breakpoints settings added. `$base-widescreen`, `$base-desktop`, `$base-tablet`, `$base-tablet-landscape`, `$base-tablet-portrait` and `$base-phone` variables added both to default variables and settings.
20+
- NEW: `.mobile-hidden`, `.mobile-visible` auxiliary classes added.
21+
- CHANGE: Predefined font-size definitions from _normalize.css_ removed
22+
- FIX: `text-decoration: underline` problem for anchor buttons resolved.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "melange",
3-
"version": "0.6.1",
3+
"version": "0.7.0",
44
"homepage": "https://github.com/bcinarli/melange",
55
"authors": [
66
"Bilal Çınarlı <[email protected]>"

lib/_melange.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,42 @@
99
General Settings
1010
------------------------------------------- **/
1111
// add settings to your styles before melange.
12-
//@import "settings/settings";
12+
//@import 'settings/settings';
1313

1414

1515

1616
/** -------------------------------------------
1717
Internal Variables
1818
------------------------------------------- **/
19-
@import "melange/variables/variables";
19+
@import 'melange/variables/variables';
2020

2121

2222
/** -------------------------------------------
2323
Melange Internal Methods
2424
------------------------------------------- **/
2525
// use Caffeine
26-
//@import "melange/_system/system";
26+
//@import 'melange/_system/system';
2727

2828

2929
/** -------------------------------------------
3030
Global Styles
3131
------------------------------------------- **/
32-
@import "melange/globals/globals";
32+
@import 'melange/globals/globals';
3333

3434

3535
/** -------------------------------------------
3636
Layout Definitions
3737
------------------------------------------- **/
38-
@import "melange/layout/layout";
38+
@import 'melange/layout/layout';
3939

4040

4141
/** -------------------------------------------
4242
Base Element Styles
4343
------------------------------------------- **/
44-
@import "melange/elements/elements";
44+
@import 'melange/elements/elements';
4545

4646

4747
/** -------------------------------------------
4848
Default Components
4949
------------------------------------------- **/
50-
@import "melange/components/components";
50+
@import 'melange/components/components';

lib/melange/auxiliary/_auxiliary.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
//
77
// Visuals
88
//
9-
@import "_visibility";
9+
@import 'visibility';

lib/melange/auxiliary/_visibility.scss

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* Hide element
88
*/
99
.is-hidden,
10-
.hide // for fallback older versions
11-
{
10+
// for fallback older versions
11+
.hide {
1212
display: none;
1313
}
1414

@@ -18,37 +18,37 @@
1818
* visually invisible for accessibility
1919
*/
2020
.for-screenreader-only {
21-
position: absolute;
22-
overflow: hidden;
23-
width: 1px;
24-
height: 1px;
25-
margin: -1px;
26-
padding: 0;
27-
clip: rect(0 0 0 0);
28-
clip: rect(0, 0, 0, 0);
21+
position: absolute;
22+
width: 1px;
23+
height: 1px;
24+
margin: -1px;
25+
padding: 0;
26+
overflow: hidden;
27+
clip: rect(0 0 0 0);
28+
clip: rect(0, 0, 0, 0);
2929
}
3030

3131
/**
3232
* Device visibility
3333
*/
3434
.desktop-visible {
3535
// do not interfere element's display, just hide when not needed
36-
@media screen and (max-width: $base-desktop - 1px){
37-
display: none;
36+
@media screen and (max-width: $base-desktop - 1px) {
37+
display: none;
3838
}
3939
}
4040

4141
.desktop-hidden,
4242
.tablet-visible {
43-
@media screen and (min-width: $base-desktop){
44-
display: none;
43+
@media screen and (min-width: $base-desktop) {
44+
display: none;
4545
}
4646
}
4747

4848
.tablet-hidden {
4949
// hide if in the tablet region
5050
@media screen and (min-width: $base-phone + 1px) and (max-width: $base-tablet-landscape) {
51-
display: none;
51+
display: none;
5252
}
5353
}
5454

lib/melange/components/_components.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
/**
77
* Media Component
88
*/
9-
@import "media";
9+
@import 'media';

lib/melange/components/_media.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
*/
1111

1212
.media {
13-
@extend .group;
14-
}
13+
@extend %melange-button;
1514

16-
.media-visual {
17-
display: block;
18-
float: left;
19-
margin-right: $base-spacing;
20-
}
15+
&-visual {
16+
display: block;
17+
margin-right: $base-spacing;
18+
float: left;
19+
}
2120

22-
.media-text {
23-
+ .media-visual { // visual added after text
24-
float: right;
25-
margin-right: auto;
26-
margin-left: $base-spacing;
21+
&-text {
22+
+ .media-visual { // visual added after text
23+
margin-right: auto;
24+
margin-left: $base-spacing;
25+
float: right;
26+
}
2727
}
2828
}

lib/melange/elements/_elements.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,45 @@
66
//
77
// Text Styles
88
//
9-
@import "texts";
9+
@import 'texts';
1010

1111
//
1212
// Form Styles
1313
//
14-
@import "forms/forms";
14+
@import 'forms/forms';
1515

1616

1717
//
1818
// Table Styles
1919
//
20-
@import "tables";
20+
@import 'tables';
2121

2222

2323
//
2424
// Link & Nav Styles
2525
//
26-
@import "links";
26+
@import 'links';
2727

2828

2929
//
3030
// Heading Styles
3131
//
32-
@import "headings";
32+
@import 'headings';
3333

3434

3535
//
3636
// List Styles
3737
//
38-
@import "lists";
38+
@import 'lists';
3939

4040

4141
//
4242
// Inline Elements
4343
//
44-
@import "inline";
44+
@import 'inline';
4545

4646

4747
//
4848
// Block Elements
4949
//
50-
@import "block";
50+
@import 'block';

0 commit comments

Comments
 (0)