Skip to content

Commit d10297f

Browse files
LausselloicLausselloic
committed
build(scss): fix issue #30 and #31 following IE8 fixes
1 parent 649151b commit d10297f

15 files changed

+157
-2985
lines changed

‎app/less/variables-orange2015.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
@modal-md: 700px;
773773
@modal-sm: 300px;
774774

775-
@-6rem: 6rem;
775+
@-6rem: .6rem;
776776
@-7rem: .7rem;
777777
@1rem: 1rem;
778778
@1-4rem: 1.4rem;

‎app/scss/bootstrap/_IE8_font-size2015.scss‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,4 +203,28 @@ $nav-local-padding-vertical-bottom: 17px;
203203

204204
.o-stepbar .stepbar-item.current:after {
205205
background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAoCAYAAAD32nqhAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIaSURBVEiJpdY7aFNRGMDx/3cTmybER4TiC7MIvqkogq0Qh+JY6eAgCjqpoGhboUMRBAddRKQuPoKTSAUdXMRFENQYFMQXBK04SLEaUWxuaGJTk/s5WATbe0/uqWe63Jzz44P7DxzqxbdP9M/ay1xWeXCR6zV+jalqSVXTtucdrZYWVK/1fAeSwA1VjVgBAI3Cvfb6yP0ckAH6rQGAn9ldHTpVeQ+cVdVN1oDWa7HKxR0RQIFhVW21AgC8Ty9W1fLZZ8B64Iw1AFC7dSSjE99eAidUtcsaQD1n4vzWZaAucF1VF9sBgI6PLp28fWwEWAFkrQGAqdyljsbXd3lgt6nSQACgOtS5Ub36Z+ByUKVGIEylRgCaV9oUAHOloQBTpaEACK40NAD+lVoBfpXaAcyu1BoAoCXhTT/VxO1Fbc5KKl2cf/pjDKQKtNtNII6XHHj+BWQhcEBEflgBsT1XHkuybTNwQUQegMVXcFZu+RDrPLQNKACn/r4PNXk0Vkv25TxAgH0iMmkFxA/ffcq8+GrgpIi8+WeyZoejG7pfR9fszACPgKGZvxsBSaTc+ME7bUAZ2C8i3sw9RiDRny+IE10OHBWRUb89gUBL10A+smTtdmBYRG4G7fMFJJUutvacWweMAcdNU84GfGqzAvxqCw0E1RYKMNUWCjDVZlxuL1q52v1KVRuq+lBV7f7i5cFUafqSNT6XSxb/e837DVOPGxUlOKVlAAAAAElFTkSuQmCC'), 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAoCAYAAAD32nqhAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIaSURBVEiJpdY7aFNRGMDx/3cTmybER4TiC7MIvqkogq0Qh+JY6eAgCjqpoGhboUMRBAddRKQuPoKTSAUdXMRFENQYFMQXBK04SLEaUWxuaGJTk/s5WATbe0/uqWe63Jzz44P7DxzqxbdP9M/ay1xWeXCR6zV+jalqSVXTtucdrZYWVK/1fAeSwA1VjVgBAI3Cvfb6yP0ckAH6rQGAn9ldHTpVeQ+cVdVN1oDWa7HKxR0RQIFhVW21AgC8Ty9W1fLZZ8B64Iw1AFC7dSSjE99eAidUtcsaQD1n4vzWZaAucF1VF9sBgI6PLp28fWwEWAFkrQGAqdyljsbXd3lgt6nSQACgOtS5Ub36Z+ByUKVGIEylRgCaV9oUAHOloQBTpaEACK40NAD+lVoBfpXaAcyu1BoAoCXhTT/VxO1Fbc5KKl2cf/pjDKQKtNtNII6XHHj+BWQhcEBEflgBsT1XHkuybTNwQUQegMVXcFZu+RDrPLQNKACn/r4PNXk0Vkv25TxAgH0iMmkFxA/ffcq8+GrgpIi8+WeyZoejG7pfR9fszACPgKGZvxsBSaTc+ME7bUAZ2C8i3sw9RiDRny+IE10OHBWRUb89gUBL10A+smTtdmBYRG4G7fMFJJUutvacWweMAcdNU84GfGqzAvxqCw0E1RYKMNUWCjDVZlxuL1q52v1KVRuq+lBV7f7i5cFUafqSNT6XSxb/e837DVOPGxUlOKVlAAAAAElFTkSuQmCC'));
206-
}
206+
}
207+
208+
// Modal fix
209+
210+
@-6rem: 6px;
211+
@-7rem: 7px;
212+
$1rem: 10px;
213+
$1-4rem: 14px;
214+
$1-6rem: 16px;
215+
$2rem: 20px;
216+
$2-4rem: 24px;
217+
$2-9rem: 29px;
218+
$3rem: 30px;
219+
$3-2rem: 32px;
220+
$3-6rem: 36px;
221+
$4rem: 40px;
222+
$4-6rem: 46px;
223+
$5rem: 50px;
224+
$6rem: 60px;
225+
$6-4rem: 64px;
226+
$14-2rem: 142px;
227+
228+
$btn-close-icon: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAUwAAAFMB8eliagAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFOSURBVDiNrdM/T8JAGAbw53nbQJsGPxAMuGEdnAxblyaMzE46sTmyd2HSuPmvbi7weRqJoYRez0E0prS9lnjTDZffve/d83IymfRF5KbT6Yzn8/kHjlhBEHiO49xblnUrJK+11qM0TV/CMOy1xcIw7DmO80byPM/zK9lsNpda63eSA9u24+l0etKmMtu2H0kOAKyyLBvzT8lPJE8BrLrdrm9qPwgCz3XdZwDDPXYWRdGahXdohFZhAMDiQRNahx2AJtSElYJVaJIkyoRVgsB3HCzLeiU50FovAeBnr5Tyy7BasIgCgAkDAKkDd7tdTjL7vZ2k53m1Rfx7y6UVFidAKeWnaTpqMlGlsan6zSY5PQi2KRomlG2wJijbYiaUx2B1qLiu+wBgqLVetsEAYLFYfCqlLvax6m+32zsRkRmA2DQBVSuKorVSygcQi8jsCwI1IGjlJrjOAAAAAElFTkSuQmCC");
229+
230+

