Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

** Fixes #2907 @incude in sass files #2908

Merged
merged 4 commits into from Feb 7, 2017
Merged

** Fixes #2907 @incude in sass files #2908

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c5bf98
** Fixes #2907
ilmoeuro Feb 1, 2017
9600ecb
** Include flex sass in sassc makefile
ilmoeuro Feb 1, 2017
97e4a35
** Correct import paths
ilmoeuro Feb 1, 2017
4fd1e07
** Hound fixes
ilmoeuro Feb 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions muikku/src/main/webapp/resources/theme-muikku/Makefile
View file
Open in desktop
@@ -1,9 +1,16 @@
SCSS_FILES=$(wildcard sass/*.scss)
SOURCES=$(filter-out sass/_%,$(SCSS_FILES))
TARGETS=$(SOURCES:sass/%.scss=css/%.css)
MAIN_SCSS_FILES=$(wildcard sass/*.scss)
MAIN_SOURCES=$(filter-out sass/_%,$(MAIN_SCSS_FILES))
MAIN_TARGETS=$(MAIN_SOURCES:sass/%.scss=css/%.css)

FLEX_SCSS_FILES=$(wildcard sass/flex/*.scss)
FLEX_SOURCES=$(filter-out sass/flex/_%,$(FLEX_SCSS_FILES))
FLEX_TARGETS=$(FLEX_SOURCES:sass/flex/%.scss=css/flex/%.css)

.PHONY: all
all: $(TARGETS)
all: $(MAIN_TARGETS) $(FLEX_TARGETS)

css/%.css: sass/%.scss
sassc $< $@

css/flex/%.css: sass/flex/%.scss
sassc $< $@
4 changes: 2 additions & 2 deletions muikku/src/main/webapp/resources/theme-muikku/sass/_widgets.scss
View file
Open in desktop
Expand Up @@ -559,7 +559,7 @@ div[class*="wi-dock-static-navi"] {
.lu-badgeContainer {

.lu-user-picture {
@incude border(2px,#fff,solid);
@include border(2px,#fff,solid);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commas in mixin arguments should be followed by one space
Color literals like #fff should only be used in variable declarations; they should be referred to via variable everywhere else.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix pls, color literals can be ignored now

height:48px;
width:48px;
position:relative;
Expand All @@ -581,7 +581,7 @@ div[class*="wi-dock-static-navi"] {

}
.lu-infoContainer {
@incude border(2px,#fff,solid);
@include border(2px,#fff,solid);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line should be indented 6 spaces, but was indented 7 spaces
Commas in mixin arguments should be followed by one space
Color literals like #fff should only be used in variable declarations; they should be referred to via variable everywhere else.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix pls, color literals can be ignored now

background:#fff;
height:48px;
display:inline-block;
Expand Down
4 changes: 2 additions & 2 deletions muikku/src/main/webapp/resources/theme-muikku/sass/_workspaces.scss
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@ body[class^='workspace'] {
margin-top:5px;

.lu-picture-container {
@incude border(2px,#fff,solid);
@include border(2px,#fff,solid);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commas in mixin arguments should be followed by one space
Color literals like #fff should only be used in variable declarations; they should be referred to via variable everywhere else.

Copy link
Member

@jjlankinen jjlankinen Feb 3, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix pls, color literals can be ignored now

box-shadow:0 0 10px rgba(0, 0, 0, 0.1);
height:48px;
width:48px;
Expand Down Expand Up @@ -598,4 +598,4 @@ body[class^='workspace'] {
}

}