diff --git a/src/less/basic/scaffolding.less b/src/less/basic/scaffolding.less index 8dd22f066162a6e9dca5a29987f73187457695d3..cded459a3b3444b39472d9cd90cded47740a375d 100644 --- a/src/less/basic/scaffolding.less +++ b/src/less/basic/scaffolding.less @@ -1,19 +1,32 @@ -// +/// ======================================================================== +/// Bootstrap: scaffolding.less +/// https://github.com/twbs/bootstrap/blob/master/less/scaffolding.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== + + // Scaffolding -// ================================================== +// =========== + + +// Reset box sizing *, *:before, *:after { box-sizing: border-box; } + // Body reset -html -{ +html { font-size: 10px; -webkit-tap-highlight-color: rgba(0,0,0,0); } -body -{ +body { font-family: @font-family-base; font-size: @font-size-base; line-height: @line-height-base; @@ -21,7 +34,9 @@ body background-color: @body-bg; } + // Reset fonts for relevant elements + input, button, select, @@ -31,7 +46,9 @@ textarea { line-height: inherit; } + // Links + a { color: @link-color; text-decoration: none; @@ -63,6 +80,7 @@ a { // Remove the gap between images, videos, audio and canvas and the bottom of // their containers: h5bp.com/i/440 // Make media width auto fit containers + audio, canvas, img, @@ -72,9 +90,11 @@ video { max-width: 100%; } + // Only display content to screen readers // // See: http://a11yproject.com/posts/how-to-hide-content/ + .sr-only { position: absolute; width: 1px; @@ -90,6 +110,7 @@ video { // Remove text-shadow in selection highlight: h5bp.com/i // These selection rule sets have to be separate. // Customize the background color to match your design. + ::-moz-selection { background: #b3d4fc; text-shadow: none; @@ -99,7 +120,9 @@ video { text-shadow: none; } + // Remove default fieldset styles. + fieldset { border: 0; margin: 0; @@ -108,10 +131,11 @@ fieldset { // Allow only vertical resizing of textareas. -textarea { - resize: vertical; -} + +textarea { resize: vertical; } + // reset ol&ul padding left + ol, -ul {padding-left: 20px;} +ul { padding-left: 20px; } diff --git a/src/less/basic/utilities.less b/src/less/basic/utilities.less index ee81f96f127b1a396cc22ccfea5081a6928b35b5..23a6ca422713794fc53c73da6c43f21ab64d76b5 100644 --- a/src/less/basic/utilities.less +++ b/src/less/basic/utilities.less @@ -1,58 +1,49 @@ -// -// Utility classes -// -------------------------------------------------- -// Floats -// ------------------------- -.clearfix { - .clearfix(); -} +/// ======================================================================== +/// Bootstrap: utilities.less +/// https://github.com/twbs/bootstrap/blob/master/less/utilities.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== -.center-block { - .center-block(); -} -.pull-right { - float: right !important; -} +// Floats and clearfix + +.clearfix { .clearfix(); } + +.center-block { .center-block(); } + +.pull-right { float: right !important; } +.pull-left { float: left !important; } -.pull-left { - float: left !important; -} // Toggling content -// ------------------------- -// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1 -.hide { - display: none; -} -.hidden { - display: none!important; -} +.hide { display: none; } +.show { display: block; } -.show { - display: block; +.hidden { + display: none!important; + visibility: hidden !important; } - -.showing { +.showing { display: block!important; + visibility: visible !important; } -.invisible { - visibility: hidden; -} +.invisible { visibility: hidden; } + +.text-hide { .text-hide(); } -.text-hide { - .text-hide(); -} // For Affix plugin -// ------------------------- -.affix { - position: fixed; -} -// padding and margin -.with-padding { - padding: @padding-base-vertical @padding-base-horizontal; -} +.affix { position: fixed; } + + +// Padding and margin + +.with-padding { padding: @padding-base-vertical @padding-base-horizontal; } diff --git a/src/less/basic/utilities.responsive.less b/src/less/basic/utilities.responsive.less index 1c9ae359cc0bdac7e9dcc9582ced167b44c3bb14..e90d75149f43c9b9116514c2e090b52f007eaaee 100644 --- a/src/less/basic/utilities.responsive.less +++ b/src/less/basic/utilities.responsive.less @@ -1,35 +1,13 @@ -// -// Responsive: Utility classes -// -------------------------------------------------- - - -// IE10 in Windows (Phone) 8 -// -// Support for responsive views via media queries is kind of borked in IE10, for -// Surface/desktop in split view and for Windows Phone 8. This particular fix -// must be accompanied by a snippet of JavaScript to sniff the user agent and -// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at -// our Getting Started page for more information on this bug. -// -// For more information, see the following: -// -// Issue: https://github.com/twbs/bootstrap/issues/10497 -// Docs: http://getbootstrap.com/getting-started/#browsers -// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ - -@-ms-viewport { - width: device-width; -} - - -// Hide from screenreaders and browsers -// -// Credit: HTML5 Boilerplate - -.hidden { - display: none !important; - visibility: hidden !important; -} +/// ======================================================================== +/// Bootstrap: utilities.responsive.less +/// https://github.com/twbs/bootstrap/blob/master/less/utilities.responsive.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== // Visibility utilities @@ -210,7 +188,9 @@ } } + // Print utilities + .visible-print { .responsive-invisibility(); } diff --git a/src/less/basic/variables.less b/src/less/basic/variables.less index c59118ae193e3997b3de40998b12d20a51b340bf..8aec1d642c70adb34d64d70ddd37e18ba9407fc8 100644 --- a/src/less/basic/variables.less +++ b/src/less/basic/variables.less @@ -1,8 +1,17 @@ -// -// The Variables of ZUI. -// ========================= +/// ======================================================================== +/// Bootstrap: variables.less +/// https://github.com/twbs/bootstrap/blob/master/less/variables.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== + + +// States -// Form states and alerts @state-default-text: @color-dark; @state-default-bg: @color-gray-pale; @state-default-inverse-bg: @color-dark; @@ -45,17 +54,19 @@ // Scaffolding + @body-bg: @color-back; @text-color: @color-fore; + // Links + @link-color: @color-secondary; @link-hover-color: darken(@link-color, 15%); @link-hover-decoration: underline; // MEDIA QUERIES TYPES -// ------------------------- // Extra small screen (phone). @screen-xs: 480px; @@ -84,7 +95,6 @@ // GRID SYSTEM -// ------------------------- // Number of grid columns. @grid-columns: 12; @@ -92,6 +102,8 @@ @grid-gutter-width: 20px; @grid-float-breakpoint: @screen-tablet; +// Point at which the navbar begins collapsing. +@grid-float-breakpoint-max: (@grid-float-breakpoint - 1); // Small screen / tablet @container-tablet: ((720px + @grid-gutter-width)); @@ -102,7 +114,6 @@ // TYPOGRAPHY -// ------------------------- // Font family. @font-family-sans-serif: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif; @@ -135,7 +146,6 @@ // COMPONENTS CONFIG -// ------------------------- @padding-base-vertical: 5px; @padding-base-horizontal: 12px; @@ -178,8 +188,8 @@ @caret-width-base: 4px; @caret-width-large: 5px; + // Z-index master list -// ------------------------- // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) @@ -193,7 +203,6 @@ // TABLES -// ------------------------- @table-cell-padding: 8px; @table-condensed-cell-padding: 5px; @@ -208,7 +217,6 @@ // DROPDOWNS -// ------------------------- @dropdown-bg: @component-bg; @dropdown-border: @component-border; @@ -228,7 +236,6 @@ // BUTTONS -// ------------------------- @btn-font-weight: normal; @@ -262,7 +269,7 @@ // PROGRESS BRAS -// ------------------------- + @progress-bg: @color-gray-lighter; @progress-bar-color: @color-light; @@ -272,8 +279,9 @@ @progress-bar-danger-bg: @color-danger; @progress-bar-info-bg: @color-info; + // THUMBNAILS -// ------------------------- + @thumbnail-padding: 4px; @thumbnail-bg: @body-bg; @thumbnail-border: @color-gray-light; @@ -284,14 +292,12 @@ // DIVIDER -// ------------------------- // Hr border color @hr-border: @color-gray-lighter; // LEBELS -// ------------------------- @label-default-bg: @color-gray; @label-primary-bg: @color-primary; @@ -303,8 +309,9 @@ @label-color: @color-light; @label-link-hover-color: @color-light; + // BADGES -// ------------------------- + @badge-link-hover-color: @color-light; @badge-bg: @color-gray-light; @@ -315,7 +322,9 @@ @badge-line-height: 1; @badge-border-radius: 12px; + // INPUT + @input-bg: @color-light; @input-bg-disabled: @color-gray-lighter; @@ -339,14 +348,15 @@ //** Disabled cursor for form controls and buttons. @cursor-disabled: not-allowed; + // BREADCUMBS -// ------------------------- + @breadcrumb-color: #ccc; @breadcrumb-active-color: @color-gray; // LIST GROUP -// ------------------------- + @list-group-bg: @color-light; @list-group-border: @color-gray-light; @list-group-border-radius: @border-radius-base; @@ -394,7 +404,7 @@ // MODALS -// ------------------------- + @modal-inner-padding: 15px; @modal-title-padding: 15px; @@ -415,7 +425,7 @@ // ALERTS -// ------------------------- + @alert-padding: 15px; @alert-border-radius: @border-radius-small; @alert-link-font-weight: bold; @@ -446,7 +456,7 @@ // ANIMATION -// -------------------------- + @animation-speed-normal: 0.4s; @animation-speed-fast: 0.2s; @animation-speed-slow: 0.8s; @@ -454,7 +464,7 @@ // CODE -// ------------------------ + @code-color: @color-danger; @code-bg: @color-gray-pale; @@ -466,7 +476,7 @@ // TYPE -// ------------------------ + @text-muted: @color-gray; @abbr-border-color: @color-gray-light; @headings-small-color: @color-gray; @@ -477,7 +487,6 @@ // MISCELLANEOUS -// ------------------------- // Hr border color @hr-border: @color-gray-lighter; @@ -487,7 +496,6 @@ // ARTICLE -// ------------------------- @article-padding: 20px; @article-section-padding: 10px 15px; @@ -507,21 +515,18 @@ // CONTENTS LIST -// ----------------------- @list-padding: 15px; @list-item-bg-hover: #f5f5f5; // CARDS -// ---------------------- @card-border-color: @color-gray-light; @card-reveal-bg: @color-gray-pale; // PAGER -// ------------------------- @pager-bg: @color-light; @pager-border: @color-gray-light; @@ -536,7 +541,6 @@ // NAVBAR -// ------------------------- // Basics of a navbar @navbar-height: 40px; @@ -545,6 +549,7 @@ @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor((@grid-gutter-width / 2)); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); +@navbar-collapse-max-height: 340px; @navbar-default-color: @color-gray-dark; @navbar-default-bg: lighten(@color-gray-pale, 2.5%); @@ -566,7 +571,7 @@ // Navbar toggle @navbar-default-toggle-hover-bg: @color-gray-light; -@navbar-default-toggle-icon-bar-bg: #ccc; +@navbar-default-toggle-icon-bar-bg: @color-gray; @navbar-default-toggle-border-color: @color-gray-light; @@ -598,7 +603,6 @@ // NAVS -// ------------------------- @nav-link-padding: 8px 15px; @nav-link-padding-top: 10px; @@ -640,7 +644,6 @@ // CAROUSEL -// ------------------------ @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); @@ -656,14 +659,14 @@ // CLOSE -// ------------------------ + @close-color: @color-black; @close-font-weight: bold; @close-text-shadow: 0 1px 0 @color-light; // TOOLTIPS -// ------------------------- + @tooltip-max-width: 200px; @tooltip-color: @color-back; @tooltip-bg: @color-fore; @@ -673,7 +676,7 @@ // POPOVER -// ------------------------- + @popover-bg: @color-light; @popover-max-width: 300px; @popover-border-color: rgba(0,0,0,.2); @@ -690,7 +693,7 @@ // ICON FONT -// ------------------------- + @icon-font-path: "../fonts"; @icon-font-version: "2.2.0"; @icon-border-color: @color-gray-light; @@ -703,11 +706,11 @@ // SCROLLBAR -// ------------------------- + @scrollbar-size: 10px; @scrollbar-radius: 5px; // MESSAGER -// ------------------------- + @messager-radius: 20px; diff --git a/src/less/basic/variables.theme.less b/src/less/basic/variables.theme.less index 9d4202df9584082e075408e02941de44a06ef40c..85bbc0a52b7c6edb8db4324cbf441ff7acd78339 100644 --- a/src/less/basic/variables.theme.less +++ b/src/less/basic/variables.theme.less @@ -1,5 +1,15 @@ +/// ======================================================================== +/// ZUI: variables.theme.less +/// http://zui.sexy +/// ======================================================================== +/// Copyright 2014-2016 cnezsoft.com; Licensed MIT +/// ======================================================================== + + // COLOR SCHEME -// ------------------------------------------------- +// ============ + +// Basic colors @color-theme: light; @color-primary: #3F51B5; @@ -8,7 +18,9 @@ @color-fore: #353535; @color-back: #fff; -// Grays + +// Grays colors + @color-gray-darker: lighten(#000, 13.5%); // #222 @color-gray-dark: lighten(#000, 20%); // #333 @color-gray: lighten(#000, 50%); // #808080 @@ -16,7 +28,9 @@ @color-gray-lighter: lighten(#000, 89.7%); // #e5e5e5 @color-gray-pale: lighten(#000, 94.5%); // #f1f1f1 -// Color set + +// Named colors + @color-white: #fff; @color-black: #000; @color-red: #d9534f; @@ -33,10 +47,12 @@ @color-brown-pale: #f7ebe1; @color-purple-pale: #f5eeff; -// Brand colors @color-light: @color-back; @color-dark: @color-fore; + +// Brand colors + @color-success: @color-green; @color-warning: @color-yellow; @color-danger: @color-red; @@ -52,11 +68,12 @@ @color-special-pale: @color-purple-pale; -// -// The Variables of ZUI. -// ========================= +// VARIABLES +// ========= + + +// States -// Form states and alerts @state-default-text: @color-dark; @state-default-bg: @color-gray-pale; @state-default-inverse-bg: @color-dark; @@ -99,17 +116,19 @@ // Scaffolding + @body-bg: @color-back; @text-color: @color-fore; + // Links + @link-color: @color-secondary; @link-hover-color: darken(@link-color, 15%); @link-hover-decoration: underline; // MEDIA QUERIES TYPES -// ------------------------- // Extra small screen (phone). @screen-xs: 480px; @@ -138,7 +157,6 @@ // GRID SYSTEM -// ------------------------- // Number of grid columns. @grid-columns: 12; @@ -156,10 +174,9 @@ // TYPOGRAPHY -// ------------------------- // Font family. -@font-family-sans-serif: "Helvetica Neue", Helvetica, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', Tahoma, Arial, sans-serif; +@font-family-sans-serif: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif; @font-family-headings: @font-family-sans-serif; @font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace; @@ -170,11 +187,11 @@ @font-size-large: ceil((@font-size-base * 1.25)); // 18px @font-size-small: ceil((@font-size-base * 0.85)); // 12px -@font-size-h1: floor((@font-size-base * 2.00)); // 28px -@font-size-h2: floor((@font-size-base * 1.58)); // 22px -@font-size-h3: floor((@font-size-base * 1.29)); // 18px -@font-size-h4: floor((@font-size-base * 1.15)); // 16px -@font-size-h5: @font-size-base; +@font-size-h1: floor((@font-size-base * 2.00)); // 26px +@font-size-h2: floor((@font-size-base * 1.58)); // 20px +@font-size-h3: floor((@font-size-base * 1.29)); // 16px +@font-size-h4: floor((@font-size-base * 1.15)); // 14px +@font-size-h5: @font-size-base; // 13px @font-size-h6: ceil((@font-size-base * 0.85)); // 12px // Line height. @@ -189,7 +206,6 @@ // COMPONENTS CONFIG -// ------------------------- @padding-base-vertical: 5px; @padding-base-horizontal: 12px; @@ -232,8 +248,8 @@ @caret-width-base: 4px; @caret-width-large: 5px; + // Z-index master list -// ------------------------- // Used for a bird's eye view of components dependent on the z-axis // Try to avoid customizing these :) @@ -247,7 +263,6 @@ // TABLES -// ------------------------- @table-cell-padding: 8px; @table-condensed-cell-padding: 5px; @@ -262,7 +277,6 @@ // DROPDOWNS -// ------------------------- @dropdown-bg: @component-bg; @dropdown-border: @component-border; @@ -282,7 +296,6 @@ // BUTTONS -// ------------------------- @btn-font-weight: normal; @@ -324,8 +337,9 @@ @progress-bar-danger-bg: @color-danger; @progress-bar-info-bg: @color-info; + // THUMBNAILS -// ------------------------- + @thumbnail-padding: 4px; @thumbnail-bg: @body-bg; @thumbnail-border: @color-gray-light; @@ -336,14 +350,12 @@ // DIVIDER -// ------------------------- // Hr border color @hr-border: @color-gray-lighter; // LEBELS -// ------------------------- @label-default-bg: @color-gray; @label-primary-bg: @color-primary; @@ -355,8 +367,9 @@ @label-color: @color-light; @label-link-hover-color: @color-light; + // BADGES -// ------------------------- + @badge-link-hover-color: @color-light; @badge-bg: @color-gray-light; @@ -367,7 +380,9 @@ @badge-line-height: 1; @badge-border-radius: 12px; + // INPUT + @input-bg: @color-light; @input-bg-disabled: @color-gray-lighter; @@ -388,15 +403,18 @@ @input-group-addon-bg: @color-gray-pale; @input-group-addon-border-color: @input-border; +//** Disabled cursor for form controls and buttons. +@cursor-disabled: not-allowed; + // BREADCUMBS -// ------------------------- + @breadcrumb-color: #ccc; @breadcrumb-active-color: @color-gray-light; // LIST GROUP -// ------------------------- + @list-group-bg: @color-light; @list-group-border: @color-gray-light; @list-group-border-radius: @border-radius-base; @@ -444,7 +462,7 @@ // MODALS -// ------------------------- + @modal-inner-padding: 15px; @modal-title-padding: 15px; @@ -465,7 +483,7 @@ // ALERTS -// ------------------------- + @alert-padding: 15px; @alert-border-radius: @border-radius-small; @alert-link-font-weight: bold; @@ -496,15 +514,15 @@ // ANIMATION -// -------------------------- -@animation-speed-normal: 0.5s; -@animation-speed-fast: 0.3s; + +@animation-speed-normal: 0.4s; +@animation-speed-fast: 0.2s; @animation-speed-slow: 0.8s; @animation-type: cubic-bezier(0.175,.885,.32,1); // CODE -// ------------------------ + @code-color: @color-danger; @code-bg: @color-gray-pale; @@ -512,10 +530,11 @@ @pre-color: @color-gray-dark; @pre-border-color: #ccc; @pre-scrollable-max-height: 340px; +@pre-line-height: 18/13; // TYPE -// ------------------------ + @text-muted: @color-gray; @abbr-border-color: @color-gray-light; @headings-small-color: @color-gray; @@ -526,7 +545,6 @@ // MISCELLANEOUS -// ------------------------- // Hr border color @hr-border: @color-gray-lighter; @@ -536,7 +554,6 @@ // ARTICLE -// ------------------------- @article-padding: 20px; @article-section-padding: 10px 15px; @@ -556,21 +573,18 @@ // CONTENTS LIST -// ----------------------- @list-padding: 15px; @list-item-bg-hover: #f5f5f5; // CARDS -// ---------------------- @card-border-color: @color-gray-light; @card-reveal-bg: @color-gray-pale; // PAGER -// ------------------------- @pager-bg: @color-light; @pager-border: @color-gray-light; @@ -585,7 +599,6 @@ // NAVBAR -// ------------------------- // Basics of a navbar @navbar-height: 40px; @@ -647,7 +660,6 @@ // NAVS -// ------------------------- @nav-link-padding: 8px 15px; @nav-link-padding-top: 10px; @@ -689,7 +701,6 @@ // CAROUSEL -// ------------------------ @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); @@ -705,14 +716,14 @@ // CLOSE -// ------------------------ + @close-color: @color-black; @close-font-weight: bold; @close-text-shadow: 0 1px 0 @color-light; // TOOLTIPS -// ------------------------- + @tooltip-max-width: 200px; @tooltip-color: @color-back; @tooltip-bg: @color-fore; @@ -722,7 +733,7 @@ // POPOVER -// ------------------------- + @popover-bg: @color-light; @popover-max-width: 300px; @popover-border-color: rgba(0,0,0,.2); @@ -739,9 +750,9 @@ // ICON FONT -// ------------------------- + @icon-font-path: "../fonts"; -@icon-font-version: "2.1.0"; +@icon-font-version: "2.2.0"; @icon-border-color: @color-gray-light; @icon-muted-color: @color-gray-light; @icon-light-color: @color-light; @@ -752,11 +763,10 @@ // SCROLLBAR -// ------------------------- + @scrollbar-size: 10px; @scrollbar-radius: 0; // MESSAGER -// ------------------------- @messager-radius: 0; diff --git a/src/less/components/alerts.hover.less b/src/less/components/alerts.hover.less index 0db1d24814d0e99a18310f752fbe736f20f9baf5..b4c33a79f3cc1a8d3d07b2cb466ff7d61778eb50 100644 --- a/src/less/components/alerts.hover.less +++ b/src/less/components/alerts.hover.less @@ -1,16 +1,19 @@ -// -// Alert hover classes -// -------------------------------------------------- +/// ======================================================================== +/// ZUI: alert.hover.less +/// http://zui.sexy +/// ======================================================================== +/// Copyright 2014-2016 cnezsoft.com; Licensed MIT +/// ======================================================================== -.alert:hover -{ - background-color: darken(@alert-default-bg,5%); +// Alert styles for hover state - &.alert-success { background-color: darken(@alert-success-bg,5%); } - &.alert-info { background-color: darken(@alert-info-bg,5%); } - &.alert-warning { background-color: darken(@alert-warning-bg,5%); } - &.alert-danger { background-color: darken(@alert-danger-bg,5%); } - +.alert:hover { + background-color: darken(@alert-default-bg, 5%); >[class*="icon-"] { opacity: 1; } } + +.alert-success { background-color: darken(@alert-success-bg, 5%); } +.alert-info { background-color: darken(@alert-info-bg, 5%); } +.alert-warning { background-color: darken(@alert-warning-bg, 5%); } +.alert-danger { background-color: darken(@alert-danger-bg, 5%); } diff --git a/src/less/components/alerts.inverse.less b/src/less/components/alerts.inverse.less index 7d8b96c6488ca8fc4a9c29c15338f16f583c4398..f034e8a5cd374e88eb041d314a114bc1faefde0c 100644 --- a/src/less/components/alerts.inverse.less +++ b/src/less/components/alerts.inverse.less @@ -1,3 +1,13 @@ +/// ======================================================================== +/// ZUI: alert.inverse.less +/// http://zui.sexy +/// ======================================================================== +/// Copyright 2014-2016 cnezsoft.com; Licensed MIT +/// ======================================================================== + + +// Inverse alert tyles + .alert-inverse { .alert-inverse-variant(@color-dark);} .alert-primary-inverse { .alert-inverse-variant(@color-primary);} .alert-success-inverse { .alert-inverse-variant(@color-success);} diff --git a/src/less/components/alerts.less b/src/less/components/alerts.less index 2aecb1cf0707e84f7048de14a3877664b8a9f4a9..48c41437f2452ce504b784c564307fc4633b5cf4 100644 --- a/src/less/components/alerts.less +++ b/src/less/components/alerts.less @@ -1,10 +1,16 @@ -// -// Alerts -// -------------------------------------------------- +/// ======================================================================== +/// Bootstrap: alert.less +/// https://github.com/twbs/bootstrap/blob/master/less/alert.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== // Base styles -// ------------------------- .alert { padding: @alert-padding; @@ -20,25 +26,24 @@ color: inherit; } - // Provide class for links that match alerts - .alert-link { - font-weight: @alert-link-font-weight; - } - - hr { - margin: 10px 0; - } + hr { margin: 10px 0; } // Improve alignment and spacing of inner content p, - ul { - margin-bottom: 0; - } + ul { margin-bottom: 0; } - p + p { - margin-top: 5px; - } + p + p { margin-top: 5px; } +} + + +// Provide class for links that match alerts +.alert-link { font-weight: @alert-link-font-weight; } + + +// Alert with icon inside + +.alert { >[class*="icon-"] { float: left; font-size: 42px; @@ -75,12 +80,15 @@ } } + // Block alert + .alert-block { margin: 0; border-radius: 0; } + // Dismissable alerts // // Expand the right padding and account for the close button's positioning. @@ -99,7 +107,7 @@ // Alternate styles -// + // Generate contextual modifier classes for colorizing the alert. .alert-primary { .alert-variant(@alert-primary-bg; @alert-primary-border; @alert-primary-text); diff --git a/src/less/components/code.less b/src/less/components/code.less index dbc1e3d36c353667a038783c8f2457cbdc4d6c99..d3fc0bf58761c84f47ba7624bff99226d36dadf5 100644 --- a/src/less/components/code.less +++ b/src/less/components/code.less @@ -1,15 +1,22 @@ -// -// Code (inline and blocK) -// -------------------------------------------------- +/// ======================================================================== +/// Bootstrap: code.less +/// https://github.com/twbs/bootstrap/blob/master/less/code.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== // Inline and block code styles + code, kbd, pre, -samp { - font-family: @font-family-monospace; -} +samp { font-family: @font-family-monospace; } + // Inline code @@ -37,6 +44,7 @@ kbd { // Blocks of code + pre { display: block; padding: ((@line-height-computed - 1) / 2); @@ -51,6 +59,7 @@ pre { border-radius: @border-radius-base; // Account for some code outputs that place code tags in pre tags + code { padding: 0; font-size: inherit; @@ -62,7 +71,9 @@ pre { } } + // Enable scrollable blocks of code + .pre-scrollable { max-height: @pre-scrollable-max-height; overflow-y: scroll; @@ -70,7 +81,7 @@ pre { // prettify.css -// ---------------------- + .com { color: #93a1a1; } .lit { color: #195f91; } .pun, .opn, .clo { color: #93a1a1; } @@ -83,12 +94,10 @@ pre { .prettyprint { &.linenums { box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; - - } ol.linenums { - padding-left: 40px; + padding-left: 35px; color: #bebec5; line-height: 20px; text-shadow: 0 1px 0 #fff; diff --git a/src/less/components/forms.condensed.less b/src/less/components/forms.condensed.less index fb19030a2cf9e7e7bd890666b7f2e6bcc0e1d148..23f13d05073209d3f9d1c19530a08d82d130de8a 100644 --- a/src/less/components/forms.condensed.less +++ b/src/less/components/forms.condensed.less @@ -1,20 +1,19 @@ -// -// Condensed form style -// -------------------------------------------------- +/// ======================================================================== +/// ZUI: form.condensed.less +/// http://zui.sexy +/// ======================================================================== +/// Copyright 2014-2016 cnezsoft.com; Licensed MIT +/// ======================================================================== +// Condensed form + .form-condensed { - .form-control { - .input-sm(); - } + .form-control { .input-sm(); } - textarea.form-control { - height: auto; - } + textarea.form-control { height: auto; } - .btn { - .btn-sm(); - } + .btn { .btn-sm(); } .input-group > .form-control, .input-group > .input-group-addon, diff --git a/src/less/components/forms.less b/src/less/components/forms.less index 9979d95bac77b63ea61d7393d6c7a037525e6004..4a3f94398c3facc9d664839708d721a07583f507 100644 --- a/src/less/components/forms.less +++ b/src/less/components/forms.less @@ -1,13 +1,24 @@ -// -// Forms -// -------------------------------------------------- +/// ======================================================================== +/// Bootstrap: form.less +/// https://github.com/twbs/bootstrap/blob/master/less/form.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== // Normalize non-controls // // Restyle and baseline non-control form elements. -fieldset { padding: 0; margin: 0; border: 0; } +fieldset { + padding: 0; + margin: 0; + border: 0; +} legend { display: block; @@ -21,7 +32,11 @@ legend { border-bottom: 1px solid @legend-border-color; } -label { display: inline-block; margin-bottom: 5px; font-weight: bold; } +label { + display: inline-block; + margin-bottom: 5px; + font-weight: bold; +} // Normalize form controls @@ -64,7 +79,7 @@ input[type="number"] { // Placeholder -// + // Placeholder text gets special styles because when browsers invalidate entire // lines if it doesn't understand a selector/ .form-control { .placeholder(); } @@ -212,7 +227,9 @@ input[type="checkbox"] { } } + // Form control sizing + .input-sm { .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); } .input-lg { .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); } @@ -222,7 +239,7 @@ input[type="checkbox"] { // Apply contextual and semantic states to individual form controls. .has-warning { .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg); } -.has-error { .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg); } +.has-error { .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg); } .has-success { .form-control-validation(@state-success-text; @state-success-text; @state-success-bg); } @@ -240,6 +257,7 @@ input[type="checkbox"] { min-height: (@line-height-computed + @font-size-base); } + // Help text // // Apply to any element you wish to create light text for placement immediately @@ -253,7 +271,6 @@ input[type="checkbox"] { } - // Inline forms // // Make forms appear inline(-block) by adding the `.form-inline` class. Inline diff --git a/src/less/components/input-groups.less b/src/less/components/input-groups.less index 02add6acf6963e0450332d5bacfc36515ee91ff5..f912f8eec9b014fb2e373465c3fe786bbd96588f 100644 --- a/src/less/components/input-groups.less +++ b/src/less/components/input-groups.less @@ -1,9 +1,17 @@ -// -// Input groups -// -------------------------------------------------- +/// ======================================================================== +/// Bootstrap: input-group.less +/// https://github.com/twbs/bootstrap/blob/master/less/input-group.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== + // Base styles -// ------------------------- + .input-group { position: relative; // For dropdowns display: table; @@ -32,8 +40,9 @@ } } + // Display as table-cell -// ------------------------- + .input-group-addon, .input-group-btn, .input-group .form-control { @@ -51,8 +60,9 @@ vertical-align: middle; // Match the inputs } + // Text input groups -// ------------------------- + .input-group-addon { padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; @@ -71,14 +81,14 @@ } &.fix-border { - border-left: 0; - border-right: 0; + border-left: 0; + border-right: 0; } &:empty, &.fix-padding { - padding: 0; - width: 1px; + padding: 0; + width: 1px; } } @@ -88,7 +98,9 @@ border-radius: 0; } + // Reset rounded corners + .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, @@ -98,9 +110,7 @@ .input-group-btn:last-child > .btn-group:not(:last-child) > .btn { .border-right-radius(0); } -.input-group-addon:first-child { - border-right: 0; -} +.input-group-addon:first-child { border-right: 0; } .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, @@ -110,12 +120,11 @@ .input-group-btn:first-child > .btn-group:not(:first-child) > .btn { .border-left-radius(0); } -.input-group-addon:last-child { - border-left: 0; -} +.input-group-addon:last-child { border-left: 0; } + // Button input groups -// ------------------------- + .input-group-btn { position: relative; // Jankily prevent input button groups from wrapping with `white-space` and @@ -127,9 +136,8 @@ // element above the siblings. > .btn { position: relative; - + .btn { - margin-left: -1px; - } + + .btn { margin-left: -1px; } + // Bring the "active" button to the front &:hover, &:focus, diff --git a/src/less/components/input-groups.size.less b/src/less/components/input-groups.size.less index e477323313f81d5fc033d7015c6a0cacb3832324..fee54af5db83410272a93211e465e1a2ec63dab0 100644 --- a/src/less/components/input-groups.size.less +++ b/src/less/components/input-groups.size.less @@ -1,6 +1,13 @@ -// -// Sizing options of input groups -// -------------------------------------------------- +/// ======================================================================== +/// Bootstrap: input-group.size.less +/// https://github.com/twbs/bootstrap/blob/master/less/input-group.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== // Sizing options @@ -16,8 +23,9 @@ .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { .input-sm(); } + // Text input groups -// ------------------------- + .input-group-addon { // Sizing &.input-sm { diff --git a/src/less/components/list-group.less b/src/less/components/list-group.less index 056593ce58c9b4f9dbbb7e49d38146991676d916..9fd1c2a02fa4460392c06bb70a8a0ca8bced464b 100644 --- a/src/less/components/list-group.less +++ b/src/less/components/list-group.less @@ -1,9 +1,17 @@ -// -// List groups -// -------------------------------------------------- +/// ======================================================================== +/// Bootstrap: list-group.less +/// https://github.com/twbs/bootstrap/blob/master/less/list-group.less +/// +/// ZUI: The file has been changed in ZUI. It will not keep update with the +/// Bootsrap version in the future. +/// http://zui.sexy +/// ======================================================================== +/// Bootrap: Copyright 2011-2016 Twitter, Inc. Licensed under MIT +/// ======================================================================== + // Base class -// + // Easily usable on