‎app/scss/bootstrap/_boostedIE82015.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818
@import "variables-orange2015";
1919
@import "boostedIcons";
2020
@import "o-link-arrow";
21-
@import "IE8_font-size2015";
21+
@import "o-modal";
22+
@import "o-calendar";
2223
@import "orange-css";
24+
@import "IE8_font-size2015";

‎app/scss/bootstrap/_bootstrap-orange2015.scss‎

Lines changed: 0 additions & 119 deletions
This file was deleted.

‎app/scss/bootstrap/_bootstrap-orangeIE82015.scss‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
// Components w/ JavaScript
4545
@import "modals";
4646
@import "tooltip";
47-
@import "popovers";
47+
@import "popovers";
4848
@import "tooltip";
4949
@import "popovers";
5050
@import "carousel";
@@ -56,7 +56,7 @@
5656
@import "IE8_font-size2015";
5757
a {
5858
color: $link-color;
59-
text-decoration: underline;
59+
// text-decoration: underline;
6060

6161
&:hover,
6262
&:focus {
@@ -77,8 +77,14 @@ p a {
7777
}
7878
nav a, .dropdown-menu a, .dropdown a, .navbar a, .nav a, a.btn {
7979
text-decoration: none;
80-
}
80+
}
8181

8282
.form-horizontal .control-label {
8383
text-align: left;
84-
}
84+
}
85+
86+
// Tables fix
87+
88+
.has-checkbox.table TR > TH:first-child {
89+
width: auto !important;
90+
}

‎app/scss/bootstrap/_o-buttons.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@
548548
background: $gray-dark;
549549
border: 2px solid $gray-dark;
550550
cursor: pointer;
551-
padding: 0 .6rem;
551+
padding: 0 @-6rem;
552552

