From 9cbf10ea4fc3755908bfccf8e66471aae92dacae Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 15 Jul 2012 17:35:04 +0100 Subject: [PATCH] Removed custom link colour Annoyingly, it also affects the "btn-primary" colour --- core/styles/tiddlywiki.css | 48 +++++++++++++++++++------------------- cssbuild/tiddlywiki.less | 3 --- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/core/styles/tiddlywiki.css b/core/styles/tiddlywiki.css index 14979c750..17b294b74 100644 --- a/core/styles/tiddlywiki.css +++ b/core/styles/tiddlywiki.css @@ -174,12 +174,12 @@ body { } a { - color: #6d78ca; + color: #0088cc; text-decoration: none; } a:hover { - color: #3e4bac; + color: #005580; text-decoration: underline; } @@ -2456,7 +2456,7 @@ table .span24 { .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; - background-color: #6d78ca; + background-color: #0088cc; } .open { @@ -2743,18 +2743,18 @@ button.close { } .btn-primary { - background-color: #7274ca; - *background-color: #796dca; - background-image: -ms-linear-gradient(top, #6d78ca, #796dca); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#6d78ca), to(#796dca)); - background-image: -webkit-linear-gradient(top, #6d78ca, #796dca); - background-image: -o-linear-gradient(top, #6d78ca, #796dca); - background-image: -moz-linear-gradient(top, #6d78ca, #796dca); - background-image: linear-gradient(top, #6d78ca, #796dca); + background-color: #0074cc; + *background-color: #0055cc; + background-image: -ms-linear-gradient(top, #0088cc, #0055cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); + background-image: -o-linear-gradient(top, #0088cc, #0055cc); + background-image: -moz-linear-gradient(top, #0088cc, #0055cc); + background-image: linear-gradient(top, #0088cc, #0055cc); background-repeat: repeat-x; - border-color: #796dca #796dca #4d3eac; + border-color: #0055cc #0055cc #003580; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#6d78ca', endColorstr='#796dca', GradientType=0); + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2763,13 +2763,13 @@ button.close { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #796dca; - *background-color: #685ac3; + background-color: #0055cc; + *background-color: #004ab3; } .btn-primary:active, .btn-primary.active { - background-color: #5748bc \9; + background-color: #004099 \9; } .btn-warning { @@ -3087,7 +3087,7 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #796dca; + background-color: #0055cc; } .btn-group.open .btn-warning.dropdown-toggle { @@ -3264,7 +3264,7 @@ input[type="submit"].btn.btn-mini { .nav-list > .active > a:hover { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #6d78ca; + background-color: #0088cc; } .nav-list [class^="icon-"] { @@ -3356,7 +3356,7 @@ input[type="submit"].btn.btn-mini { .nav-pills > .active > a, .nav-pills > .active > a:hover { color: #ffffff; - background-color: #6d78ca; + background-color: #0088cc; } .nav-stacked > li { @@ -3418,14 +3418,14 @@ input[type="submit"].btn.btn-mini { .nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { margin-top: 6px; - border-top-color: #6d78ca; - border-bottom-color: #6d78ca; + border-top-color: #0088cc; + border-bottom-color: #0088cc; } .nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { - border-top-color: #3e4bac; - border-bottom-color: #3e4bac; + border-top-color: #005580; + border-bottom-color: #005580; } .nav-tabs .active .dropdown-toggle .caret, @@ -4498,7 +4498,7 @@ input[type="submit"].btn.btn-mini { } a.thumbnail:hover { - border-color: #6d78ca; + border-color: #0088cc; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); diff --git a/cssbuild/tiddlywiki.less b/cssbuild/tiddlywiki.less index 37263927e..d2b55526a 100644 --- a/cssbuild/tiddlywiki.less +++ b/cssbuild/tiddlywiki.less @@ -16,9 +16,6 @@ TiddlyWiki overrides of Bootstrap variables @baseFontSize: 14px; @baseLineHeight: 20px; -@linkColor: #6D78CA; -@linkColorHover: darken(@linkColor, 15%); - @navbarBackground: darken(@navbarBackgroundHighlight, 15%); @navbarBackgroundHighlight: @btnDangerBackgroundHighlight;