diff --git a/README.md b/README.md index edb0304a5..d5eccd114 100644 --- a/README.md +++ b/README.md @@ -157,8 +157,8 @@ For a user its around 65% smaller and faster than traditional RainLoop. |css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli | |------------ |-------: |-------: |------: |------: |--------: | -|app.css | 340.334 | 183.662 | 46,959 | 28.665 | 24.135 | -|app.min.css | 274.791 | 149.991 | 39.618 | 25.303 | 21.868 | +|app.css | 340.334 | 167.876 | 46,959 | 26.292 | 22.129 | +|app.min.css | 274.791 | 136.861 | 39.618 | 23.066 | 19.978 | |boot.css | | 2.534 | | 837 | 668 | |boot.min.css | | 2.055 | | 732 | 560 | diff --git a/dev/Styles/@Main.less b/dev/Styles/@Main.less index 05b12eb3b..322d84028 100644 --- a/dev/Styles/@Main.less +++ b/dev/Styles/@Main.less @@ -5,28 +5,19 @@ @import "_Values.less"; @import "../../vendors/bootstrap/less/grid.less"; -@import "../../vendors/bootstrap/less/layouts.less"; - @import "../../vendors/bootstrap/less/type.less"; @import "../../vendors/bootstrap/less/code.less"; @import "../../vendors/bootstrap/less/forms.less"; @import "../../vendors/bootstrap/less/tables.less"; - @import "../../vendors/bootstrap/less/dropdowns.less"; @import "../../vendors/bootstrap/less/wells.less"; -@import "../../vendors/bootstrap/less/component-animations.less"; @import "../../vendors/bootstrap/less/close.less"; - @import "../../vendors/bootstrap/less/buttons.less"; @import "../../vendors/bootstrap/less/button-groups.less"; @import "../../vendors/bootstrap/less/alerts.less"; - @import "../../vendors/bootstrap/less/navs.less"; - @import "../../vendors/bootstrap/less/modals.less"; - @import "../../vendors/bootstrap/less/labels-badges.less"; - @import "../../vendors/bootstrap/less/utilities.less"; @import "_FontasticToBoot.less"; diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PhotoSwipe.html b/snappymail/v/0.0.0/app/templates/Views/User/PhotoSwipe.html deleted file mode 100644 index f256ed71f..000000000 --- a/snappymail/v/0.0.0/app/templates/Views/User/PhotoSwipe.html +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/vendors/bootstrap/less/alerts.less b/vendors/bootstrap/less/alerts.less index 32a4b2312..7f3534cc2 100644 --- a/vendors/bootstrap/less/alerts.less +++ b/vendors/bootstrap/less/alerts.less @@ -15,9 +15,6 @@ border-radius: 4px; color: @warningText; } -.alert h4 { - margin: 0; -} // Adjust close link position .alert .close { @@ -31,12 +28,6 @@ // Alternate styles // ------------------------- -.alert-success { - background-color: @successBackground; - border-color: @successBorder; - color: @successText; -} -.alert-danger, .alert-error { background-color: @errorBackground; border-color: @errorBorder; @@ -56,10 +47,3 @@ padding-top: 14px; padding-bottom: 14px; } -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less index 31162d2c1..cc67be526 100644 --- a/vendors/bootstrap/less/button-groups.less +++ b/vendors/bootstrap/less/button-groups.less @@ -44,9 +44,6 @@ } // Reset fonts for other sizes -.btn-group > .btn-mini { - font-size: 11px; -} .btn-group > .btn-small { font-size: 12px; } @@ -103,10 +100,6 @@ padding-right: 8px; box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } -.btn-group > .btn-mini + .dropdown-toggle { - padding-left: 5px; - padding-right: 5px; -} .btn-group > .btn-large + .dropdown-toggle { padding-left: 12px; padding-right: 12px; @@ -125,9 +118,6 @@ .btn.dropdown-toggle { background-color: @btnBackgroundHighlight; } - .btn-primary.dropdown-toggle { - background-color: @btnPrimaryBackgroundHighlight; - } .btn-warning.dropdown-toggle { background-color: @btnWarningBackgroundHighlight; } @@ -137,12 +127,6 @@ .btn-success.dropdown-toggle { background-color: @btnSuccessBackgroundHighlight; } - .btn-info.dropdown-toggle { - background-color: @btnInfoBackgroundHighlight; - } - .btn-inverse.dropdown-toggle { - background-color: @btnInverseBackgroundHighlight; - } } @@ -151,60 +135,3 @@ margin-top: 8px; margin-left: 0; } -// Carets in other button sizes -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; -} -.btn-large .caret { - border-left-width: 5px; - border-right-width: 5px; - border-top-width: 5px; -} - - - -// Account for other colors -.btn-primary, -.btn-warning, -.btn-danger, -.btn-info, -.btn-success, -.btn-inverse { - .caret { - border-top-color: @white; - border-bottom-color: @white; - } -} - - - -// Vertical button groups -// ---------------------- - -.btn-group-vertical { - display: inline-block; // makes buttons only take up the width they need -} -.btn-group-vertical .btn { - display: block; - float: none; - width: 100%; - border-radius: 0; -} -.btn-group-vertical .btn + .btn { - margin-left: 0; - margin-top: -1px; -} -.btn-group-vertical .btn:first-child { - border-radius: 4px 4px 0 0; -} -.btn-group-vertical .btn:last-child { - border-radius: 0 0 4px 4px; -} -.btn-group-vertical .btn-large:first-child { - border-radius: 6px 6px 0 0; -} -.btn-group-vertical .btn-large:last-child { - border-radius: 0 0 6px 6px; -} diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less index be2b75324..20f0e79f8 100644 --- a/vendors/bootstrap/less/buttons.less +++ b/vendors/bootstrap/less/buttons.less @@ -86,13 +86,6 @@ margin-top: 0; } -// Mini -.btn-mini { - padding: 2px 6px; - font-size: @baseFontSize - 3px; - line-height: @baseLineHeight - 4px; -} - // Block button .btn-block { display: block; @@ -110,12 +103,9 @@ // -------------------------------------------------- // Provide *some* extra contrast for those who can get it -.btn-primary.active, .btn-warning.active, .btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { +.btn-success.active { color: rgba(255,255,255,.75); } @@ -126,9 +116,6 @@ border-color: #c5c5c5; border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); } -.btn-primary { - .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); -} // Warning appears are orange .btn-warning { .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight); @@ -141,49 +128,3 @@ .btn-success { .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight); } -// Info appears as a neutral blue -.btn-info { - .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight); -} -// Inverse appears as dark gray -.btn-inverse { - .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight); -} - - -// Cross-browser Jank -// -------------------------------------------------- - -button.btn, -input[type="submit"].btn { - - // Firefox 3.6 only I believe - &::-moz-focus-inner { - padding: 0; - border: 0; - } - -} - - -// Link buttons -// -------------------------------------------------- - -// Make a button look and behave like a link -.btn-link, -.btn-link:active { - background-color: transparent; - background-image: none; - box-shadow: none; -} -.btn-link { - border-color: transparent; - cursor: pointer; - color: @linkColor; - border-radius: 0; -} -.btn-link:hover { - color: @linkColorHover; - text-decoration: underline; - background-color: transparent; -} diff --git a/vendors/bootstrap/less/code.less b/vendors/bootstrap/less/code.less index 8a1ccc333..195d12fad 100644 --- a/vendors/bootstrap/less/code.less +++ b/vendors/bootstrap/less/code.less @@ -36,11 +36,6 @@ pre { border: 1px solid rgba(0,0,0,.15); border-radius: 4px; - // Make prettyprint styles more spaced out for readability - &.prettyprint { - margin-bottom: @baseLineHeight; - } - // Account for some code outputs that place code tags in pre tags code { padding: 0; @@ -49,9 +44,3 @@ pre { border: 0; } } - -// Enable scrollable blocks of code -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} diff --git a/vendors/bootstrap/less/component-animations.less b/vendors/bootstrap/less/component-animations.less deleted file mode 100644 index 196af8f1f..000000000 --- a/vendors/bootstrap/less/component-animations.less +++ /dev/null @@ -1,14 +0,0 @@ -// -// Component animations -// -------------------------------------------------- - - -.collapse { - position: relative; - height: 0; - overflow: hidden; - transition: height .35s ease; - &.in { - height: auto; - } -} diff --git a/vendors/bootstrap/less/dropdowns.less b/vendors/bootstrap/less/dropdowns.less index 23ac1f057..f05e5bae0 100644 --- a/vendors/bootstrap/less/dropdowns.less +++ b/vendors/bootstrap/less/dropdowns.less @@ -71,8 +71,7 @@ // Hover state // ----------- .dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { +.dropdown-menu li > a:focus { text-decoration: none; color: @dropdownLinkColorHover; background-color: @dropdownLinkBackgroundHover; @@ -118,52 +117,3 @@ right: 0; left: auto; } - -// Sub menus -// --------------------------- -.dropdown-submenu { - position: relative; -} -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - border-radius: 0 6px 6px 6px; -} -.dropdown-submenu:hover .dropdown-menu { - display: block; -} - -.dropdown-submenu > a:after { - display: block; - content: " "; - float: right; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; - border-width: 5px 0 5px 5px; - border-left-color: darken(@dropdownBackground, 20%); - margin-top: 5px; - margin-right: -10px; -} -.dropdown-submenu:hover > a:after { - border-left-color: @dropdownLinkColorHover; -} - - -// Tweak nav headers -// ----------------- -// Increase padding from 15px to 20px on sides -.dropdown .dropdown-menu .nav-header { - padding-left: 20px; - padding-right: 20px; -} - -// Typeahead -// --------- -.typeahead { - margin-top: 2px; // give it some space to breathe - border-radius: 4px; -} diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less index a646e539b..8fcda3f8a 100644 --- a/vendors/bootstrap/less/forms.less +++ b/vendors/bootstrap/less/forms.less @@ -78,8 +78,7 @@ input[type="email"], input[type="url"], input[type="search"], input[type="tel"], -input[type="color"], -.uneditable-input { +input[type="color"] { display: inline-block; height: @baseLineHeight; padding: 4px 6px; @@ -115,8 +114,7 @@ input[type="email"], input[type="url"], input[type="search"], input[type="tel"], -input[type="color"], -.uneditable-input { +input[type="color"] { background-color: @inputBackground; border: 1px solid @inputBorder; box-shadow: inset 0 1px 1px rgba(0,0,0,.075); @@ -178,32 +176,6 @@ input[type="checkbox"]:focus { } -// Uneditable inputs -// ------------------------- - -// Make uneditable inputs look inactive -.uneditable-input, -.uneditable-textarea { - color: @grayLight; - background-color: darken(@inputBackground, 1%); - border-color: @inputBorder; - box-shadow: inset 0 1px 2px rgba(0,0,0,.025); - cursor: not-allowed; -} - -// For text that needs to appear as an input but should not be an input -.uneditable-input { - overflow: hidden; // prevent text from wrapping, but still cut it off like an input does - white-space: nowrap; -} - -// Make uneditable textareas behave like a textarea -.uneditable-textarea { - width: auto; - height: auto; -} - - // Placeholder // ------------------------- @@ -214,50 +186,10 @@ textarea::placeholder { } -// CHECKBOXES & RADIOS -// ------------------- - -// Indent the labels to position radios/checkboxes as hanging -.radio, -.checkbox { - min-height: 18px; // clear the floating input if there is no label text - padding-left: 18px; -} -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} - -// Move the options list down to align with labels -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; // has to be padding because margin collaspes -} - -// Radios and checkboxes on same line -// TODO v3: Convert .inline to .control-inline -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; // space out consecutive inline controls -} - - - // INPUT SIZES // ----------- // General classes for quick sizes -.input-mini { width: 60px; } -.input-small { width: 90px; } -.input-medium { width: 150px; } .input-large { width: 210px; } .input-xlarge { width: 270px; } .input-xxlarge { width: 530px; } @@ -265,27 +197,12 @@ textarea::placeholder { // Grid style input sizes input[class*="span"], select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -// Redeclare since the fluid row class is more specific -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { +textarea[class*="span"] { float: none; margin-left: 0; } // Ensure input-prepend/append never wraps -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { +.input-append input[class*="span"] { display: inline-block; } @@ -297,15 +214,6 @@ textarea[class*="span"], // Grid sizes #grid > .input(@gridColumnWidth, @gridGutterWidth); -// Control row for multiple inputs per line -.controls-row { - .clearfix(); // Clear the float from controls -} -.controls-row [class*="span"] { - float: left; // Float to collapse white-space for proper grid alignment -} - - // DISABLED STATE @@ -363,54 +271,26 @@ select:focus:required:invalid { -// FORM ACTIONS -// ------------ - -.form-actions { - padding: (@baseLineHeight - 1) 20px @baseLineHeight; - margin-top: @baseLineHeight; - margin-bottom: @baseLineHeight; - background-color: @formActionsBackground; - border-top: 1px solid #e5e5e5; - .clearfix(); // Adding clearfix to allow for .pull-right button containers -} - - - // HELP TEXT // --------- -.help-block, -.help-inline { - color: lighten(@textColor, 15%); // lighten the text some for contrast -} - .help-block { + color: lighten(@textColor, 15%); // lighten the text some for contrast display: block; // account for any element using help-block margin-bottom: @baseLineHeight / 2; } -.help-inline { - display: inline-block; - vertical-align: middle; - padding-left: 5px; -} - - - // INPUT GROUPS // ------------ // Allow us to put symbols and text within the input field for a cleaner look -.input-append, -.input-prepend { +.input-append { margin-bottom: 5px; font-size: 0; white-space: nowrap; // Prevent span and input from separating input, - select, - .uneditable-input { + select { position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms font-size: @baseFontSize; @@ -446,20 +326,9 @@ select:focus:required:invalid { border-color: @green; } } -.input-prepend { - .add-on, - .btn { - margin-right: -1px; - } - .add-on:first-child, - .btn:first-child { - border-radius: @inputBorderRadius 0 0 @inputBorderRadius; - } -} .input-append { input, - select, - .uneditable-input { + select { border-radius: @inputBorderRadius 0 0 @inputBorderRadius; } .add-on:last-child, @@ -467,55 +336,6 @@ select:focus:required:invalid { border-radius: 0 @inputBorderRadius @inputBorderRadius 0; } } -// Remove all border-radius for inputs with both prepend and append -.input-prepend.input-append { - input, - select, - .uneditable-input { - border-radius: 0; - } - .add-on:first-child, - .btn:first-child { - margin-right: -1px; - border-radius: @inputBorderRadius 0 0 @inputBorderRadius; - } - .add-on:last-child, - .btn:last-child { - margin-left: -1px; - border-radius: 0 @inputBorderRadius @inputBorderRadius 0; - } -} - - - -// SEARCH FORM -// ----------- - -input.search-query { - padding-right: 14px; - padding-left: 14px; - margin-bottom: 0; // Remove the default margin on all inputs - border-radius: 15px; -} - -/* Allow for input prepend/append in search forms */ -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - border-radius: 0; // Override due to specificity -} -.form-search .input-append .search-query { - border-radius: 14px 0 0 14px -} -.form-search .input-append .btn { - border-radius: 0 14px 14px 0 -} -.form-search .input-prepend .search-query { - border-radius: 0 14px 14px 0 -} -.form-search .input-prepend .btn { - border-radius: 14px 0 0 14px -} - @@ -525,15 +345,11 @@ input.search-query { // Common properties // ----------------- -.form-search, .form-inline, .form-horizontal { input, textarea, select, - .help-inline, - .uneditable-input, - .input-prepend, .input-append { display: inline-block; margin-bottom: 0; @@ -544,37 +360,14 @@ input.search-query { display: none; } } -.form-search label, .form-inline label, -.form-search .btn-group, .form-inline .btn-group { display: inline-block; } // Remove margin for input-prepend/-append -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { +.form-inline .input-append { margin-bottom: 0; } -// Inline checkbox/radio labels (remove padding on left) -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} -// Remove float and margin, set to inline-block -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} // Margin to space out fieldsets @@ -615,8 +408,4 @@ legend + .control-group { margin-top: @baseLineHeight / 2; margin-bottom: 0; } - // Move over buttons in .form-actions to align with .controls - .form-actions { - padding-left: 160px; - } } diff --git a/vendors/bootstrap/less/grid.less b/vendors/bootstrap/less/grid.less index 750d20351..9762f735f 100644 --- a/vendors/bootstrap/less/grid.less +++ b/vendors/bootstrap/less/grid.less @@ -8,14 +8,3 @@ // Fluid (940px) #grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth); - -// Reset utility classes due to specificity -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} diff --git a/vendors/bootstrap/less/labels-badges.less b/vendors/bootstrap/less/labels-badges.less index cd20bf93e..ed8cb3f4e 100644 --- a/vendors/bootstrap/less/labels-badges.less +++ b/vendors/bootstrap/less/labels-badges.less @@ -4,7 +4,6 @@ // Base classes -.label, .badge { font-size: @baseFontSize * .846; font-weight: bold; @@ -15,11 +14,6 @@ text-shadow: 0 -1px 0 rgba(0,0,0,.25); background-color: @grayLight; } -// Set unique padding and border-radii -.label { - padding: 1px 4px 2px; - border-radius: 3px; -} .badge { padding: 1px 9px 2px; border-radius: 9px; @@ -27,46 +21,9 @@ // Hover state, but only for links a { - &.label:hover, &.badge:hover { color: @white; text-decoration: none; cursor: pointer; } } - -// Colors -// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute) -.label, -.badge { - // Important (red) - &-important { background-color: @errorText; } - &-important[href] { background-color: darken(@errorText, 10%); } - // Warnings (orange) - &-warning { background-color: @orange; } - &-warning[href] { background-color: darken(@orange, 10%); } - // Success (green) - &-success { background-color: @successText; } - &-success[href] { background-color: darken(@successText, 10%); } - // Info (turquoise) - &-info { background-color: @infoText; } - &-info[href] { background-color: darken(@infoText, 10%); } - // Inverse (black) - &-inverse { background-color: @grayDark; } - &-inverse[href] { background-color: darken(@grayDark, 10%); } -} - -// Quick fix for labels/badges in buttons -.btn { - .label, - .badge { - position: relative; - top: -1px; - } -} -.btn-mini { - .label, - .badge { - top: 0; - } -} diff --git a/vendors/bootstrap/less/layouts.less b/vendors/bootstrap/less/layouts.less deleted file mode 100644 index fb44d21b0..000000000 --- a/vendors/bootstrap/less/layouts.less +++ /dev/null @@ -1,18 +0,0 @@ -// -// Layouts -// -------------------------------------------------- - - -// Container (centered, fixed-width layouts) -.container { - margin-right: auto; - margin-left: auto; - .clearfix(); -} - -// Fluid layouts (left aligned, with sidebar, min- & max-width content) -.container-fluid { - padding-right: @gridGutterWidth; - padding-left: @gridGutterWidth; - .clearfix(); -} diff --git a/vendors/bootstrap/less/mixins.less b/vendors/bootstrap/less/mixins.less index 3773f48c9..fdaeb0ef5 100644 --- a/vendors/bootstrap/less/mixins.less +++ b/vendors/bootstrap/less/mixins.less @@ -50,13 +50,10 @@ .formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { // Set the text color > label, - .help-block, - .help-inline { + .help-block { color: @textColor; } // Style inputs accordingly - .checkbox, - .radio, input, select, textarea { @@ -70,7 +67,6 @@ } } // Give a small background color for input-prepend/-append - .input-prepend .add-on, .input-append .add-on { color: @textColor; background-color: @backgroundColor; @@ -83,15 +79,6 @@ // BACKGROUNDS // -------------------------------------------------- -// Gradient Bar Colors for buttons and alerts -.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { - color: @textColor; - text-shadow: @textShadow; - #gradient > .vertical(@primaryColor, @secondaryColor); - border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); -} - // Gradients #gradient { .vertical(@startColor: #555, @endColor: #333) { diff --git a/vendors/bootstrap/less/modals.less b/vendors/bootstrap/less/modals.less index 52ee34ccb..885c7a1eb 100644 --- a/vendors/bootstrap/less/modals.less +++ b/vendors/bootstrap/less/modals.less @@ -36,10 +36,6 @@ padding: 15px; background-color: #fff; } -// Remove bottom margin if need be -.modal-form { - margin-bottom: 0; -} // Footer (for actions) .modal-footer { diff --git a/vendors/bootstrap/less/navs.less b/vendors/bootstrap/less/navs.less index 1c88e3c6a..4f04dc570 100644 --- a/vendors/bootstrap/less/navs.less +++ b/vendors/bootstrap/less/navs.less @@ -26,88 +26,26 @@ float: right; } -// Nav headers (for dropdowns and lists) -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: @baseLineHeight; - color: @grayLight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - text-transform: uppercase; -} -// Space them out when they follow another list item (link) -.nav li + .nav-header { - margin-top: 9px; -} - -// NAV LIST -// -------- - -.nav-list { - padding-left: 15px; - padding-right: 15px; - margin-bottom: 0; -} -.nav-list > li > a, -.nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255,255,255,.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: @white; - text-shadow: 0 -1px 0 rgba(0,0,0,.2); - background-color: @linkColor; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} - - - -// TABS AND PILLS -// ------------- - -// Common styles -.nav-tabs, -.nav-pills { - .clearfix(); -} -.nav-tabs > li, -.nav-pills > li { - float: left; -} -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; // keeps the overall height an even number -} - // TABS -// ---- +// ------------- // Give the tabs something to sit on .nav-tabs { border-bottom: 1px solid #ddd; + .clearfix(); } // Make the list-items overlay the bottom border .nav-tabs > li { margin-bottom: -1px; + float: left; } // Actual tabs (as links) .nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; + padding-top: 8px 12px; + margin-right: 2px; + line-height: 14px; // keeps the overall height an even number line-height: @baseLineHeight; border: 1px solid transparent; border-radius: 4px 4px 0 0; @@ -126,78 +64,12 @@ } -// PILLS -// ----- - -// Links rendered as pills -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - border-radius: 5px; -} - -// Active state -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: @white; - background-color: @linkColor; -} - - - -// STACKED NAV -// ----------- - -// Stacked tabs and pills -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; // no need for the gap between nav items -} - -// Tabs -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - border-radius: 0; -} -.nav-tabs.nav-stacked > li:first-child > a { - border-top-right-radius: 4px; - border-top-left-radius: 4px; -} -.nav-tabs.nav-stacked > li:last-child > a { - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} - -// Pills -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; // decrease margin to match sizing of stacked tabs -} - - - // DROPDOWNS // --------- .nav-tabs .dropdown-menu { border-radius: 0 0 6px 6px; // remove the top rounded corners here since there is a hard edge above the menu } -.nav-pills .dropdown-menu { - border-radius: 6px; // make rounded corners match the pills -} // Default dropdown links // ------------------------- @@ -236,7 +108,6 @@ // Open dropdowns // ------------------------- .nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover { color: @white; background-color: @grayLight; @@ -250,11 +121,6 @@ opacity: 1; } -// Dropdowns in stacked tabs -.tabs-stacked .open > a:hover { - border-color: @grayLight; -} - // TABBABLE @@ -264,107 +130,19 @@ // COMMON STYLES // ------------- -// Clear any floats -.tabbable { - .clearfix(); -} .tab-content { overflow: auto; // prevent content from running below tabs } -// Remove border on bottom, left, right -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - // Show/hide tabbable areas -.tab-content > .tab-pane, -.pill-content > .pill-pane { +.tab-content > .tab-pane { display: none; } -.tab-content > .active, -.pill-content > .active { +.tab-content > .active { display: block; } -// BOTTOM -// ------ - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below > .nav-tabs > li > a { - border-radius: 0 0 4px 4px; - &:hover { - border-bottom-color: transparent; - border-top-color: #ddd; - } -} -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -// LEFT & RIGHT -// ------------ - -// Common styles -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -// Tabs on the left -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - border-radius: 4px 0 0 4px; -} -.tabs-left > .nav-tabs > li > a:hover { - border-color: @grayLighter #ddd @grayLighter @grayLighter; -} -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; -} - -// Tabs on the right -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - border-radius: 0 4px 4px 0; -} -.tabs-right > .nav-tabs > li > a:hover { - border-color: @grayLighter @grayLighter @grayLighter #ddd; -} -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; -} - - - // DISABLED STATES // --------------- diff --git a/vendors/bootstrap/less/tables.less b/vendors/bootstrap/less/tables.less index c68bdcf26..68ce8d186 100644 --- a/vendors/bootstrap/less/tables.less +++ b/vendors/bootstrap/less/tables.less @@ -53,17 +53,6 @@ -// CONDENSED TABLE W/ HALF PADDING -// ------------------------------- - -.table-condensed { - th, - td { - padding: 4px 5px; - } -} - - // BORDERED VERSION // ---------------- diff --git a/vendors/bootstrap/less/type.less b/vendors/bootstrap/less/type.less index de2024d3c..a0685a9f1 100644 --- a/vendors/bootstrap/less/type.less +++ b/vendors/bootstrap/less/type.less @@ -9,12 +9,6 @@ p { margin: 0 0 @baseLineHeight / 2; } -.lead { - margin-bottom: @baseLineHeight; - font-size: 20px; - font-weight: 200; - line-height: @baseLineHeight * 1.5; -} // Emphasis & misc @@ -66,17 +60,6 @@ h3 small { font-size: 14px; } h4 small { font-size: 14px; } -// Page header -// ------------------------- - -.page-header { - padding-bottom: (@baseLineHeight / 2) - 1; - margin: @baseLineHeight 0 (@baseLineHeight * 1.5); - border-bottom: 1px solid @grayLighter; -} - - - // Lists // -------------------------------------------------- @@ -114,21 +97,6 @@ dt { dd { margin-left: @baseLineHeight / 2; } -// Horizontal layout (like forms) -.dl-horizontal { - dt { - float: left; - width: 120px; - clear: left; - text-align: right; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - dd { - margin-left: 130px; - } -} // MISC // ---- diff --git a/vendors/bootstrap/less/utilities.less b/vendors/bootstrap/less/utilities.less index 48b212235..64c03f051 100644 --- a/vendors/bootstrap/less/utilities.less +++ b/vendors/bootstrap/less/utilities.less @@ -15,13 +15,3 @@ .show { display: block; } - -// Visibility -.invisible { - visibility: hidden; -} - -// For Affix plugin -.affix { - position: fixed; -} diff --git a/vendors/bootstrap/less/wells.less b/vendors/bootstrap/less/wells.less index 805ee7306..0434819e7 100644 --- a/vendors/bootstrap/less/wells.less +++ b/vendors/bootstrap/less/wells.less @@ -12,17 +12,9 @@ border: 1px solid darken(@wellBackground, 7%); border-radius: 4px; box-shadow: inset 0 1px 1px rgba(0,0,0,.05); - blockquote { - border-color: #ddd; - border-color: rgba(0,0,0,.15); - } } // Sizes -.well-large { - padding: 24px; - border-radius: 6px; -} .well-small { padding: 9px; border-radius: 3px; diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css index 4c3167d84..e52a5fcce 100644 --- a/vendors/fontastic/styles.css +++ b/vendors/fontastic/styles.css @@ -8,6 +8,8 @@ font-display: swap; } +[class^="icon-"], +[class*=" icon-"], [class^="icon-"]::before, [class*=" icon-"]::before { font-family: "snappymail" !important;