Sync again with latest foundation after bugfix and fix demo_both

This commit is contained in:
2014-09-16 17:11:33 +02:00
parent 04adfbcd66
commit 069ade32df
6 changed files with 15 additions and 135 deletions
-41
View File
@@ -1,41 +0,0 @@
=placeholder($color: $input-placeholder)
\:-moz-placeholder
color: $color
\::-webkit-input-placeholder
color: $color
=controls($color)
& > label,
.help-block,
.help-inline
color: $color
input, select, textarea
//color: lighten($color, 20%);
color: $color
border-color: $color
input:focus,
select:focus,
textarea:focus
border-color: $color
+box-shadow(0 0 6px $color)
=inset-panel-dark
+box-shadow(rgba(white, 0.1) 0 1px 0, rgba(black, 0.8) 0 1px 7px 0px inset)
background: darken(#2f2f2f, 6)
background-color: rgba(black, 0.3)
=horizontal-rule-dark
+box-shadow(rgba(white, 0.07) 0 1px 0)
border-bottom: 1px solid #121212
=horizontal-rule-top-dark
+box-shadow(rgba(white, 0.07) 0 1px 0 inset)
border-top: 1px solid #121212
=vertical-rule-dark
+box-shadow(rgba(white, 0.07) 1px 0 0)
border-right: 1px solid #121212
=vertical-rule-left-dark
+box-shadow(rgba(white, 0.07) 1px 0 0 inset)
border-left: 1px solid #121212
+8 -8
View File
@@ -8,29 +8,29 @@ body
position: absolute
top: 60px
left: 20px
width: 353px
height: 693px
width: 395px
height: 775px
background-image: image-url('frames/smartphone.png')
background-repeat: no-repeat
.phone-content-frame
position: absolute
left: 40px
left: 38px
top: 182px
height: 482px
width: 310px
height: 550px
width: 360px
.tablet-wrapper
position: absolute
top: 60px
left: 393px
left: 443px
width: 1002px
height: 670px
background-image: image-url('frames/tablet.png')
background-repeat: no-repeat
.tablet-content-frame
position: absolute
left: 433px
left: 493px
top: 100px
width: 880px
height: 590px