Skip to content

Commit 5cb7bd9

Browse files
author
ono
committed
version 1.2
1 parent 84c66c4 commit 5cb7bd9

28 files changed

Lines changed: 169 additions & 8548 deletions

.gitmodules

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[submodule "assets/magic"]
2+
path = assets/magic
3+
url = https://github.com/miniMAC/magic.git
4+
[submodule "assets/gmaps"]
5+
path = assets/gmaps
6+
url = https://github.com/HPNeo/gmaps.git
7+
[submodule "assets/chosen"]
8+
path = assets/chosen
9+
url = https://github.com/harvesthq/chosen.git
10+
[submodule "assets/flot"]
11+
path = assets/flot
12+
url = https://github.com/flot/flot.git
13+
[submodule "assets/wysihtml5"]
14+
path = assets/wysihtml5
15+
url = https://github.com/jhollingworth/bootstrap-wysihtml5.git
16+
[submodule "assets/plupload"]
17+
path = assets/plupload
18+
url = https://github.com/moxiecode/plupload.git
19+
[submodule "assets/fuelux"]
20+
path = assets/fuelux
21+
url = https://github.com/ExactTarget/fuelux.git

assets/css/bootstrap-responsive.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap Responsive v2.3.1
2+
* Bootstrap Responsive v2.3.2
33
*
44
* Copyright 2012 Twitter, Inc
55
* Licensed under the Apache License v2.0

assets/css/bootstrap-responsive.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/bootstrap.css

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v2.3.1
2+
* Bootstrap v2.3.2
33
*
44
* Copyright 2012 Twitter, Inc
55
* Licensed under the Apache License v2.0
@@ -3009,6 +3009,15 @@ table th[class*="span"],
30093009
display: block;
30103010
}
30113011

3012+
.dropdown-backdrop {
3013+
position: fixed;
3014+
top: 0;
3015+
right: 0;
3016+
bottom: 0;
3017+
left: 0;
3018+
z-index: 990;
3019+
}
3020+
30123021
.pull-right > .dropdown-menu {
30133022
right: 0;
30143023
left: auto;

assets/css/bootstrap.min.css

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

assets/css/login.css

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,48 @@
11
body {
2-
background: url("../img/pattern/p27.png") repeat #444;
2+
padding-top: 40px;
3+
padding-bottom: 40px;
4+
background: url("../img/pattern/black_paper.png") repeat #444;
35
}
4-
.tac {
5-
text-align: center;
6+
7+
.form-signin {
8+
max-width: 330px;
9+
padding: 15px;
10+
margin: 0 auto;
11+
}
12+
.form-signin .form-signin-heading,
13+
.form-signin .checkbox {
14+
margin-bottom: 10px;
615
}
7-
.signin {
8-
margin: 50px auto 0;
16+
.form-signin .checkbox {
17+
font-weight: normal;
918
}
10-
11-
#logo {
12-
text-align: center;
19+
.form-signin input[type="text"],
20+
.form-signin input[type="password"],
21+
.form-signin input[type="email"] {
22+
position: relative;
23+
font-size: 16px;
24+
height: auto;
25+
padding: 10px;
26+
-webkit-box-sizing: border-box;
27+
-moz-box-sizing: border-box;
28+
box-sizing: border-box;
29+
}
30+
.form-signin input[type="text"]:focus,
31+
.form-signin input[type="password"]:focus,
32+
.form-signin input[type="email"]:focus {
33+
z-index: 2;
34+
}
35+
.form-signin input[type="text"] {
36+
margin-bottom: -1px;
37+
border-bottom-left-radius: 0;
38+
border-bottom-right-radius: 0;
39+
}
40+
.form-signin input[type="password"] {
1341
margin-bottom: 10px;
42+
border-top-left-radius: 0;
43+
border-top-right-radius: 0;
1444
}
15-
.signin {
16-
background: url("../img/pattern/p23.png") repeat;
17-
padding: 13px;
18-
border-radius: 4px;
45+
.form-signin input[type="email"] {
46+
margin-bottom: -1px;
47+
border-radius: 0;
1948
}

0 commit comments

Comments
 (0)