553553
.on,
554554
.off {
@@ -586,9 +586,9 @@
586586

587587
&.rounded {
588588
border-radius: $checkbox-label-size;
589-
min-width: 6rem;
589+
min-width: $6rem;
590590
width: auto;
591-
padding: 0 1.4rem;
591+
padding: 0 $1-4rem;
592592

593593
.on,
594594
.off {
@@ -681,7 +681,7 @@
681681
border: 2px solid #000;
682682

683683
.btn {
684-
width: $toggles-3-way-width;
684+
min-width: $toggles-3-way-width;
685685
padding-right: 0;
686686
padding-left: 0;
687687
margin: 0;

‎app/scss/bootstrap/_o-modal.scss‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
.modal {
22

33
.modal-content {
4-
padding: 4rem;
4+
padding: $4rem;
55
border: 0;
66
}
77

88
.modal-header {
99
position: relative;
10-
min-height: 2rem;
10+
min-height: $2rem;
1111
padding: 0;
12-
margin-bottom: 4rem;
12+
margin-bottom: $4rem;
1313
border: 0;
1414

1515
.btn {
1616
position: absolute;
17-
top: -1rem;
18-
right: -1rem;
19-
padding: 1rem;
17+
top: -$1rem;
18+
right: -$1rem;
19+
padding: $1rem;
2020
background-color: transparent;
2121
border: 0;
2222

@@ -26,12 +26,13 @@
2626

2727

2828
.close {
29-
width: 2rem;
30-
height: 2rem;
29+
width: $2rem;
30+
height: $2rem;
3131
margin: 0;
32-
background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("data:image/svg+xml;charset=utf8, %3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22852.063%22%20height%3D%22852.063%22%20viewBox%3D%220%200%20852.063%20852.063%22%3E%3Cpath%20id%3D%22closing_cross.svg%22%20data-name%3D%22closing%20cross.svg%22%20class%3D%22cls-1%22%20d%3D%22M.987%2057.125L57.125.987%20851.048%20794.91l-56.138%2056.138zM794.91.987l56.138%2056.138L57.125%20851.048.987%20794.91z%22%20fill%3D%22%23666%22%2F%3E%3C%2Fsvg%3E"), "data:image/svg+xml;charset=utf8, %3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22852.063%22%20height%3D%22852.063%22%20viewBox%3D%220%200%20852.063%20852.063%22%3E%3Cpath%20id%3D%22closing_cross.svg%22%20data-name%3D%22closing%20cross.svg%22%20class%3D%22cls-1%22%20d%3D%22M.987%2057.125L57.125.987%20851.048%20794.91l-56.138%2056.138zM794.91.987l56.138%2056.138L57.125%20851.048.987%20794.91z%22%20fill%3D%22%23666%22%2F%3E%3C%2Fsvg%3E"));
33-
background-size: 2rem;
32+
background-image: $btn-close-icon;
33+
background-size: $2rem;
3434
opacity: 1;
35+
filter: none;
3536
}
3637
}
3738
}
@@ -46,23 +47,23 @@
4647
border: 0;
4748

4849
.btn + .btn {
49-
margin-left: 2rem;
50+
margin-left: $2rem;
5051
}
5152
}
5253
}
5354

5455
.modal .modal-sm {
5556

5657
.modal-content {
57-
padding: 2rem;
58+
padding: $2rem;
5859
}
5960

6061
.modal-header {
6162
margin-bottom: 0;
6263
}
6364

6465
.modal-footer {
65-
margin: 2rem 0;
66+
margin: $2rem 0;
6667

6768
.float-xs-right {
6869
float: none !important;
@@ -76,26 +77,26 @@
7677
.card.card-block {
7778
width: auto;
7879
padding: 0;
79-
margin: 0 0 4rem;
80+
margin: 0 0 $4rem;
8081
border: 0;
8182

8283
.card-title {
83-
margin-bottom: 2rem;
84+
margin-bottom: $2rem;
8485
}
8586
}
8687

8788
.card-block.has-info,
8889
.card.card-block.has-info {
8990
position: relative;
90-
margin-left: 6rem;
91+
margin-left: $6rem;
9192

9293
.card-icon {
9394
position: absolute;
94-
left: -6rem;
95+
left: -$6rem;
9596
}
9697

9798
.card-icon span[class^="icon-"] {
98-
font-size: 4.6rem;
99+
font-size: $4-6rem;
99100
line-height: 1;
100101
}
101102

@@ -107,43 +108,43 @@
107108

108109
.modal .modal-sm {
109110
.card.card-block {
110-
margin-bottom: 2rem;
111+
margin-bottom: $2rem;
111112
margin-left: 0;
112113
}
113114

114115
.card-title {
115-
font-size: 1.6rem;
116+
font-size: $1-6rem;
116117
}
117118

118119
.card-block.has-info,
119120
.card.card-block.has-info {
120121
position: relative;
121-
margin-top: 2rem;
122+
margin-top: $2rem;
122123

123124
.card-icon {
124125
position: absolute;
125126
left: 0;
126127
}
127128

128129
span[class^="icon-"] {
129-
font-size: 3.2rem;
130+
font-size: $3-2rem;
130131
}
131132

132133
.card-title {
133-
margin-left: 4rem;
134+
margin-left: $4rem;
134135
}
135136

136137
&.on-top {
137138
margin-top: 0;
138139

139140
.card-icon {
140141
position: static;
141-
margin-bottom: 2rem;
142+
margin-bottom: $2rem;
142143
text-align: center;
143144
}
144145

145146
span[class^="icon-"] {
146-
font-size: 6.4rem;
147+
font-size: $6-4rem;
147148
}
148149

149150
.card-title {

0 commit comments

Comments
 (0)