From efc176775c4ff986c6659c417f61d3ae42b64ae0 Mon Sep 17 00:00:00 2001 From: Geoff Kimball Date: Mon, 15 Sep 2014 15:58:45 -0700 Subject: [PATCH] Remove some unnecessary code and mixins in documentation, fixes #5680 --- doc/assets/scss/_global.scss | 24 ++++-------------------- doc/assets/scss/docs.scss | 9 +++------ 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/doc/assets/scss/_global.scss b/doc/assets/scss/_global.scss index 213efda78..aa333a356 100644 --- a/doc/assets/scss/_global.scss +++ b/doc/assets/scss/_global.scss @@ -26,31 +26,16 @@ $shadow-10: false ) { } -@mixin border-direction( - $direction: top, - $style: solid, - $width: 2px, - $color: darken($panel-bg-color, 1%)) { - border-#{$direction}: #{$style} #{$width} #{$color}; -} - -@mixin border( - $style:solid, - $width:2px, - $color:darken($panel-bg-color, 1%)) { - border: #{$style} #{$width} #{$color}; -} - // // @functions // -@function image-url($pth) { - @return unquote("url(../img/#{$pth})"); +@function image-url($path) { + @return unquote("url(../img/#{$path})"); } -@function font-url($pth) { - @return unquote("url(../fonts/#{$pth})"); +@function font-url($path) { + @return unquote("url(../fonts/#{$path})"); } // @@ -59,5 +44,4 @@ $body-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !important; $rem-base: 18; -// $topbar-arrows: false; // $text-direction: rtl; diff --git a/doc/assets/scss/docs.scss b/doc/assets/scss/docs.scss index 7581f137e..e8f5c39d9 100644 --- a/doc/assets/scss/docs.scss +++ b/doc/assets/scss/docs.scss @@ -147,9 +147,9 @@ table.plugin-options { // Modified Panel .easel { - @include panel($bg:$panel-bg-color); - @include border(solid, 1px, darken($panel-bg-color, 6%)); + @include panel($bg: $panel-bg-color); @include radius(); + border: 1px solid darken($panel-bg-color, 6%); } // 12 column grid mixin (would be cool to implement with mixins where possible) @@ -176,7 +176,7 @@ table.plugin-options { .options-bg { padding: 18px; background-color: darken($panel-bg-color, 0%); - @include border(solid, 1px, darken($panel-bg-color, 4%)); + border: 1px solid darken($panel-bg-color, 4%); border-radius: 4px; ul { margin-#{$default-float}: 20px; @@ -187,9 +187,6 @@ table.plugin-options { pre { margin-bottom: 15px; code { .code-container { - //@include border(solid, 1px, darken($panel-bg-color, 4%)); - //border-radius: 3px; - //background-color: darken($panel-bg-color, 2%); margin: 10px 0px; padding: 5px; overflow-x: auto; -- 2.47.3