From 5c859f9f749214d6af7fa17c47635d7aeb2a5e23 Mon Sep 17 00:00:00 2001 From: benweet Date: Wed, 4 Dec 2013 19:35:41 +0000 Subject: [PATCH] Added kbd tag style. Fixes #212 --- public/res/styles/base.less | 17 +++++++++++++++++ public/res/styles/main.less | 14 +++++++------- public/res/themes/night.less | 3 +++ public/res/themes/school.less | 13 ++++++------- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/public/res/styles/base.less b/public/res/styles/base.less index 4b054304..a32a1508 100644 --- a/public/res/styles/base.less +++ b/public/res/styles/base.less @@ -4,6 +4,9 @@ @import (less) "../libs/fontello/css/fontello.css"; @text-color: #000; +@kbd-color: #333; +@kbd-bg-color: #FFF; +@kbd-border-color: fade(@text-color, 25%); @blockquote-border-color: #eee; @blockquote-bg: #f8f8f8; @title-base-size: 14px; @@ -187,6 +190,20 @@ ul,ol { } } +kbd { + padding: 0.1em 0.6em; + border: 1px solid @kbd-border-color; + .box-shadow(0 1px 0px @kbd-border-color); + font-size: 11px; + font-family: Arial, Helvetica, sans-serif; + background-color: @kbd-bg-color; + color: @kbd-color; + border-radius: 3px; + display: inline-block; + margin: 0 0.1em; + white-space: nowrap; +} + .toc ul { list-style-type: none; margin-bottom: 5px; diff --git a/public/res/styles/main.less b/public/res/styles/main.less index 4cbbe49a..8df456a7 100644 --- a/public/res/styles/main.less +++ b/public/res/styles/main.less @@ -36,9 +36,9 @@ // Editor @tertiary-bg: #fff; -@tertiary-color: @primary-desaturated; +@tertiary-color: @secondary-desaturated; @tertiary-color-dark: darken(@tertiary-color, 5%); -@tertiary-color-darker: darken(@tertiary-color, 15%); +@tertiary-color-darker: darken(@tertiary-color, 20%); @tertiary-color-darkest: darken(@tertiary-color, 40%); // Panel buttons @@ -1001,7 +1001,7 @@ a { } .ace_markup.ace_list { - color: @tertiary-color-darkest; + color: @tertiary-color-darker; } .ace_constant.ace_language { @@ -1009,7 +1009,7 @@ a { } .ace_meta.ace_tag { - color: @tertiary-color-darkest; + color: @tertiary-color-darker; font-style: italic; font-weight: bold; background-color: @code-bg; @@ -1021,13 +1021,13 @@ a { } .ace_keyword { - color: @tertiary-color-darkest; + color: @tertiary-color-darker; background-color: @code-bg; font-weight: bold; } .ace_string { - color: @tertiary-color-darkest; + color: @tertiary-color-darker; font-style: italic; background-color: @code-bg; } @@ -1051,7 +1051,7 @@ a { } .ace_code { - color: @tertiary-color-darkest; + color: @tertiary-color-darker; background-color: @code-bg; } diff --git a/public/res/themes/night.less b/public/res/themes/night.less index e4820a4f..c76082fd 100644 --- a/public/res/themes/night.less +++ b/public/res/themes/night.less @@ -26,6 +26,9 @@ @modal-backdrop-bg: #444; @dropdown-border: @primary-bg; +@kbd-bg-color: @pre-bg; +@kbd-border-color: fade(@text-color, 40%); + .form-control:focus { .box-shadow(~"inset 0 1px 1px rgba(255, 255, 255, 0), 0 0 12px rgba(255, 255, 255, 1)"); } diff --git a/public/res/themes/school.less b/public/res/themes/school.less index 6ddf187e..d30931b0 100644 --- a/public/res/themes/school.less +++ b/public/res/themes/school.less @@ -6,8 +6,7 @@ @black-ink: #444; @red-ink: #B56E85; @green-ink: #6c9c7f; -@navbar-default-bg: @board-color; -@bg-navbar-hover: darken(@board-color, 4%); +@navbar-default-bg: darken(@board-color, 4%); @primary: desaturate(darken(@board-border-color, 20%), 20%); @primary-color: lighten(@blue-ink, 30%); @secondary-color: lighten(@blue-ink, 20%); @@ -17,13 +16,13 @@ @primary-desaturated: @primary; @secondary-desaturated: darken(@board-border-color, 19%); @tertiary-desaturated: @tertiary; -@primary-border-color: darken(@primary, 5%); +@primary-border-color: @navbar-default-bg; @modal-backdrop-bg: @primary; @btn-success-color: #eee; @btn-success-bg: @transparent; @btn-success-border: @transparent; -@btn-success-hover-bg: lighten(@bg-navbar-hover, 15%); -@panel-button-bg-color: #ccc; +@btn-success-hover-bg: lighten(@navbar-default-bg, 10%); +@panel-button-bg-color: #ddd; // Navbar buttons @@ -33,12 +32,12 @@ &:active, .open &.dropdown-toggle { color: @btn-success-color; - border-color: lighten(@bg-navbar-hover, 20%); + border-color: lighten(@navbar-default-bg, 10%); } } .navbar .dropdown-menu { - background-color: lighten(@bg-navbar-hover, 7.5%); + background-color: lighten(@navbar-default-bg, 5%); border-color: @primary-border-color; }