Subscription button and notice message styles

James Peret 10 年之前
父節點
當前提交
8986e0190b
共有 4 個文件被更改,包括 164 次插入50 次删除
  1. 9 4
      app/assets/javascripts/start.js
  2. 102 45
      app/assets/stylesheets/avl2_theme/buttons.less
  3. 二進制
      dump.rdb
  4. 53 1
      public/styleguide.html

+ 9 - 4
app/assets/javascripts/start.js

@@ -78,18 +78,23 @@ function attachHandler(jQuery) {
78 78
 			   $('.subscribe-alert').remove();
79 79
 			   switch(data.status) {
80 80
 			       case 'success':
81
-					 msg = '<div class="alert alert-success subscribe-alert"><h4>' + data.success + '</h4></div>';
81
+					 msg = '<div class="alert alert-success subscribe-alert">' + data.success + '</div>';
82 82
 					 $('.new_subscription').html(msg); 
83 83
 			           break;
84 84
 			       case 'error':
85
-					 msg = '<div class="alert alert-error subscribe-alert"><h4>' + data.failure + '</h4></div>';
85
+					 msg = '<div class="alert alert-error subscribe-alert">' + data.failure + '</div>';
86 86
 					 $('.new_subscription').html(msg); 
87 87
 			           break;
88 88
 		       	  case 'invalid':
89
-					  msg = '<div class="alert alert-block subscribe-alert"><h4>' + data.invalid + '</h4></div>';
89
+					  msg = '<div class="alert alert-block subscribe-alert">' + data.invalid + '</div>';
90 90
 					  $('.new_subscription').prepend(msg);
91 91
 		           	 break;
92
-			   }      
92
+			   }
93
+			   
94
+			   $(".subscribe-alert").bind('click', function() {
95
+				$(".subscribe-alert").fadeOut();
96
+			   });
97
+			   setTimeout(function () {$(".subscribe-alert").fadeOut();}, 4000);    
93 98
 		   }
94 99
 	    });
95 100
 	    return false;

+ 102 - 45
app/assets/stylesheets/avl2_theme/buttons.less

@@ -2,36 +2,7 @@
2 2
 
3 3
 @import "colors.less";
4 4
 
5
-.btn.btn-primary {
6
-	color: @blue;
7
-	border-color: @blue;
8
-}
9
-.btn.btn-primary:hover { background-color: fade(@blue, 25%); }
10
-.btn.btn-link.btn-primary:hover { background-color: transparent; text-decoration: underline; }
11
-
12
-.btn.btn-success {
13
-	color: @green;
14
-	border-color: @green;
15
-}
16
-.btn.btn-success:hover { background-color: fade(@green, 25%); }
17
-.btn.btn-link.btn-success:hover { background-color: transparent; text-decoration: underline; }
18
-
19
-.btn.btn-danger {
20
-	color: @red;
21
-	border-color: @red;
22
-}
23
-.btn.btn-danger:hover { background-color: fade(@red, 25%); }
24
-.btn.btn-link.btn-danger:hover { background-color: transparent; text-decoration: underline; }
25
-
26
-.btn.btn-alert {
27
-	color: @yellow;
28
-	border-color: @yellow;
29
-}
30
-.btn.btn-alert:hover { background-color: fade(@yellow, 25%); }
31
-.btn.btn-link.btn-alert:hover { background-color: transparent; text-decoration: underline; }
32
-
33
-
34
-
5
+// Sizes -------------------------------------------------------------------------------------------
35 6
 .btn {
36 7
 	display: inline-block;
37 8
 	padding: 4px 12px;
@@ -94,44 +65,130 @@
94 65
 	background-color: transparent;
95 66
 }
96 67
 
68
+// Colors
69
+
70
+.btn.btn-primary {
71
+	color: @blue;
72
+	border-color: @blue;
73
+}
74
+.btn.btn-primary:hover { background-color: fade(@blue, 25%); }
75
+.btn.btn-link.btn-primary:hover { background-color: transparent; text-decoration: underline; }
76
+
77
+.btn.btn-success {
78
+	color: @green;
79
+	border-color: @green;
80
+}
81
+.btn.btn-success:hover { background-color: fade(@green, 25%); }
82
+.btn.btn-link.btn-success:hover { background-color: transparent; text-decoration: underline; }
83
+
84
+.btn.btn-danger {
85
+	color: @red;
86
+	border-color: @red;
87
+}
88
+.btn.btn-danger:hover { background-color: fade(@red, 25%); }
89
+.btn.btn-link.btn-danger:hover { background-color: transparent; text-decoration: underline; }
90
+
91
+.btn.btn-alert {
92
+	color: @yellow;
93
+	border-color: @yellow;
94
+}
95
+.btn.btn-alert:hover { background-color: fade(@yellow, 25%); }
96
+.btn.btn-link.btn-alert:hover { background-color: transparent; text-decoration: underline; }
97
+
97 98
 
98
-// btn inverse
99
+// btn inverse -------------------------------------------------------------------------------------------
100
+
101
+// a btn inverse
102
+.btn.inverse { border-color: @white; color: @white;}
103
+.btn.inverse:hover { background-color: @white; color: @black;}
104
+.btn.btn-primary.inverse { border-color: @blue; color: @blue;}
105
+.btn.btn-primary.inverse:hover { background-color: @blue; color: @black;}
106
+.btn.btn-success.inverse { border-color: @green; color: @green;}
107
+.btn.btn-success.inverse:hover { background-color: @green; color: @black;}
108
+.btn.btn-danger.inverse { border-color: @red; color: @red;}
109
+.btn.btn-danger.inverse:hover { background-color: @red; color: @black;}
110
+.btn.btn-alert.inverse:hover { background-color: @yellow; color: @black;}
111
+.btn.btn-alert.inverse { border-color: @yellow; color: @yellow;}
112
+
113
+// button inverse
99 114
 button.btn.inverse, input[type="submit"].btn.inverse {
100 115
 	border: 2px solid @white;
101 116
 	color: @white;
102 117
 }
103 118
 
104
-// btn inverse hover
119
+// button inverse hover
105 120
 button.btn.inverse:hover, input[type="submit"].btn.inverse:hover {
106 121
 	background-color: @white;
107 122
 	border: 2px solid @light-gray;
108 123
 	color: @black;
109 124
 }
110 125
 
