diff --git a/new-racket-web/sass/_base.scss b/new-racket-web/sass/_base.scss index 8b707de6df..0526bb8e7e 100644 --- a/new-racket-web/sass/_base.scss +++ b/new-racket-web/sass/_base.scss @@ -42,11 +42,22 @@ html, body { .fixed { position: fixed; + &.pinned { + position: absolute; + } @include respond(portrait-tablets) { position: relative !important; + top: auto !important; + left: auto !important; } } +.unfixed { + position: relative !important; + top: auto !important; + left: auto !important; +} + .text-center { text-align: center; } diff --git a/new-racket-web/sass/_custom.scss b/new-racket-web/sass/_custom.scss index 9548b6c609..0d5d753451 100644 --- a/new-racket-web/sass/_custom.scss +++ b/new-racket-web/sass/_custom.scss @@ -1 +1,3 @@ // Your custom SCSS should be written here... + + diff --git a/new-racket-web/sass/_fonts.scss b/new-racket-web/sass/_fonts.scss index 357c3abc4c..c4f72b5829 100644 --- a/new-racket-web/sass/_fonts.scss +++ b/new-racket-web/sass/_fonts.scss @@ -1,8 +1,7 @@ /* Fonts */ // Import Google Web Fonts -@import url(//fonts.googleapis.com/css?family=Open+Sans:500,400,300,600,700); -@import url(//fonts.googleapis.com/css?family=Inconsolata); +@import url(//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700); // Set local icon font diff --git a/new-racket-web/sass/_grid.scss b/new-racket-web/sass/_grid.scss index b1b487d6bd..2db88ed164 100755 --- a/new-racket-web/sass/_grid.scss +++ b/new-racket-web/sass/_grid.scss @@ -240,7 +240,7 @@ img { } } .centered { - margin:0 !important; + margin-left: 0 !important; } } .column, .columns { diff --git a/new-racket-web/sass/functions/_responsivity.scss b/new-racket-web/sass/functions/_responsivity.scss index b36777add7..7aab35dfa9 100644 --- a/new-racket-web/sass/functions/_responsivity.scss +++ b/new-racket-web/sass/functions/_responsivity.scss @@ -16,6 +16,9 @@ @else if $media == tablets { @media only screen and (min-width: $tablet-device-width) and (max-width: $document-width - 1) { @content; } } + @else if $media == desktop { + @media only screen and (min-width: $tablet-device-width) { @content; } + } @else if $media == document-width { @media only screen and (max-width: $document-width + 20) { @content; } } diff --git a/new-racket-web/sass/functions/_semantic-grid.scss b/new-racket-web/sass/functions/_semantic-grid.scss index aa00b1753a..ae3f2f9d15 100644 --- a/new-racket-web/sass/functions/_semantic-grid.scss +++ b/new-racket-web/sass/functions/_semantic-grid.scss @@ -45,10 +45,11 @@ @mixin column($columns:$columns, $alignment: false, $behavior: false) { @if $alignment == center { - float: none; - margin: 0 auto !important; - width: columns($columns); @extend %columnconfig; + float: none; + margin-left: auto !important; + margin-right: auto !important; + width: columns($columns); @include respond(all-phones) { float: left; margin-left: 0; @@ -56,17 +57,17 @@ } } @else if $behavior == collapse { - width: columns($columns); @extend %columnconfig; @extend %collapse; + width: columns($columns); @include respond(all-phones) { float: left; width: 100%; } } @else { - width: columns($columns); @extend %columnconfig; + width: columns($columns); @include respond(all-phones) { float: left; margin-left: 0; @@ -77,10 +78,11 @@ @mixin hybrid($columns:$columns, $alignment: false, $behavior: false) { @if $alignment == center { - float: none; - margin: 0 auto !important; - width: columns($columns, true); @extend %columnconfig; + float: none; + margin-left: auto !important; + margin-right: auto !important; + width: columns($columns, true); @include respond(all-phones) { float: left; margin-left: 0; @@ -88,17 +90,17 @@ } } @else if $behavior == collapse { - width: columns($columns, true); @extend %columnconfig; @extend %collapse; + width: columns($columns, true); @include respond(all-phones) { float: left; width: 100%; } } @else { - width: columns($columns, true); @extend %columnconfig; + width: columns($columns, true); @include respond(all-phones) { float: left; margin-left: 0; diff --git a/new-racket-web/sass/ui/_all.scss b/new-racket-web/sass/ui/_all.scss index 8ba4d01c19..b05ce34cbe 100644 --- a/new-racket-web/sass/ui/_all.scss +++ b/new-racket-web/sass/ui/_all.scss @@ -7,3 +7,4 @@ @import "images"; @import "video"; @import "toggles"; +@import "tables"; diff --git a/new-racket-web/sass/ui/_forms.scss b/new-racket-web/sass/ui/_forms.scss index ce508b5ba8..79f822661e 100644 --- a/new-racket-web/sass/ui/_forms.scss +++ b/new-racket-web/sass/ui/_forms.scss @@ -3,7 +3,7 @@ @import "../functions/forms"; -form { +form { margin: 0 0 18px; label { display: block; @@ -35,7 +35,7 @@ form { } } } - + .field { position: relative; max-width: 100%; @@ -205,6 +205,10 @@ form { @include border-radius(0px 4px 4px 0); } + &.append button, &.prepend button { + display: inline-block; + } + &.append input:first-child { margin-right: 0; } @@ -239,6 +243,10 @@ form { } } + &.no-icon:after { + display: none; + } + // does not allow :before & :after // pseudo elements. Removing validation // icons from those elements to avoid @@ -275,7 +283,7 @@ form { } } } - + .radio, & .checkbox { @each $error in danger $danger-color, warning $warning-color, success $success-color { &.#{nth($error, 1)} { @@ -316,14 +324,14 @@ form { line-height: 16px; } } - + .field .text input[type="search"] { -webkit-appearance: textfield; } - + /* Form Picker Element (