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

Switch to SCSS #1805

Closed
wants to merge 25 commits into from
Closed

Switch to SCSS #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fac117b
Cache and compile base
skjnldsv Oct 19, 2016
adfdc33
Copyright update
skjnldsv Oct 19, 2016
ed747db
EOF fix
skjnldsv Oct 19, 2016
f9d460c
Inputs select2 fix
skjnldsv Oct 19, 2016
8b582de
Inputs select2 fix 2
skjnldsv Oct 19, 2016
dac10d2
Copyright fix
skjnldsv Oct 20, 2016
93c8dfe
Tooltip scss
skjnldsv Oct 20, 2016
64173a4
Systemtags scss
skjnldsv Oct 20, 2016
4ed1f56
Share scss (remove .showCruds related since we don't use it anymore)
skjnldsv Oct 20, 2016
db00677
Share scss fix 2
skjnldsv Oct 20, 2016
513ea78
Logger fix
skjnldsv Oct 20, 2016
4f0d555
Multiselect scss
skjnldsv Oct 20, 2016
00f7e84
Removing old css
skjnldsv Oct 20, 2016
861d232
Icons scss
skjnldsv Oct 20, 2016
17cd40f
Icons scss fix loading gif and added audio
skjnldsv Oct 20, 2016
cf47f9d
Icons scss fix loading elements gif
skjnldsv Oct 20, 2016
b758066
Update rest of the header as well
nickvergessen Oct 21, 2016
6f4b60f
Apps scss
skjnldsv Oct 22, 2016
c4dd6f0
Rebase master and applied 2d91831b5092c9d04a20cbe55a31cc41cec10fbe & …
skjnldsv Nov 2, 2016
6d9c569
Inputs global fix and improvments
skjnldsv Nov 5, 2016
58b431d
Inputs primary button
skjnldsv Nov 5, 2016
67c63e9
Inputs border fix
skjnldsv Nov 5, 2016
05c0aa0
Inputs select2 important fix following select2 vendor style merging t…
skjnldsv Nov 5, 2016
942c1dd
Jquery-ui-fixes
skjnldsv Nov 5, 2016
d0a5fc6
Inputs select2 float, dropdown and border fix #1932
skjnldsv Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
704 changes: 0 additions & 704 deletions core/css/apps.css
View file
Open in desktop

This file was deleted.

665 changes: 665 additions & 0 deletions core/css/apps.scss
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 33 additions & 41 deletions core/css/icons.css → core/css/icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,36 +21,24 @@
.icon-loading-small,
.icon-loading-small-dark {
position: relative;
}
.loading:after,
.loading-small:after,
.icon-loading:after,
.icon-loading-dark:after,
.icon-loading-small:after,
.icon-loading-small-dark:after {
z-index: 2;
content: "";
height: 32px;
width: 32px;
margin: -17px 0 0 -17px;
position: absolute;
top: 50%;
left: 50%;
border-radius: 100%;
-webkit-animation: rotate .8s infinite linear;
animation: rotate .8s infinite linear;
-webkit-transform-origin: center;
-ms-transform-origin: center;
transform-origin: center;
}
.loading:after,
.loading-small:after,
.icon-loading:after,
.icon-loading-dark:after,
.icon-loading-small:after,
.icon-loading-small-dark:after {
border: 2px solid rgba(150, 150, 150, .5);
border-top-color: rgb(100, 100, 100);
&:after {
z-index: 2;
content: "";
height: 32px;
width: 32px;
margin: -17px 0 0 -17px;
position: absolute;
top: 50%;
left: 50%;
border-radius: 100%;
-webkit-animation: rotate .8s infinite linear;
animation: rotate .8s infinite linear;
-webkit-transform-origin: center;
-ms-transform-origin: center;
transform-origin: center;
border: 2px solid rgba(150, 150, 150, .5);
border-top-color: rgb(100, 100, 100);
}
}

.icon-loading-dark:after,
Expand All @@ -67,17 +55,21 @@
}

/* Css replaced elements don't have ::after nor ::before */
img.icon-loading, object.icon-loading, video.icon-loading, button.icon-loading, textarea.icon-loading, input.icon-loading, select.icon-loading {
background-image: url("../img/loading.gif");
}
img.icon-loading-dark, object.icon-loading-dark, video.icon-loading-dark, button.icon-loading-dark, textarea.icon-loading-dark, input.icon-loading-dark, select.icon-loading-dark {
background-image: url("../img/loading-dark.gif");
}
img.icon-loading-small, object.icon-loading-small, video.icon-loading-small, button.icon-loading-small, textarea.icon-loading-small, input.icon-loading-small, select.icon-loading-small {
background-image: url("../img/loading-small.gif");
}
img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-small-dark, button.icon-loading-small-dark, textarea.icon-loading-small-dark, input.icon-loading-small-dark, select.icon-loading-small-dark {
background-image: url("../img/loading-small-dark.gif");
audio, embed, img, input, select, textarea, video {
&.icon-loading,
&.loading {
background-image: url("../img/loading.gif");
}
&.icon-loading-dark {
background-image: url("../img/loading-dark.gif");
}
&.icon-loading-small,
&.loading-small {
background-image: url("../img/loading-small.gif");
}
&.icon-loading-small-dark {
background-image: url("../img/loading-small-dark.gif");
}
}

@-webkit-keyframes rotate {
Expand Down
Loading