Skip to content

Commit

Permalink
Oops, we needed relative paths in our CSS file
Browse files Browse the repository at this point in the history
  • Loading branch information
@BjarniRunar
BjarniRunar committed Aug 16, 2019
1 parent 8f192f5 commit 59ef382
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 32 deletions.
5 changes: 2 additions & 3 deletions scripts/less-compiler.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ shared-data/default-theme/css/default.css: .less-deps
@(cd shared-data/default-theme/less && \
lessc default.less \
|perl -npe 's,(libraries|app)/,,g' \
|perl -npe 's,../webfonts,/static/webfonts,g' \
|perl -npe 's,/shared-data/,/static/,g' \
|perl -npe 's,[\./]+/bower_components/select2/,/static/css/,g' \
|perl -npe 's,/shared-data/,../,g' \
|perl -npe 's,[\./]+/bower_components/select2/,../css/,g' \
>../css/default.css)
@ls -l shared-data/default-theme/css/default.css

Expand Down
58 changes: 29 additions & 29 deletions shared-data/default-theme/css/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@
*/
@font-face {
font-family: 'Mailpile-300';
src: url('/static/webfonts/Mailpile-Normal.eot');
src: url('/static/webfonts/Mailpile-Normal.eot?#iefix') format('embedded-opentype'), url('/static/webfonts/Mailpile-Normal.woff') format('font-woff'), url('/static/webfonts/Mailpile-Normal.ttf') format('truetype'), url('/static/webfonts/Mailpile-Normal.svg#wf') format('svg');
src: url('../webfonts/Mailpile-Normal.eot');
src: url('../webfonts/Mailpile-Normal.eot?#iefix') format('embedded-opentype'), url('../webfonts/Mailpile-Normal.woff') format('font-woff'), url('../webfonts/Mailpile-Normal.ttf') format('truetype'), url('../webfonts/Mailpile-Normal.svg#wf') format('svg');
}
@font-face {
font-family: 'Mailpile-500';
src: url('/static/webfonts/Mailpile-500.eot');
src: url('/static/webfonts/Mailpile-500.eot?#iefix') format('embedded-opentype'), url('/static/webfonts/Mailpile-500.woff') format('font-woff'), url('/static/webfonts/Mailpile-500.ttf') format('truetype'), url('/static/webfonts/Mailpile-500.svg#wf') format('svg');
src: url('../webfonts/Mailpile-500.eot');
src: url('../webfonts/Mailpile-500.eot?#iefix') format('embedded-opentype'), url('../webfonts/Mailpile-500.woff') format('font-woff'), url('../webfonts/Mailpile-500.ttf') format('truetype'), url('../webfonts/Mailpile-500.svg#wf') format('svg');
}
@font-face {
font-family: 'Mailpile-700';
src: url('/static/webfonts/Mailpile-700.eot');
src: url('/static/webfonts/Mailpile-700.eot?#iefix') format('embedded-opentype'), url('/static/webfonts/Mailpile-700.woff') format('font-woff'), url('/static/webfonts/Mailpile-700.ttf') format('truetype'), url('/static/webfonts/Mailpile-700.svg#wf') format('svg');
src: url('../webfonts/Mailpile-700.eot');
src: url('../webfonts/Mailpile-700.eot?#iefix') format('embedded-opentype'), url('../webfonts/Mailpile-700.woff') format('font-woff'), url('../webfonts/Mailpile-700.ttf') format('truetype'), url('../webfonts/Mailpile-700.svg#wf') format('svg');
}
@font-face {
font-family: 'Mailpile-Interface';
src: url('/static/webfonts/Mailpile-Interface.eot');
src: url('/static/webfonts/Mailpile-Interface.eot') format('embedded-opentype'), url('/static/webfonts/Mailpile-Interface.woff') format('woff'), url('/static/webfonts/Mailpile-Interface.ttf') format('truetype'), url('/static/webfonts/Mailpile-Interface.svg#Mailpile-Interface') format('svg');
src: url('../webfonts/Mailpile-Interface.eot');
src: url('../webfonts/Mailpile-Interface.eot') format('embedded-opentype'), url('../webfonts/Mailpile-Interface.woff') format('woff'), url('../webfonts/Mailpile-Interface.ttf') format('truetype'), url('../webfonts/Mailpile-Interface.svg#Mailpile-Interface') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -4657,7 +4657,7 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
font-size: 1px;
text-decoration: none;
border: 0;
background: url('/static/css/select2.png') right top no-repeat;
background: url('../css/select2.png') right top no-repeat;
cursor: pointer;
outline: 0;
}
Expand Down Expand Up @@ -4746,7 +4746,7 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow {
display: block;
width: 100%;
height: 100%;
background: url('/static/css/select2.png') no-repeat 0 1px;
background: url('../css/select2.png') no-repeat 0 1px;
}
html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
background-position: 2px 1px;
Expand Down Expand Up @@ -4774,26 +4774,26 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
background: #ffffff url('/static/css/select2.png') no-repeat 100% -22px;
background: url('/static/css/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #ffffff), color-stop(0.99, #eeeeee));
background: url('/static/css/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('/static/css/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('/static/css/select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #ffffff 85%, #eeeeee 99%) 0 0;
background: #ffffff url('../css/select2.png') no-repeat 100% -22px;
background: url('../css/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #ffffff), color-stop(0.99, #eeeeee));
background: url('../css/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('../css/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('../css/select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #ffffff 85%, #eeeeee 99%) 0 0;
}
html[dir="rtl"] .select2-search input {
padding: 4px 5px 4px 20px;
background: #ffffff url('/static/css/select2.png') no-repeat -37px -22px;
background: url('/static/css/select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #ffffff), color-stop(0.99, #eeeeee));
background: url('/static/css/select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('/static/css/select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('/static/css/select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #ffffff 85%, #eeeeee 99%) 0 0;
background: #ffffff url('../css/select2.png') no-repeat -37px -22px;
background: url('../css/select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #ffffff), color-stop(0.99, #eeeeee));
background: url('../css/select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('../css/select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('../css/select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #ffffff 85%, #eeeeee 99%) 0 0;
}
.select2-search input.select2-active {
background: #ffffff url('/static/css/select2-spinner.gif') no-repeat 100%;
background: url('/static/css/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #ffffff), color-stop(0.99, #eeeeee));
background: url('/static/css/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('/static/css/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('/static/css/select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #ffffff 85%, #eeeeee 99%) 0 0;
background: #ffffff url('../css/select2-spinner.gif') no-repeat 100%;
background: url('../css/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #ffffff), color-stop(0.99, #eeeeee));
background: url('../css/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('../css/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #ffffff 85%, #eeeeee 99%);
background: url('../css/select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #ffffff 85%, #eeeeee 99%) 0 0;
}
.select2-container-active .select2-choice,
.select2-container-active .select2-choices {
Expand Down Expand Up @@ -4948,7 +4948,7 @@ disabled look for disabled choices in the results dropdown
display: none;
}
.select2-more-results.select2-active {
background: #f4f4f4 url('/static/css/select2-spinner.gif') no-repeat 100%;
background: #f4f4f4 url('../css/select2-spinner.gif') no-repeat 100%;
}
.select2-results .select2-ajax-error {
background: rgba(255, 50, 50, 0.2);
Expand Down Expand Up @@ -5028,7 +5028,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li {
background: transparent !important;
}
.select2-container-multi .select2-choices .select2-search-field input.select2-active {
background: #ffffff url('/static/css/select2-spinner.gif') no-repeat 100% !important;
background: #ffffff url('../css/select2-spinner.gif') no-repeat 100% !important;
}
.select2-default {
color: #999 !important;
Expand Down Expand Up @@ -5076,7 +5076,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
top: 4px;
font-size: 1px;
outline: none;
background: url('/static/css/select2.png') right top no-repeat;
background: url('../css/select2.png') right top no-repeat;
}
html[dir="rtl"] .select2-search-choice-close {
right: auto;
Expand Down Expand Up @@ -5148,7 +5148,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
.select2-search-choice-close,
.select2-container .select2-choice abbr,
.select2-container .select2-choice .select2-arrow b {
background-image: url('/static/css/select2x2.png') !important;
background-image: url('../css/select2x2.png') !important;
background-repeat: no-repeat !important;
background-size: 60px 40px !important;
}
Expand Down

0 comments on commit 59ef382

Please sign in to comment.