Commit 96dd7a29 authored by Mark Otto's avatar Mark Otto
Browse files

update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for...

update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement
parent 0a6d8c30
main cleanup-floating-forms cssvar-function dependabot/npm_and_yarn/stylelint-and-stylelint-config-twbs-bootstrap-15.3.0 extend-snippets feat/data-target floating-always-visible floating-labels-icons fod-main-banner form-controls-with-icons gh-pages gh-pages-530-alpha2 github/fork/719media/patch-13 github/fork/719media/patch-14 github/fork/719media/patch-9 github/fork/ChellyAhmed/fix-typo-reboot.md github/fork/ChellyAhmed/offcanvas-scroll-back github/fork/CtrlAltLilith/main github/fork/Elysiome/offcanvas-optional-window-resizing github/fork/JanSargsyan/main github/fork/LunicLynx/support-different-line-height-for-buttons github/fork/Psixodelik/main github/fork/Ronid1/ronid1/offcanvas_static_backdrop github/fork/RyanBerliner/tooltip-accessibility github/fork/SantiagoPVazquez/Feature-default-border-bottom-to-dropdown-item github/fork/Sir-Genius/utils github/fork/Sumit-Singh-8/main github/fork/Viktor-VERA2020/offcanvas-slide github/fork/Zivangu9/input-group-for-form-control-plaintext github/fork/alpadev/alpadev/call-dispose-on-component-reinstantiation github/fork/astagi/fix/tree-shake-modules github/fork/compnerd/dark-accordion-icon github/fork/derSascha/dropdown-dont-close-on-input-click github/fork/dev-ph1l/main github/fork/donquixote/issue-33861-utl-mixin github/fork/florianlacreuse/mixin-make-row-gutter-y github/fork/gregorw/main github/fork/iteggmbh/transitionend-dispose-race github/fork/jdelStrother/patch-1 github/fork/jonnysp/form-floating github/fork/jonnysp/independent-offcanvas github/fork/jonnysp/theme-dark-on-card-and-modal-fix github/fork/josefdlange/floating-label-placeholder-opacity github/fork/julien-deramond/enhance-change-version.js github/fork/julien-deramond/main-jd-fix-offset-content github/fork/julien-deramond/main-jd-issue-with-utitlies github/fork/julien-deramond/main-xmr-pa11y-ci-jd-add-hideElements github/fork/kyletsang/fix-tooltip-padding github/fork/lacutah/CheckboxCenteringDocumentation github/fork/lekoala/patch-3 github/fork/louismaximepiton/main-kld-lmp-collapse-proposal github/fork/louismaximepiton/main-lmp-card-inner-border-radius-fix github/fork/louismaximepiton/main-lmp-carousel-multiple-images github/fork/louismaximepiton/main-lmp-css-var-init github/fork/louismaximepiton/main-lmp-disabled-floating-label-fix github/fork/louismaximepiton/main-lmp-input-range-fix github/fork/louismaximepiton/main-lmp-shift-color github/fork/louismaximepiton/main-lmp-table-active-tr-fix github/fork/maciek-szn/switch github/fork/michael-roth/feature/19964-multiple-tab-targets github/fork/mistic100/dom-utils github/fork/nkdas91/accordion github/fork/nstungcom/fix-missing-modal-open-class github/fork/oraliahdz/animation-utilities github/fork/pine3ree/patch-7 github/fork/pouwerkerk/unindent-scss-docs-shortcode github/fork/smares/smares-no-scolling-on-modal-close github/fork/tgm-git/patch-1 gs-forms gs-toasts-with-animated-progress-bar gs/add-history-helper gs/change-version-dir-on-docs gs/data-must-set-onlu-one-instance gs/docs/fix-drop-down-error gs/event-handler-2 gs/make-docs-js-build gs/make-simple-attribute-toggler gs/popover-fix-doc gs/provide-steConfig-method gs/scrollspy-smoothscroll-option-use-browser-history gs/streamline-jqueryInterface gs/support-drop-down-in-navbar gs/test-js-generic-trigger gs/try-web-components gs/tweak-collapse-js-selector gs/use-event-handler-in-cocmponent gs/use-rollup-replace-for-version jo-docs-thanks-page jo-ssr-friendly logical-props-spacing-utils main-fod-disabled-form-check-label main-fod-nested-accordion main-fod-simpler-table-structure main-fod-table-separator main-fod-utilities-contrast main-jd-abbr-title main-jd-add-chips main-jd-add-doc-for-sass-custom-colors main-jd-add-enable-host-to-handle-web-components main-jd-browserstack-fine-tune main-jd-browserstack-updates main-jd-docs-consistent-usage-of-css-sections-step-2 main-jd-fix-docs-headers-in-white main-jd-fix-highlight-docs-border-radius main-jd-fix-placeholder-color-background-params-for-img-markup main-jd-glossary-experiment main-jd-postcss-drop-empty-css-vars main-jd-proto-doc-astro main-jd-skip-navigation-component main-jd-stackblitz-for-examples main-jd-upgrade-browserlistrc main-jd-use-host main-lmp-dark-theme-customization main-lmp-handle-scroll-target main-lmp-tab-fix main-mc-opensearch main-xmr-bundlewatch-action main-xmr-eslint-plugin-compat main-xmr-hugo-docs-vendor main-xmr-hugo-rm-ver main-xmr-linkinator-prod main-xmr-min-mangle main-xmr-pa11y-ci more-darkmode-examples nested-dropdowns patrickhlauke-issue37428 patrickhlauke-use-of-color-tweaks pr/34102 pr/37590 previous-next-docs-links sticky-thead utilities-functions-mixin v3-dev v4-dev v4-dev-dropdown-hide-method v530-dev v6-postcss-custom-media v6-spinner-dots v6/gs/use-floating-ui-in-place-of-popper xmr/dev xmr/docs-png xmr/docs-svgs xmr/hugo-reorg-files xmr/js-2 xmr/markdownlint xmr/prepare-530-alpha2 xmr/xo v5.3.0-alpha1 v5.2.3 v5.2.2 v5.2.1 v5.2.0 v5.2.0-beta1 v5.1.3 v5.1.2 v5.1.1 v5.1.0 v5.0.2 v5.0.1 v5.0.0 v5.0.0-beta3 v5.0.0-beta2 v5.0.0-beta1 v5.0.0-alpha3 v5.0.0-alpha2 v5.0.0-alpha1 v4.6.2 v4.6.1 v4.6.0 v4.5.3 v4.5.2 v4.5.1 v4.5.0 v4.4.1 v4.4.0 v4.3.1 v4.3.0 v4.2.1 v4.2.0 v4.1.3 v4.1.2 v4.1.1 v4.1.0 v4.0.0 v4.0.0-beta.3 v4.0.0-beta.2 v4.0.0-beta v4.0.0-alpha.6 v4.0.0-alpha.5 v4.0.0-alpha.4 v4.0.0-alpha.3 v4.0.0-alpha.2 v4.0.0-alpha v3.4.1 v3.4.0 v3.3.7 v3.3.6 v3.3.5 v3.3.4 v3.3.2 v3.3.1 v3.3.0 v3.2.0 v3.1.1 v3.1.0 v3.0.3 v3.0.2 v3.0.1 v3.0.0 v3.0.0-rc.2 v3.0.0-rc1 v2.3.2 v2.3.1 v2.3.0 v2.2.2 v2.2.1 v2.2.0 v2.1.1 v2.1.0 v2.0.4 v2.0.3 v2.0.2 v2.0.1 v2.0.0
21 merge requests!14752.0 wip,!1403warningText and warningBackground docs fix,!985Fix id anchor javascript,!906Twipsy now respects custom classes,!873Clicking a dropdown will always toggle it,!858Bordered Arrow Mixin - updated for 2.0,!832Fix thumbnails in Built With Bootstrap,!13512.0 wip - relative font sizes,!1315[2.0-wip] Fix mustache glob when building,!1268[wip-2.0] IE 7/8 Typehead JS fix,!12362.0 wip - Fix for issue #1202,!1219Removed dotted outline on navbar dropdown menu,!1210Missing icon class from examples,!1195Fixed display of secondary container,!1090Fixed typo,!1084Default `.border-radius-custom` values,!1064Typo Fix in tables.less,!10572.0 wip,!1052Missing data attribute to close modal,!10212.0 wip,!5432.0 wip
Showing with 164 additions and 148 deletions
+164 -148
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Sep 29 02:20:34 PDT 2011 * Date: Tue Oct 4 00:16:55 PDT 2011
*/ */
/* Reset.less /* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
...@@ -187,9 +187,8 @@ body { ...@@ -187,9 +187,8 @@ body {
margin: 0; margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal;
line-height: 18px; line-height: 18px;
color: #333333; color: #404040;
} }
.container { .container {
width: 940px; width: 940px;
...@@ -393,14 +392,14 @@ a:hover { ...@@ -393,14 +392,14 @@ a:hover {
* Headings, body text, lists, code, and more for a versatile and durable typography system * Headings, body text, lists, code, and more for a versatile and durable typography system
* ---------------------------------------------------------------------------------------- */ * ---------------------------------------------------------------------------------------- */
p { p {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal;
line-height: 18px; line-height: 18px;
margin-bottom: 9px; margin-bottom: 9px;
} }
p small { p small {
font-size: 11px; font-size: 11px;
color: #777777; color: #bfbfbf;
} }
h1, h1,
h2, h2,
...@@ -409,7 +408,7 @@ h4, ...@@ -409,7 +408,7 @@ h4,
h5, h5,
h6 { h6 {
font-weight: bold; font-weight: bold;
color: #333333; color: #404040;
} }
h1 small, h1 small,
h2 small, h2 small,
...@@ -417,7 +416,7 @@ h3 small, ...@@ -417,7 +416,7 @@ h3 small,
h4 small, h4 small,
h5 small, h5 small,
h6 small { h6 small {
color: #777777; color: #bfbfbf;
} }
h1 { h1 {
margin-bottom: 18px; margin-bottom: 18px;
...@@ -455,7 +454,7 @@ h5 { ...@@ -455,7 +454,7 @@ h5 {
h6 { h6 {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #777777; color: #bfbfbf;
text-transform: uppercase; text-transform: uppercase;
} }
ul, ol { ul, ol {
...@@ -475,7 +474,7 @@ ol { ...@@ -475,7 +474,7 @@ ol {
} }
li { li {
line-height: 18px; line-height: 18px;
color: #555555; color: #808080;
} }
ul.unstyled { ul.unstyled {
list-style: none; list-style: none;
...@@ -508,7 +507,7 @@ em { ...@@ -508,7 +507,7 @@ em {
line-height: inherit; line-height: inherit;
} }
.muted { .muted {
color: #777777; color: #bfbfbf;
} }
blockquote { blockquote {
margin-bottom: 18px; margin-bottom: 18px;
...@@ -526,7 +525,7 @@ blockquote small { ...@@ -526,7 +525,7 @@ blockquote small {
font-size: 12px; font-size: 12px;
font-weight: 300; font-weight: 300;
line-height: 18px; line-height: 18px;
color: #777777; color: #bfbfbf;
} }
blockquote small:before { blockquote small:before {
content: '\2014 \00A0'; content: '\2014 \00A0';
...@@ -538,7 +537,7 @@ address { ...@@ -538,7 +537,7 @@ address {
} }
code, pre { code, pre {
padding: 0 3px 2px; padding: 0 3px 2px;
font-family: Monaco, Andale Mono, Courier New, monospace; font-family: Menlo, Monaco, Andale Mono, Courier New, monospace;
font-size: 12px; font-size: 12px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
...@@ -577,7 +576,7 @@ legend { ...@@ -577,7 +576,7 @@ legend {
margin-bottom: 27px; margin-bottom: 27px;
font-size: 19.5px; font-size: 19.5px;
line-height: 36px; line-height: 36px;
color: #333333; color: #404040;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
label, label,
...@@ -592,7 +591,7 @@ textarea { ...@@ -592,7 +591,7 @@ textarea {
label { label {
display: block; display: block;
margin-bottom: 5px; margin-bottom: 5px;
color: #333333; color: #404040;
} }
input[type=checkbox], input[type=radio] { input[type=checkbox], input[type=radio] {
cursor: pointer; cursor: pointer;
...@@ -607,7 +606,7 @@ select, ...@@ -607,7 +606,7 @@ select,
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #555555; color: #808080;
border: 1px solid #ccc; border: 1px solid #ccc;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
...@@ -843,15 +842,15 @@ textarea[readonly] { ...@@ -843,15 +842,15 @@ textarea[readonly] {
cursor: not-allowed; cursor: not-allowed;
} }
:-moz-placeholder { :-moz-placeholder {
color: #777777; color: #bfbfbf;
} }
::-webkit-input-placeholder { ::-webkit-input-placeholder {
color: #777777; color: #bfbfbf;
} }
.help-text { .help-text {
margin-top: 5px; margin-top: 5px;
margin-bottom: 0; margin-bottom: 0;
color: #777777; color: #bfbfbf;
} }
.help-inline { .help-inline {
display: inline; display: inline;
...@@ -868,7 +867,7 @@ textarea[readonly] { ...@@ -868,7 +867,7 @@ textarea[readonly] {
max-width: 600px; max-width: 600px;
} }
.inline-inputs { .inline-inputs {
color: #555555; color: #808080;
} }
.inline-inputs span, .inline-inputs input { .inline-inputs span, .inline-inputs input {
display: inline-block; display: inline-block;
...@@ -901,7 +900,7 @@ textarea[readonly] { ...@@ -901,7 +900,7 @@ textarea[readonly] {
margin-right: -1px; margin-right: -1px;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
color: #777777; color: #bfbfbf;
text-align: center; text-align: center;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
-webkit-border-radius: 3px 0 0 3px; -webkit-border-radius: 3px 0 0 3px;
...@@ -1115,7 +1114,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1115,7 +1114,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
overflow: visible; overflow: visible;
} }
.topbar a { .topbar a {
color: #777777; color: #bfbfbf;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
} }
.topbar .brand a:hover, .topbar ul .active > a { .topbar .brand a:hover, .topbar ul .active > a {
...@@ -1178,20 +1177,20 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1178,20 +1177,20 @@ table .headerSortUp.purple, table .headerSortDown.purple {
transition: none; transition: none;
} }
.topbar input:-moz-placeholder { .topbar input:-moz-placeholder {
color: #cccccc; color: #e6e6e6;
} }
.topbar input::-webkit-input-placeholder { .topbar input::-webkit-input-placeholder {
color: #cccccc; color: #e6e6e6;
} }
.topbar input:hover { .topbar input:hover {
background-color: #777777; background-color: #bfbfbf;
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
color: #ffffff; color: #ffffff;
} }
.topbar input:focus, .topbar input.focused { .topbar input:focus, .topbar input.focused {
outline: 0; outline: 0;
background-color: #ffffff; background-color: #ffffff;
color: #333333; color: #404040;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
border: 0; border: 0;
padding: 5px 10px; padding: 5px 10px;
...@@ -1363,7 +1362,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1363,7 +1362,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
clear: both; clear: both;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
color: #555555; color: #808080;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
} }
.topbar .dropdown-menu a:hover, .dropdown-menu a:hover { .topbar .dropdown-menu a:hover, .dropdown-menu a:hover {
...@@ -1377,7 +1376,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1377,7 +1376,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
background-image: linear-gradient(top, #eeeeee, #dddddd); background-image: linear-gradient(top, #eeeeee, #dddddd);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);
color: #333333; color: #404040;
text-decoration: none; text-decoration: none;
-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
...@@ -1439,7 +1438,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1439,7 +1438,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
border-color: #eee #eee #ddd; border-color: #eee #eee #ddd;
} }
.tabs > li.active > a { .tabs > li.active > a {
color: #555555; color: #808080;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #ddd; border: 1px solid #ddd;
border-bottom-color: transparent; border-bottom-color: transparent;
...@@ -1518,10 +1517,10 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1518,10 +1517,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
} }
.breadcrumb .divider { .breadcrumb .divider {
padding: 0 5px; padding: 0 5px;
color: #777777; color: #bfbfbf;
} }
.breadcrumb .active a { .breadcrumb .active a {
color: #333333; color: #404040;
} }
.hero-unit { .hero-unit {
background-color: #f5f5f5; background-color: #f5f5f5;
...@@ -1806,7 +1805,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -1806,7 +1805,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
position: relative; position: relative;
padding: 7px 15px; padding: 7px 15px;
margin-bottom: 18px; margin-bottom: 18px;
color: #333333; color: #404040;
background-color: #eedc94; background-color: #eedc94;
background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
background-image: -moz-linear-gradient(top, #fceec1, #eedc94); background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
...@@ -1868,13 +1867,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -1868,13 +1867,13 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
margin-bottom: 0; margin-bottom: 0;
} }
.alert-message.block-message li { .alert-message.block-message li {
color: #333333; color: #404040;
} }
.alert-message.block-message .alert-actions { .alert-message.block-message .alert-actions {
margin-top: 5px; margin-top: 5px;
} }
.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { .alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info {
color: #333333; color: #404040;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
} }
.alert-message.block-message.error { .alert-message.block-message.error {
...@@ -1925,7 +1924,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -1925,7 +1924,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
} }
.pagination .disabled a, .pagination .disabled a:hover { .pagination .disabled a, .pagination .disabled a:hover {
background-color: transparent; background-color: transparent;
color: #777777; color: #bfbfbf;
} }
.pagination .next a { .pagination .next a {
border: 0; border: 0;
...@@ -2195,7 +2194,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2195,7 +2194,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
} }
.label { .label {
padding: 1px 3px 2px; padding: 1px 3px 2px;
background-color: #777777; background-color: #bfbfbf;
font-size: 9.75px; font-size: 9.75px;
font-weight: bold; font-weight: bold;
color: #ffffff; color: #ffffff;
......
This diff is collapsed.
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
// Make all forms have space below them // Make all forms have space below them
form { form {
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
} }
// Groups of fields with labels on top (legends) // Groups of fields with labels on top (legends)
legend { legend {
display: block; display: block;
width: 100%; width: 100%;
margin-bottom: @baseline * 1.5; margin-bottom: @baseLineHeight * 1.5;
font-size: @basefont * 1.5; font-size: @baseFontSize * 1.5;
line-height: @baseline * 2; line-height: @baseLineHeight * 2;
color: @grayDark; color: @grayDark;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
...@@ -27,7 +27,7 @@ label, ...@@ -27,7 +27,7 @@ label,
input, input,
select, select,
textarea { textarea {
#font > .sans-serif(normal,@basefont,@baseline); #font > .sans-serif(normal,@baseFontSize,@baseLineHeight);
} }
// Identify controls by their labels // Identify controls by their labels
...@@ -50,10 +50,10 @@ select, ...@@ -50,10 +50,10 @@ select,
.uneditable-input { .uneditable-input {
display: inline-block; display: inline-block;
width: 210px; width: 210px;
height: @baseline; height: @baseLineHeight;
padding: 4px; padding: 4px;
font-size: @basefont; font-size: @baseFontSize;
line-height: @baseline; line-height: @baseLineHeight;
color: @gray; color: @gray;
border: 1px solid #ccc; border: 1px solid #ccc;
.border-radius(3px); .border-radius(3px);
...@@ -90,8 +90,8 @@ input[type=submit] { ...@@ -90,8 +90,8 @@ input[type=submit] {
select, select,
input[type=file] { input[type=file] {
height: @baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size height: @baseLineHeight * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
line-height: @baseline * 1.5; line-height: @baseLineHeight * 1.5;
*margin-top: 4px; /* For IE7, add top margin to align select with labels */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */
} }
...@@ -200,7 +200,7 @@ textarea[readonly] { ...@@ -200,7 +200,7 @@ textarea[readonly] {
// Style the background of control-groups with errors // Style the background of control-groups with errors
.has-error { .has-error {
background: lighten(@red, 55%); background: lighten(@red, 55%);
padding: (@baseline / 2) 0; padding: (@baseLineHeight / 2) 0;
margin: -10px 0 10px; margin: -10px 0 10px;
.border-radius(4px); .border-radius(4px);
> label, > label,
...@@ -234,9 +234,9 @@ textarea[readonly] { ...@@ -234,9 +234,9 @@ textarea[readonly] {
// ------------ // ------------
.form-actions { .form-actions {
padding: (@baseline - 1) 20px @baseline; padding: (@baseLineHeight - 1) 20px @baseLineHeight;
margin-top: @baseline; margin-top: @baseLineHeight;
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
background-color: #f5f5f5; background-color: #f5f5f5;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
} }
...@@ -375,7 +375,7 @@ textarea[readonly] { ...@@ -375,7 +375,7 @@ textarea[readonly] {
// Margin to space out fieldsets // Margin to space out fieldsets
.control-group { .control-group {
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
} }
// Bold the labels so they stand out // Bold the labels so they stand out
......
...@@ -46,25 +46,25 @@ ...@@ -46,25 +46,25 @@
// Font Stacks // Font Stacks
#font { #font {
.shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) { .shorthand(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) {
font-size: @size; font-size: @size;
font-weight: @weight; font-weight: @weight;
line-height: @lineHeight; line-height: @lineHeight;
} }
.sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) { .sans-serif(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: @size; font-size: @size;
font-weight: @weight; font-weight: @weight;
line-height: @lineHeight; line-height: @lineHeight;
} }
.serif(@weight: normal, @size: 14px, @lineHeight: 20px) { .serif(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) {
font-family: "Georgia", Times New Roman, Times, serif; font-family: "Georgia", Times New Roman, Times, serif;
font-size: @size; font-size: @size;
font-weight: @weight; font-weight: @weight;
line-height: @lineHeight; line-height: @lineHeight;
} }
.monospace(@weight: normal, @size: 12px, @lineHeight: 20px) { .monospace(@weight: normal, @size: @baseFontSize, @lineHeight: @baseLineHeight) {
font-family: "Monaco", Courier New, monospace; font-family: Menlo, Monaco, Andale Mono, Courier New, monospace;
font-size: @size; font-size: @size;
font-weight: @weight; font-weight: @weight;
line-height: @lineHeight; line-height: @lineHeight;
......
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
> a { > a {
padding: 0 15px; padding: 0 15px;
margin-right: 2px; margin-right: 2px;
line-height: @baseline * 2; line-height: @baseLineHeight * 2;
border: 1px solid transparent; border: 1px solid transparent;
.border-radius(4px 4px 0 0); .border-radius(4px 4px 0 0);
&:hover { &:hover {
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
// ----------- // -----------
.breadcrumb { .breadcrumb {
margin: 0 0 @baseline; margin: 0 0 @baseLineHeight;
padding: 7px 14px; padding: 7px 14px;
#gradient > .vertical(#ffffff, #f5f5f5); #gradient > .vertical(#ffffff, #f5f5f5);
border: 1px solid #ddd; border: 1px solid #ddd;
...@@ -424,12 +424,12 @@ ...@@ -424,12 +424,12 @@
p { p {
font-size: 18px; font-size: 18px;
font-weight: 200; font-weight: 200;
line-height: @baseline * 1.5; line-height: @baseLineHeight * 1.5;
} }
} }
footer { footer {
margin-top: @baseline - 1; margin-top: @baseLineHeight - 1;
padding-top: @baseline - 1; padding-top: @baseLineHeight - 1;
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
...@@ -438,11 +438,11 @@ footer { ...@@ -438,11 +438,11 @@ footer {
// ------------ // ------------
.page-header { .page-header {
margin-bottom: @baseline - 1; margin-bottom: @baseLineHeight - 1;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
.box-shadow(0 1px 0 rgba(255,255,255,.5)); .box-shadow(0 1px 0 rgba(255,255,255,.5));
h1 { h1 {
margin-bottom: (@baseline / 2) - 1px; margin-bottom: (@baseLineHeight / 2) - 1px;
} }
} }
...@@ -488,7 +488,7 @@ footer { ...@@ -488,7 +488,7 @@ footer {
padding: 5px 14px 6px; padding: 5px 14px 6px;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
color: #333; color: #333;
font-size: @basefont; font-size: @baseFontSize;
line-height: normal; line-height: normal;
border: 1px solid #ccc; border: 1px solid #ccc;
border-bottom-color: #bbb; border-bottom-color: #bbb;
...@@ -540,14 +540,14 @@ footer { ...@@ -540,14 +540,14 @@ footer {
// Button Sizes // Button Sizes
&.large { &.large {
font-size: @basefont + 2px; font-size: @baseFontSize + 2px;
line-height: normal; line-height: normal;
padding: 9px 14px 9px; padding: 9px 14px 9px;
.border-radius(6px); .border-radius(6px);
} }
&.small { &.small {
padding: 7px 9px 7px; padding: 7px 9px 7px;
font-size: @basefont - 2px; font-size: @baseFontSize - 2px;
} }
} }
// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons // Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
...@@ -621,7 +621,7 @@ input[type=submit].btn { ...@@ -621,7 +621,7 @@ input[type=submit].btn {
color: @black; color: @black;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
line-height: @baseline * .75; line-height: @baseLineHeight * .75;
text-shadow: 0 1px 0 rgba(255,255,255,1); text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(20); .opacity(20);
&:hover { &:hover {
...@@ -639,7 +639,7 @@ input[type=submit].btn { ...@@ -639,7 +639,7 @@ input[type=submit].btn {
.alert-message { .alert-message {
position: relative; position: relative;
padding: 7px 15px; padding: 7px 15px;
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
color: @grayDark; color: @grayDark;
.gradientBar(#fceec1, #eedc94); // warning by default .gradientBar(#fceec1, #eedc94); // warning by default
text-shadow: 0 1px 0 rgba(255,255,255,.5); text-shadow: 0 1px 0 rgba(255,255,255,.5);
...@@ -655,7 +655,7 @@ input[type=submit].btn { ...@@ -655,7 +655,7 @@ input[type=submit].btn {
// Remove extra margin from content // Remove extra margin from content
h5 { h5 {
line-height: @baseline; line-height: @baseLineHeight;
} }
p { p {
margin-bottom: 0; margin-bottom: 0;
...@@ -715,8 +715,8 @@ input[type=submit].btn { ...@@ -715,8 +715,8 @@ input[type=submit].btn {
// ---------- // ----------
.pagination { .pagination {
height: @baseline * 2; height: @baseLineHeight * 2;
margin: @baseline 0; margin: @baseLineHeight 0;
ul { ul {
float: left; float: left;
margin: 0; margin: 0;
...@@ -731,7 +731,7 @@ input[type=submit].btn { ...@@ -731,7 +731,7 @@ input[type=submit].btn {
a { a {
float: left; float: left;
padding: 0 14px; padding: 0 14px;
line-height: (@baseline * 2) - 2; line-height: (@baseLineHeight * 2) - 2;
border-right: 1px solid; border-right: 1px solid;
border-right-color: #ddd; border-right-color: #ddd;
border-right-color: rgba(0,0,0,.15); border-right-color: rgba(0,0,0,.15);
...@@ -972,7 +972,7 @@ input[type=submit].btn { ...@@ -972,7 +972,7 @@ input[type=submit].btn {
.label { .label {
padding: 1px 3px 2px; padding: 1px 3px 2px;
background-color: @grayLight; background-color: @grayLight;
font-size: @basefont * .75; font-size: @baseFontSize * .75;
font-weight: bold; font-weight: bold;
color: @white; color: @white;
text-transform: uppercase; text-transform: uppercase;
......
...@@ -12,7 +12,9 @@ html, body { ...@@ -12,7 +12,9 @@ html, body {
} }
body { body {
margin: 0; margin: 0;
#font > .sans-serif(normal,@basefont,@baseline); font-family: @baseFontFamily;
font-size: @baseFontSize;
line-height: @baseLineHeight;
color: @grayDark; color: @grayDark;
} }
......
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
table { table {
width: 100%; width: 100%;
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
padding: 0; padding: 0;
border-collapse: separate; // Done so we can round those corners! border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapse; /* IE7, collapse table to remove spacing */ *border-collapse: collapse; /* IE7, collapse table to remove spacing */
font-size: @basefont; font-size: @baseFontSize;
border: 1px solid #ddd; border: 1px solid #ddd;
.border-radius(4px); .border-radius(4px);
th, td { th, td {
padding: 10px 10px 9px; padding: 10px 10px 9px;
line-height: @baseline; line-height: @baseLineHeight;
text-align: left; text-align: left;
} }
th { th {
......
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
// --------- // ---------
p { p {
#font > .shorthand(normal,@basefont,@baseline); font-family: @baseFontFamily;
margin-bottom: @baseline / 2; font-size: @baseFontSize;
line-height: @baseLineHeight;
margin-bottom: @baseLineHeight / 2;
small { small {
font-size: @basefont - 2; font-size: @baseFontSize - 2;
color: @grayLight; color: @grayLight;
} }
} }
...@@ -27,22 +29,22 @@ h1, h2, h3, h4, h5, h6 { ...@@ -27,22 +29,22 @@ h1, h2, h3, h4, h5, h6 {
} }
} }
h1 { h1 {
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
font-size: 30px; font-size: 30px;
line-height: @baseline * 2; line-height: @baseLineHeight * 2;
small { small {
font-size: 18px; font-size: 18px;
} }
} }
h2 { h2 {
font-size: 24px; font-size: 24px;
line-height: @baseline * 2; line-height: @baseLineHeight * 2;
small { small {
font-size: 14px; font-size: 14px;
} }
} }
h3 { h3 {
line-height: @baseline * 2; line-height: @baseLineHeight * 2;
font-size: 18px; font-size: 18px;
small { small {
font-size: 14px; font-size: 14px;
...@@ -50,18 +52,18 @@ h3 { ...@@ -50,18 +52,18 @@ h3 {
} }
h4 { h4 {
font-size: 16px; font-size: 16px;
line-height: @baseline * 2; line-height: @baseLineHeight * 2;
small { small {
font-size: 12px; font-size: 12px;
} }
} }
h5 { h5 {
font-size: 14px; font-size: 14px;
line-height: @baseline; line-height: @baseLineHeight;
} }
h6 { h6 {
font-size: 13px; font-size: 13px;
line-height: @baseline; line-height: @baseLineHeight;
color: @grayLight; color: @grayLight;
text-transform: uppercase; text-transform: uppercase;
} }
...@@ -72,7 +74,7 @@ h6 { ...@@ -72,7 +74,7 @@ h6 {
// Unordered and Ordered lists // Unordered and Ordered lists
ul, ol { ul, ol {
margin: 0 0 @baseline 25px; margin: 0 0 @baseLineHeight 25px;
} }
ul ul, ul ul,
ul ol, ul ol,
...@@ -87,7 +89,7 @@ ol { ...@@ -87,7 +89,7 @@ ol {
list-style: decimal; list-style: decimal;
} }
li { li {
line-height: @baseline; line-height: @baseLineHeight;
color: @gray; color: @gray;
} }
ul.unstyled { ul.unstyled {
...@@ -97,15 +99,15 @@ ul.unstyled { ...@@ -97,15 +99,15 @@ ul.unstyled {
// Description Lists // Description Lists
dl { dl {
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
dt, dd { dt, dd {
line-height: @baseline; line-height: @baseLineHeight;
} }
dt { dt {
font-weight: bold; font-weight: bold;
} }
dd { dd {
margin-left: @baseline / 2; margin-left: @baseLineHeight / 2;
} }
} }
...@@ -135,16 +137,16 @@ em { ...@@ -135,16 +137,16 @@ em {
// Blockquotes // Blockquotes
blockquote { blockquote {
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
border-left: 5px solid #eee; border-left: 5px solid #eee;
padding-left: 15px; padding-left: 15px;
p { p {
#font > .shorthand(300,14px,@baseline); #font > .shorthand(300,14px,@baseLineHeight);
margin-bottom: 0; margin-bottom: 0;
} }
small { small {
display: block; display: block;
#font > .shorthand(300,12px,@baseline); #font > .shorthand(300,12px,@baseLineHeight);
color: @grayLight; color: @grayLight;
&:before { &:before {
content: '\2014 \00A0'; content: '\2014 \00A0';
...@@ -155,14 +157,14 @@ blockquote { ...@@ -155,14 +157,14 @@ blockquote {
// Addresses // Addresses
address { address {
display: block; display: block;
line-height: @baseline; line-height: @baseLineHeight;
margin-bottom: @baseline; margin-bottom: @baseLineHeight;
} }
// Inline and block code styles // Inline and block code styles
code, pre { code, pre {
padding: 0 3px 2px; padding: 0 3px 2px;
font-family: Monaco, Andale Mono, Courier New, monospace; font-family: Menlo, Monaco, Andale Mono, Courier New, monospace;
font-size: 12px; font-size: 12px;
.border-radius(3px); .border-radius(3px);
} }
...@@ -174,9 +176,9 @@ code { ...@@ -174,9 +176,9 @@ code {
pre { pre {
background-color: #f5f5f5; background-color: #f5f5f5;
display: block; display: block;
padding: (@baseline - 1) / 2; padding: (@baseLineHeight - 1) / 2;
margin: 0 0 @baseline; margin: 0 0 @baseLineHeight;
line-height: @baseline; line-height: @baseLineHeight;
font-size: 12px; font-size: 12px;
border: 1px solid #ccc; border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.15); border: 1px solid rgba(0,0,0,.15);
......
...@@ -3,19 +3,27 @@ ...@@ -3,19 +3,27 @@
* ----------------------------------------------------- */ * ----------------------------------------------------- */
// Links // LINK COLORS
// -----------
@linkColor: #0069d6; @linkColor: #0069d6;
@linkColorHover: darken(@linkColor, 15); @linkColorHover: darken(@linkColor, 15);
// Grays
// GRAYS
// -----
@black: #000; @black: #000;
@grayDark: #333; @grayDark: lighten(@black, 25%);
@gray: #555; @gray: lighten(@black, 50%);
@grayLight: #777; @grayLight: lighten(@black, 75%);
@grayLighter: #ccc; @grayLighter: lighten(@black, 90%);
@white: #fff; @white: #fff;
// Accent Colors
// ACCENT COLORS
// -------------
@blue: #049CDB; @blue: #049CDB;
@blueDark: #0064CD; @blueDark: #0064CD;
@green: #46a546; @green: #46a546;
...@@ -25,11 +33,10 @@ ...@@ -25,11 +33,10 @@
@pink: #c3325f; @pink: #c3325f;
@purple: #7a43b6; @purple: #7a43b6;
// Baseline grid
@basefont: 13px;
@baseline: 18px;
// Griditude // GRID
// ----
// Modify the grid styles in mixins.less // Modify the grid styles in mixins.less
@gridColumns: 16; @gridColumns: 16;
@gridColumnWidth: 40px; @gridColumnWidth: 40px;
...@@ -37,7 +44,10 @@ ...@@ -37,7 +44,10 @@
@extraSpace: (@gridGutterWidth * 2); // For our grid calculations @extraSpace: (@gridGutterWidth * 2); // For our grid calculations
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Color Scheme
// COLOR SCHEME
// ------------
// Use this to roll your own color schemes if you like (unused by Bootstrap by default) // Use this to roll your own color schemes if you like (unused by Bootstrap by default)
@baseColor: @blue; // Set a base color @baseColor: @blue; // Set a base color
@complement: spin(@baseColor, 180); // Determine a complementary color @complement: spin(@baseColor, 180); // Determine a complementary color
...@@ -51,10 +61,13 @@ ...@@ -51,10 +61,13 @@
@analog2: spin(@baseColor, -22); @analog2: spin(@baseColor, -22);
// THEME VARIABLES
// ---------------
// Typography
@baseFontSize: 13px;
@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@baseLineHeight: 18px;
// More variables coming soon: // Visuals
// - @basefont to @baseFontSize @primaryButtonColor: @blue;
// - @baseline to @baseLineHeight
// - @baseFontFamily
// - @primaryButtonColor
// - anything else? File an issue on GitHub
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment