Permalink
Browse files

Removed Mobile Boilerplate conditional comments

Removed Mobile Boilerplate conditional comments that were causing a duplicate HTML tag.

Added error styles.
  • Loading branch information...
1 parent 93de411 commit 21c7d126350397ba0b7ece2c141bfa44ed6bd4aa Andy Clarke committed Jun 21, 2012
Showing with 56 additions and 21 deletions.
  1. +0 −4 320andup.html
  2. +37 −10 css/320andup.css
  3. +0 −4 index.html
  4. +13 −0 less/buttons.less
  5. +6 −3 less/texture.less
View
@@ -7,10 +7,6 @@
Apache License: v2.0. http://www.apache.org/licenses/LICENSE-2.0
-->
-<!-- HTML5 Mobile Boilerplate -->
-<!--[if IEMobile 7]><html class="no-js iem7"><![endif]-->
-<!--[if (gt IEMobile 7)|!(IEMobile)]><!--><html class="no-js" lang="en"><!--<![endif]-->
-
<!-- HTML5 Boilerplate -->
<!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if (IE 7)&!(IEMobile)]><html class="no-js lt-ie9 lt-ie8" lang="en"><![endif]-->
View
@@ -587,16 +587,6 @@ a:active {
background-color: #0e0e0e;
color: #ffffff;
}
-.greygrad {
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#d9d9d9));
- background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9);
- background-color: #d9d9d9;
- background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9);
- background-image: -ms-linear-gradient(top, #ffffff, #d9d9d9);
- background-image: -o-linear-gradient(top, #ffffff, #d9d9d9);
- background-image: linear-gradient(top, #ffffff, #d9d9d9);
- background-repeat: repeat-x;
-}
.basegrad {
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2d353e), to(#181c20));
background-image: -webkit-linear-gradient(top, #2d353e, #181c20);
@@ -607,6 +597,26 @@ a:active {
background-image: linear-gradient(top, #2d353e, #181c20);
background-repeat: repeat-x;
}
+.errorgrad {
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2d353e), to(#c72f29));
+ background-image: -webkit-linear-gradient(top, #2d353e, #c72f29);
+ background-color: #c72f29;
+ background-image: -moz-linear-gradient(top, #2d353e, #c72f29);
+ background-image: -ms-linear-gradient(top, #2d353e, #c72f29);
+ background-image: -o-linear-gradient(top, #2d353e, #c72f29);
+ background-image: linear-gradient(top, #2d353e, #c72f29);
+ background-repeat: repeat-x;
+}
+.greygrad {
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#d9d9d9));
+ background-image: -webkit-linear-gradient(top, #ffffff, #d9d9d9);
+ background-color: #d9d9d9;
+ background-image: -moz-linear-gradient(top, #ffffff, #d9d9d9);
+ background-image: -ms-linear-gradient(top, #ffffff, #d9d9d9);
+ background-image: -o-linear-gradient(top, #ffffff, #d9d9d9);
+ background-image: linear-gradient(top, #ffffff, #d9d9d9);
+ background-repeat: repeat-x;
+}
.infograd {
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d9edf7), to(#afd9ee));
background-image: -webkit-linear-gradient(top, #d9edf7, #afd9ee);
@@ -1561,6 +1571,23 @@ input[type="submit"].btn:hover {
opacity: 0.5;
cursor: default;
}
+.btn-error {
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2d353e), to(#c72f29));
+ background-image: -webkit-linear-gradient(top, #2d353e, #c72f29);
+ background-color: #c72f29;
+ background-image: -moz-linear-gradient(top, #2d353e, #c72f29);
+ background-image: -ms-linear-gradient(top, #2d353e, #c72f29);
+ background-image: -o-linear-gradient(top, #2d353e, #c72f29);
+ background-image: linear-gradient(top, #2d353e, #c72f29);
+ background-repeat: repeat-x;
+ border-color: #b22a24;
+ border-bottom-color: #9d2520;
+ color: #ffffff;
+}
+.btn-error:visited,
+.btn-error:hover {
+ color: #ffffff;
+}
.btn-info {
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d9edf7), to(#afd9ee));
background-image: -webkit-linear-gradient(top, #d9edf7, #afd9ee);
View
@@ -7,10 +7,6 @@
Apache License: v2.0. http://www.apache.org/licenses/LICENSE-2.0
-->
-<!-- HTML5 Mobile Boilerplate -->
-<!--[if IEMobile 7]><html class="no-js iem7"><![endif]-->
-<!--[if (gt IEMobile 7)|!(IEMobile)]><!--><html class="no-js" lang="en"><!--<![endif]-->
-
<!-- HTML5 Boilerplate -->
<!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if (IE 7)&!(IEMobile)]><html class="no-js lt-ie9 lt-ie8" lang="en"><![endif]-->
View
@@ -49,6 +49,19 @@ border-color : @buttonbordercolor; }
.opacity(.5);
cursor : default; }
+// error
+
+.btn-error {
+.errorgrad;
+border-color : darken(@errorcolor, 15%);
+border-bottom-color : darken(@errorcolor, 20%);
+color : @white;
+
+&:visited,
+&:hover {
+color : @white; }
+}
+
// info
.btn-info {
View
@@ -142,12 +142,15 @@ color : @white; }
// GRADIENTS ====================================================
-.greygrad {
-.vertical(@white, darken(@lightergrey, 5%)); }
-
.basegrad {
.vertical(@basecolor, darken(@basecolor, 10%)); }
+.errorgrad {
+.vertical(@basecolor, darken(@errorcolor, 10%)); }
+
+.greygrad {
+.vertical(@white, darken(@lightergrey, 5%)); }
+
.infograd {
.vertical(@infocolor, darken(@infocolor, 10%)); }

0 comments on commit 21c7d12

Please sign in to comment.