111
-// btn link inverse
112
-a.btn.btn-link.inverse {
113
-	color: @white;
126
+// button inverse primary
127
+button.btn.btn-primary.inverse, input[type="submit"].btn.btn-primary.inverse {
128
+	color: @blue;
129
+	border: 2px solid @blue;
114 130
 }
115 131
 
116
-// btn link inverse hover
117
-a.btn.btn-link.inverse:hover {
118
-	color: @white;
119
-	text-decoration: underline;
132
+// button inverse primary hover
133
+button.btn.btn-primary.inverse:hover, input[type="submit"].btn.btn-primary.inverse:hover {
134
+	background-color: @blue;
135
+	color: @black;
136
+	border: 2px solid @blue;
120 137
 }
121 138
 
122
-// btn inverse sucess
139
+// button inverse sucess
123 140
 button.btn.btn-success.inverse, input[type="submit"].btn.btn-success.inverse {
124
-	background-color: lighten(@green, 20%);
125
-	color: @black;
141
+	color: @green;
142
+	border: 2px solid @green;
126 143
 }
127 144
 
128
-// btn inverse sucess hover
145
+// button inverse sucess hover
129 146
 button.btn.btn-success.inverse:hover, input[type="submit"].btn.btn-success.inverse:hover {
130 147
 	background-color: @green;
131 148
 	color: @black;
132
-	border: 2px solid darken(@green, 20%);
149
+	border: 2px solid @green;
133 150
 }
134 151
 
152
+// button inverse danger
153
+button.btn.btn-danger.inverse, input[type="submit"].btn.btn-danger.inverse {
154
+	color: @red;
155
+	border: 2px solid @red;
156
+}
157
+
158
+// button inverse danger hover
159
+button.btn.btn-danger.inverse:hover, input[type="submit"].btn.btn-danger.inverse:hover {
160
+	background-color: @red;
161
+	color: @black;
162
+	border: 2px solid @red;
163
+}
164
+
165
+// button inverse alert
166
+button.btn.btn-alert.inverse, input[type="submit"].btn.btn-alert.inverse {
167
+	color: @yellow;
168
+	border: 2px solid @yellow;
169
+}
170
+
171
+// button inverse alert hover
172
+button.btn.btn-alert.inverse:hover, input[type="submit"].btn.btn-alert.inverse:hover {
173
+	background-color: @yellow;
174
+	color: @black;
175
+	border: 2px solid @yellow;
176
+}
177
+
178
+// btn link inverse
179
+a.btn.btn-link.inverse {
180
+	color: @white;
181
+}
182
+
183
+// btn link inverse hover
184
+a.btn.btn-link.inverse:hover {
185
+	color: @white;
186
+	text-decoration: underline;
187
+	border: none;
188
+	background-color: transparent;
189
+}
190
+
191
+
135 192
 .validation_dropdown a {
136 193
 	color: @black;
137 194
 }
@@ -144,7 +201,7 @@ button.btn.btn-success.inverse:hover, input[type="submit"].btn.btn-success.inver
144 201
 .nav.btn a:hover { background: rgba(0, 0, 0, 0); }
145 202
 .nav.btn a:visited { background: rgba(0, 0, 0, 0); }
146 203
 
147
-// Hacks
204
+// Hacks -------------------------------------------------------------------------------------------
148 205
 
149 206
 // Accordion with dropdown menu fix
150 207
 .overflow { overflow:visible; }

二進制
dump.rdb


+ 53 - 1
public/styleguide.html

@@ -108,7 +108,7 @@
108 108
 <body>
109 109
 
110 110
 <div class="container top-container">
111
-	<div class="row">
111
+	<div class="row" style="margin-bottom: 55px;">
112 112
 		<div class="span12">
113 113
 			<div class="centered">
114 114
 				<h3>Buttons</h3>
@@ -150,6 +150,58 @@
150 150
 			</div>
151 151
 		</div>
152 152
 	</div>
153
+</div>
154
+<div style="background-color: #3C3F47;">
155
+	<div class="container">
156
+		<div class="row" style="margin-top: 55px; margin-bottom: 55px;">
157
+			<div class="span12">
158
+				<div class="centered">
159
+					<h3 style="color: white;">Buttons Inverse</h3>
160
+				</div>
161
+				<div class="centered" style="margin-top: 25px;">
162
+					<a href="#" class="btn inverse btn-small">Default</a>
163
+					<a href="#" class="btn inverse btn-small btn-primary">Primary</a>
164
+					<a href="#" class="btn inverse btn-small btn-success">Success</a>
165
+					<a href="#" class="btn inverse btn-small btn-danger">Danger</a>
166
+					<a href="#" class="btn inverse btn-small btn-alert">Alert</a>
167
+				</div>
168
+				<div class="centered" style="margin-top: 25px;">
169
+					<a href="#" class="btn inverse">Default</a>
170
+					<a href="#" class="btn inverse btn-primary">Primary</a>
171
+					<a href="#" class="btn inverse btn-success">Success</a>
172
+					<a href="#" class="btn inverse btn-danger">Danger</a>
173
+					<a href="#" class="btn inverse btn-alert">Alert</a>
174
+				</div>
175
+
176
+				<div class="centered" style="margin-top: 25px;">
177
+					<a href="#" class="btn inverse btn-large">Default</a>
178
+					<a href="#" class="btn inverse btn-large btn-primary">Primary</a>
179
+					<a href="#" class="btn inverse btn-large btn-success">Success</a>
180
+					<a href="#" class="btn inverse btn-large btn-danger">Danger</a>
181
+					<a href="#" class="btn inverse btn-large btn-alert">Alert</a>
182
+				</div>
183
+				<div class="centered" style="margin-top: 25px;">
184
+					<a href="#" class="btn inverse btn-huge">Default</a>
185
+					<a href="#" class="btn inverse btn-huge btn-primary">Primary</a>
186
+					<a href="#" class="btn inverse btn-huge btn-success">Success</a><br>
187
+					<a href="#" class="btn inverse btn-huge btn-danger">Danger</a>
188
+					<a href="#" class="btn inverse btn-huge btn-alert">Alert</a>
189
+				</div>
190
+				<div class="centered" style="margin-top: 25px;">
191
+					<a href="#" class="btn inverse btn-link">Default</a>
192
+				</div>
193
+				<div class="centered" style="margin-top: 25px;">
194
+					<button class="btn inverse" type="button">Default Button</button>
195
+					<button class="btn inverse btn-primary" type="button">Primary Button</button>
196
+					<button class="btn inverse btn-success" type="button">Success Button</button>
197
+					<button class="btn inverse btn-danger" type="button">Danger Button</button>
198
+					<button class="btn inverse btn-alert" type="button">Alert Button</button>
199
+				</div>
200
+			</div>
201
+		</div>
202
+	</div>
203
+</div>
204
+<div class="container">
153 205
 	<div class="row" style="margin-top: 55px;" >
154 206
 		<div class="span12">
155 207
 			<div class="centered" ><h3>Mission Status</h3></div>