diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss index f3584285108..5c23f520689 100644 --- a/public/sass/base/_code.scss +++ b/public/sass/base/_code.scss @@ -23,7 +23,7 @@ code { code.code--small { font-size: $font-size-xs; - padding: 0.2rem; + padding: $space-xxs; margin: 0 2px; } diff --git a/public/sass/base/_reboot.scss b/public/sass/base/_reboot.scss index 3b05bff61bf..01052839504 100644 --- a/public/sass/base/_reboot.scss +++ b/public/sass/base/_reboot.scss @@ -106,7 +106,7 @@ h4, h5, h6 { margin-top: 0; - margin-bottom: 0.5rem; + margin-bottom: $space-sm; } // Reset margins on paragraphs @@ -115,7 +115,7 @@ h6 { // bottom margin to use `rem` units instead of `em`. p { margin-top: 0; - margin-bottom: 1rem; + margin-bottom: $space-md; } // Abbreviations and acronyms @@ -125,7 +125,7 @@ abbr[title] { } address { - margin-bottom: 1rem; + margin-bottom: $space-md; font-style: normal; line-height: inherit; } @@ -134,7 +134,7 @@ ol, ul, dl { margin-top: 0; - margin-bottom: 0rem; + margin-bottom: 0; } ol ol, @@ -149,12 +149,12 @@ dt { } dd { - margin-bottom: 0.5rem; + margin-bottom: $space-sm; margin-left: 0; // Undo browser default } blockquote { - margin: 0 0 1rem; + margin: 0 0 $space-md; } // @@ -183,7 +183,7 @@ pre { // Remove browser default top margin margin-top: 0; // Reset browser default of `1em` to use `rem`s - margin-bottom: 1rem; + margin-bottom: $space-md; } // @@ -193,7 +193,7 @@ pre { figure { // Normalize adds `margin` to `figure`s as browsers apply it inconsistently. // We reset that to create a better flow in-page. - margin: 0 0 1rem; + margin: 0 0 $space-md; } // @@ -314,8 +314,8 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 0.5rem; - font-size: 1.5rem; + margin-bottom: $space-sm; + font-size: $space-lg; line-height: inherit; // border: 0; } diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss index 58d4b1ab5d2..9861030abd9 100644 --- a/public/sass/components/_cards.scss +++ b/public/sass/components/_cards.scss @@ -62,13 +62,6 @@ font-size: 11px; padding: 2px 6px; } - - &--alert { - padding: 0.5rem 1rem; - .card-item-name a { - font-size: $font-size-h5; - } - } } .card-item-body { @@ -147,15 +140,10 @@ .card-item-figure { margin: 0 $space-md $space-md 0; - height: 6rem; + height: 80px; img { - width: 6rem; - } - .fa, - .icon-gf, - .gicon { - font-size: 3.5rem; + width: 80px; } } diff --git a/public/sass/components/_code_editor.scss b/public/sass/components/_code_editor.scss index 832449e31f1..9e04e9e4def 100644 --- a/public/sass/components/_code_editor.scss +++ b/public/sass/components/_code_editor.scss @@ -1,13 +1,13 @@ .gf-code-editor { - min-height: 2.6rem; - min-width: 20rem; + min-height: 36px; + min-width: 280px; flex-grow: 1; - margin-right: 0.25rem; + margin-right: $space-xs; &.ace_editor { @include font-family-monospace(); - font-size: 1rem; - min-height: 3.6rem; // Include space for horizontal scrollbar + font-size: $font-size-md; + min-height: 50px; // Include space for horizontal scrollbar @include border-radius($input-border-radius-sm); border: $border-width solid $input-border-color; @@ -20,7 +20,7 @@ .ace_editor.ace_autocomplete { @include font-family-monospace(); - font-size: 1rem; + font-size: $font-size-md; // Ace editor adds