Skip to content

Commit 1070170

Browse files
selwinselwin
committed
Merge branch 'master' into HEAD
Conflicts: idpython/urls.py
2 parents 1821a6b + 5b6fb0b commit 1070170

7 files changed

Lines changed: 419 additions & 15 deletions

File tree

‎idpython/static_files/css/1140.css‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
/* CSS Resets */
2+
3+
html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,address,cite,code,del,dfn,em,img,ins,q,small,strong,sub,sup,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{border:0;margin:0;padding:0}article,aside,figure,figure img,figcaption,hgroup,footer,header,nav,section,video,object{display:block}a img{border:0}figure{position:relative}figure img{width:100%}
4+
5+
6+
/* ==================================================================================================================== */
7+
/* ! The 1140px Grid V2 by Andy Taylor \ http://cssgrid.net \ http://www.twitter.com/andytlr \ http://www.andytlr.com */
8+
/* ==================================================================================================================== */
9+
10+
.container {
11+
padding-left: 20px;
12+
padding-right: 20px;
13+
}
14+
15+
.row {
16+
width: 100%;
17+
max-width: 1140px;
18+
min-width: 755px;
19+
margin: 0 auto;
20+
overflow: hidden;
21+
}
22+
23+
.onecol, .twocol, .threecol, .fourcol, .fivecol, .sixcol, .sevencol, .eightcol, .ninecol, .tencol, .elevencol {
24+
margin-right: 3.8%;
25+
float: left;
26+
min-height: 1px;
27+
}
28+
29+
.row .onecol {
30+
width: 4.85%;
31+
}
32+
33+
.row .twocol {
34+
width: 13.45%;
35+
}
36+
37+
.row .threecol {
38+
width: 22.05%;
39+
}
40+
41+
.row .fourcol {
42+
width: 30.75%;
43+
}
44+
45+
.row .fivecol {
46+
width: 39.45%;
47+
}
48+
49+
.row .sixcol {
50+
width: 48%;
51+
}
52+
53+
.row .sevencol {
54+
width: 56.75%;
55+
}
56+
57+
.row .eightcol {
58+
width: 65.4%;
59+
}
60+
61+
.row .ninecol {
62+
width: 74.05%;
63+
}
64+
65+
.row .tencol {
66+
width: 82.7%;
67+
}
68+
69+
.row .elevencol {
70+
width: 91.35%;
71+
}
72+
73+
.row .twelvecol {
74+
width: 100%;
75+
float: left;
76+
}
77+
78+
.last {
79+
margin-right: 0px;
80+
}
81+
82+
img, object, embed {
83+
max-width: 100%;
84+
}
85+
86+
img {
87+
height: auto;
88+
}
89+
90+
91+
/* Smaller screens */
92+
93+
@media only screen and (max-width: 1023px) {
94+
95+
body {
96+
font-size: 0.8em;
97+
line-height: 1.5em;
98+
}
99+
100+
}
101+
102+
103+
/* Mobile */
104+
105+
@media handheld, only screen and (max-width: 767px) {
106+
107+
body {
108+
font-size: 16px;
109+
-webkit-text-size-adjust: none;
110+
}
111+
112+
.row, body, .container {
113+
width: 100%;
114+
min-width: 0;
115+
margin-left: 0px;
116+
margin-right: 0px;
117+
padding-left: 0px;
118+
padding-right: 0px;
119+
}
120+
121+
.row .onecol, .row .twocol, .row .threecol, .row .fourcol, .row .fivecol, .row .sixcol, .row .sevencol, .row .eightcol, .row .ninecol, .row .tencol, .row .elevencol, .row .twelvecol {
122+
width: auto;
123+
float: none;
124+
margin-left: 0px;
125+
margin-right: 0px;
126+
padding-left: 20px;
127+
padding-right: 20px;
128+
}
129+
130+
}

‎idpython/static_files/css/ie.css‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.onecol {
2+
width: 4.7%;
3+
}
4+
5+
.twocol {
6+
width: 13.2%;
7+
}
8+
9+
.threecol {
10+
width: 22.05%;
11+
}
12+
13+
.fourcol {
14+
width: 30.6%;
15+
}
16+
17+
.fivecol {
18+
width: 39%;
19+
}
20+
21+
.sixcol {
22+
width: 48%;
23+
}
24+
25+
.sevencol {
26+
width: 56.75%;
27+
}
28+
29+
.eightcol {
30+
width: 61.6%;
31+
}
32+
33+
.ninecol {
34+
width: 74.05%;
35+
}
36+
37+
.tencol {
38+
width: 82%;
39+
}
40+
41+
.elevencol {
42+
width: 91.35%;
43+
}

‎idpython/static_files/css/style.less‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
@text-color: #555;
2+
@text-darker: #333;
3+
@droid: 'Droid Sans', sans-serif;
4+
5+
body {
6+
color: @text-color;
7+
font-size: 13px;
8+
font: @droid;
9+
}
10+
11+
a {
12+
color: red;
13+
}
14+
15+
#top {
16+
background: #000;
17+
}
18+
19+
#header-big {
20+
.column {
21+
float: left;
22+
width: 50%;
23+
}
24+
}
25+
26+
/* ============================= */
27+
/* ! Layout for mobile version */
28+
/* ============================= */
29+
30+
@media handheld, only screen and (max-width: 767px) {
31+
32+
body {
33+
34+
}
35+
36+
}
37+
38+
39+
/* ========================================== */
40+
/* ! Provide higher res assets for iPhone 4 */
41+
/* ========================================== */
42+
43+
@media only screen and (-webkit-min-device-pixel-ratio: 2) {
44+
45+
/* .logo {
46+
background: url(logo2x.jpg) no-repeat;
47+
background-size: 212px 303px;
48+
}*/
49+
50+
}

‎idpython/static_files/js/less.min.js‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)