Permalink
Browse files

Merge branch 'master' of github.com:/malarkey/320andup

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 2ba4ebd + 8a81669 commit 3785b42274aa26bf11dbf780f9ab1570ac258a44 Andy Clarke committed Oct 31, 2012
View
@@ -4,5 +4,4 @@
/.dropbox
/Icon
.DS_Store
-
-*.espressostorage
+*.espressostorage
View
File renamed without changes.
View
@@ -14,6 +14,17 @@ View [the project website](http://stuffandnonsense.co.uk/projects/320andup/) for
+CSS Preprocessor Options
+------------------------
+
++ LESS
++ Sass
++ Sass + Compass
++ SCSS
++ SCSS + Compass
+
+
+
Authors
-------
@@ -23,7 +34,7 @@ Authors
+ http://github.com/malarkey
+ http://stuffandnonsense.co.uk
-**Jina Bolton**, Sass port
+**Jina Bolton**, Sass ports
+ http://twitter.com/jina
+ http://github.com/jina

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -11,7 +11,7 @@
// ALERT ====================================================
-// For more alert styles:
+// For more alert styles:
// http://twitter.github.com/bootstrap/components.html#alerts"
// https://github.com/twitter/bootstrap/blob/master/less/alerts.less"
@@ -106,7 +106,7 @@ color : @white; }
}
.badge-warning {
-background-color : @warningcolor;
+background-color : @warningcolor;
color : @white;
&:hover {
@@ -115,7 +115,7 @@ color : @white; }
}
.badge-success {
-background-color : @successcolor;
+background-color : @successcolor;
color : @white;
&:hover {
@@ -125,14 +125,14 @@ color : @white; }
.badge-info {
background-color : @infocolor;
-color : darken(@infocolor, 50%);
+color : darken(@infocolor, 50%);
&:hover {
background-color : darken(@infocolor, 20%); }
}
.badge-inverse {
-background-color : @inverscolor;
+background-color : @inverscolor;
color : @white;
&:hover {
@@ -174,7 +174,7 @@ margin-bottom : @baselineheight;
background-color : @wellbackground;
border : @wellborderwidth @wellborderstyle @wellbordercolor;
.rounded(4px);
-.box-shadow(inset 0 1px @wellshadowblur @wellshadow);
+.box-shadow(inset 0 1px @wellshadowblur @wellshadow);
p:last-child {
margin-bottom : 0; }
View
@@ -7,29 +7,31 @@
// ==========================================================
-/* Buttons ===================================================
+/* Buttons =================================================== */
.btn
display: inline-block
*display: inline
- /* IE7 inline-block hack
+ /* IE7 inline-block hack */
*zoom: 1
padding: 6px 11px 6px
margin-bottom: 0
- font-family: $basefont
+ font:
+ weight: bold
+ family: $basefont
+font-size(12)
- font-weight: bold
line-height: $baselineheight
color: $buttoncolor
text-align: center
vertical-align: middle
background-color: $buttonbackground
+greygrad
border: $buttonborderwidth $buttonborderstyle $buttonbordercolor
- border-bottom-color: $buttonbottombordercolor
+ bottom-color: $buttonbottombordercolor
+border-radius(4px)
cursor: pointer
*margin-left: .3em
+
&:visited,
&:hover
color: $buttoncolor
@@ -44,16 +46,29 @@ input[type="submit"].btn:hover
// disabled
.btn-disabled
- +opacity(0.5)
+ +opacity(.5)
cursor: default
+.btn-error
+ +errorgrad
+ border:
+ color: darken($errorcolor, 15%)
+ bottom-color: darken($errorcolor, 20%)
+ color: $white
+
+ &:visited,
+ &:hover
+ color: $white
+
// info
.btn-info
+infograd
- border-color: darken($infocolor, 15%)
- border-bottom-color: darken($infocolor, 20%)
+ border:
+ color: darken($infocolor, 15%)
+ bottom-color: darken($infocolor, 20%)
color: darken($infocolor, 50%)
+
&:visited,
&:hover
color: darken($infocolor, 50%)
@@ -62,9 +77,11 @@ input[type="submit"].btn:hover
.btn-inverse
+inversegrad
- border-color: darken($inverscolor, 15%)
- border-bottom-color: darken($inverscolor, 20%)
+ border:
+ color: darken($inverscolor, 15%)
+ bottom-color: darken($inverscolor, 20%)
color: $white
+
&:visited,
&:hover
color: $white
@@ -73,9 +90,11 @@ input[type="submit"].btn:hover
.btn-primary
+basegrad
- border-color: darken($basecolor, 15%)
- border-bottom-color: darken($basecolor, 20%)
+ border:
+ color: darken($basecolor, 15%)
+ bottom-color: darken($basecolor, 20%)
color: $white
+
&:visited,
&:hover
color: $white
@@ -84,15 +103,17 @@ input[type="submit"].btn:hover
.btn-success
+successgrad
- border-color: darken($successcolor, 15%)
- border-bottom-color: darken($successcolor, 20%)
+ border:
+ color: darken($successcolor, 15%)
+ bottom-color: darken($successcolor, 20%)
// warning
.btn-warning
+warninggrad
- border-color: darken($warningcolor, 15%)
- border-bottom-color: darken($warningcolor, 20%)
+ border:
+ color: darken($warningcolor, 15%)
+ bottom-color: darken($warningcolor, 20%)
// sizes
@@ -102,8 +123,9 @@ input[type="submit"].btn:hover
+border-radius(4px)
.btn.btn-large
- *padding-top: 7px
- *padding-bottom: 7px
+ *padding:
+ top: 7px
+ bottom: 7px
.btn-large
padding: 11px 22px
@@ -127,32 +149,37 @@ input[type="submit"].btn:hover
*margin-left: .3em
margin-bottom: $baseline
-.btn-group .btn
- position: relative
- float: left
- margin-left: -1px
- +border-radius(0)
+ .btn
+ position: relative
+ float: left
+ margin-left: -1px
+ +border-radius(0)
+
+ &:first-child
+ margin-left: 0
+ +border-left-radius(2px)
+
+
+ &:last-child
+ +border-right-radius(2px)
-.btn-group .btn:first-child
- margin-left: 0
- +border-left-radius(2px)
+ &.large
+ &:first-child
+ margin-left: 0
+ +border-left-radius(4px)
-.btn-group .btn:last-child
- +border-right-radius(2px)
-.btn-group .btn.large:first-child
- margin-left: 0
- +border-left-radius(4px)
+ &:last-child
+ +border-right-radius(4px)
-.btn-group .btn.large:last-child
- +border-right-radius(4px)
.btn-toolbar
clear: both
- margin-top: $baselineheight / 2
- margin-bottom: $baselineheight / 2
-
-.btn-toolbar .btn-group
- display: inline-block
- *display: inline
- *zoom: 1
+ margin:
+ top: $baselineheight / 2
+ bottom: $baselineheight / 2
+
+ .btn-group
+ display: inline-block
+ *display: inline
+ *zoom: 1
Oops, something went wrong.

0 comments on commit 3785b42

Please sign in to comment.