##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

Merge pull request #5368 from jdfreder/specifity...
Brian E. Granger -
r15901:8121f3e0 merge
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -80,6 +80,8 b' Browsers not listed, including Safari, are supported via the styling under the'
80 80 flex: none;
81 81 }
82 82
83 .hbox.reverse,
84 .vbox.reverse,
83 85 .reverse {
84 86 /* Old browsers */
85 87 -webkit-box-direction: reverse;
@@ -90,6 +92,8 b' Browsers not listed, including Safari, are supported via the styling under the'
90 92 flex-direction: row-reverse;
91 93 }
92 94
95 .hbox.box-flex0,
96 .vbox.box-flex0,
93 97 .box-flex0 {
94 98 /* Old browsers */
95 99 -webkit-box-flex: 0;
@@ -101,6 +105,8 b' Browsers not listed, including Safari, are supported via the styling under the'
101 105 width: auto;
102 106 }
103 107
108 .hbox.box-flex1,
109 .vbox.box-flex1,
104 110 .box-flex1 {
105 111 /* Old browsers */
106 112 -webkit-box-flex: 1;
@@ -111,11 +117,15 b' Browsers not listed, including Safari, are supported via the styling under the'
111 117 flex: 1;
112 118 }
113 119
120 .hbox.box-flex,
121 .vbox.box-flex,
114 122 .box-flex {
115 123 /* Old browsers */
116 124 .box-flex1();
117 125 }
118 126
127 .hbox.box-flex2,
128 .vbox.box-flex2,
119 129 .box-flex2 {
120 130 /* Old browsers */
121 131 -webkit-box-flex: 2;
@@ -140,6 +150,8 b' Browsers not listed, including Safari, are supported via the styling under the'
140 150 box-flex-group: 2;
141 151 }
142 152
153 .hbox.start,
154 .vbox.start,
143 155 .start {
144 156 /* Old browsers */
145 157 -webkit-box-pack: start;
@@ -150,6 +162,8 b' Browsers not listed, including Safari, are supported via the styling under the'
150 162 justify-content: flex-start;
151 163 }
152 164
165 .hbox.end,
166 .vbox.end,
153 167 .end {
154 168 /* Old browsers */
155 169 -webkit-box-pack: end;
@@ -160,6 +174,8 b' Browsers not listed, including Safari, are supported via the styling under the'
160 174 justify-content: flex-end;
161 175 }
162 176
177 .hbox.center,
178 .vbox.center,
163 179 .center {
164 180 /* Old browsers */
165 181 -webkit-box-pack: center;
@@ -170,6 +186,8 b' Browsers not listed, including Safari, are supported via the styling under the'
170 186 justify-content: center;
171 187 }
172 188
189 .hbox.align-start,
190 .vbox.align-start,
173 191 .align-start {
174 192 /* Old browsers */
175 193 -webkit-box-align: start;
@@ -180,6 +198,8 b' Browsers not listed, including Safari, are supported via the styling under the'
180 198 align-items: flex-start;
181 199 }
182 200
201 .hbox.align-end,
202 .vbox.align-end,
183 203 .align-end {
184 204 /* Old browsers */
185 205 -webkit-box-align: end;
@@ -190,6 +210,8 b' Browsers not listed, including Safari, are supported via the styling under the'
190 210 align-items: flex-end;
191 211 }
192 212
213 .hbox.align-center,
214 .vbox.align-center,
193 215 .align-center {
194 216 /* Old browsers */
195 217 -webkit-box-align: center;
Show file before | Show file after | Hide comments
@@ -9,19 +9,19 b' code{color:#000}'
9 9 .hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}
10 10 .vbox{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}
11 11 .vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}
12 .reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:row-reverse}
13 .box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none;width:auto}
14 .box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
15 .box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
16 .box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2}
12 .hbox.reverse,.vbox.reverse,.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:row-reverse}
13 .hbox.box-flex0,.vbox.box-flex0,.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none;width:auto}
14 .hbox.box-flex1,.vbox.box-flex1,.box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
15 .hbox.box-flex,.vbox.box-flex,.box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
16 .hbox.box-flex2,.vbox.box-flex2,.box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2}
17 17 .box-group1{-webkit-box-flex-group:1;-moz-box-flex-group:1;box-flex-group:1}
18 18 .box-group2{-webkit-box-flex-group:2;-moz-box-flex-group:2;box-flex-group:2}
19 .start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start}
20 .end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end}
21 .center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center}
22 .align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
23 .align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-items:flex-end}
24 .align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-items:center}
19 .hbox.start,.vbox.start,.start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start}
20 .hbox.end,.vbox.end,.end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end}
21 .hbox.center,.vbox.center,.center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center}
22 .hbox.align-start,.vbox.align-start,.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
23 .hbox.align-end,.vbox.align-end,.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-items:flex-end}
24 .hbox.align-center,.vbox.align-center,.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-items:center}
25 25 div.error{margin:2em;text-align:center}
26 26 div.error>h1{font-size:500%;line-height:normal}
27 27 div.error>p{font-size:200%;line-height:normal}
Show file before | Show file after | Hide comments
@@ -1272,19 +1272,19 b' code{color:#000}'
1272 1272 .hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}
1273 1273 .vbox{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;width:100%;display:flex;flex-direction:column;align-items:stretch}
1274 1274 .vbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none}
1275 .reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:row-reverse}
1276 .box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none;width:auto}
1277 .box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
1278 .box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
1279 .box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2}
1275 .hbox.reverse,.vbox.reverse,.reverse{-webkit-box-direction:reverse;-moz-box-direction:reverse;box-direction:reverse;flex-direction:row-reverse}
1276 .hbox.box-flex0,.vbox.box-flex0,.box-flex0{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;flex:none;width:auto}
1277 .hbox.box-flex1,.vbox.box-flex1,.box-flex1{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
1278 .hbox.box-flex,.vbox.box-flex,.box-flex{-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
1279 .hbox.box-flex2,.vbox.box-flex2,.box-flex2{-webkit-box-flex:2;-moz-box-flex:2;box-flex:2;flex:2}
1280 1280 .box-group1{-webkit-box-flex-group:1;-moz-box-flex-group:1;box-flex-group:1}
1281 1281 .box-group2{-webkit-box-flex-group:2;-moz-box-flex-group:2;box-flex-group:2}
1282 .start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start}
1283 .end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end}
1284 .center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center}
1285 .align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
1286 .align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-items:flex-end}
1287 .align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-items:center}
1282 .hbox.start,.vbox.start,.start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;justify-content:flex-start}
1283 .hbox.end,.vbox.end,.end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;justify-content:flex-end}
1284 .hbox.center,.vbox.center,.center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;justify-content:center}
1285 .hbox.align-start,.vbox.align-start,.align-start{-webkit-box-align:start;-moz-box-align:start;box-align:start;align-items:flex-start}
1286 .hbox.align-end,.vbox.align-end,.align-end{-webkit-box-align:end;-moz-box-align:end;box-align:end;align-items:flex-end}
1287 .hbox.align-center,.vbox.align-center,.align-center{-webkit-box-align:center;-moz-box-align:center;box-align:center;align-items:center}
1288 1288 div.error{margin:2em;text-align:center}
1289 1289 div.error>h1{font-size:500%;line-height:normal}
1290 1290 div.error>p{font-size:200%;line-height:normal}
General Comments 0
You need to be logged in to leave comments. Login now