Skip to content

Z
zui

易企天创 / zui
12 个月 前同步成功

通知 6
Star 0
Fork 1
Z
zui

体验新版 GitCode，发现更多精彩内容 >>

提交 cf935add 编写于 作者: C Catouse
浏览文件
操作

* departed controls style.

上级 1cc139b3
隐藏空白更改
内联 并排
Showing with 612 addition and 694 deletion
src/less/basic/mixins.less
浏览文件 @ cf935add
......@@ -456,7 +456,7 @@
.button-variant(@color; @background; @border) {
color: @color;
background-color: @background;
// border-color: @border;
border-color: darken(@background, 12%);
&:hover,
&:focus,
......@@ -494,7 +494,7 @@
// --------------------------------
.button-styles(@btn-color: #555;) {
#gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 4%));
border-color: darken(@btn-color, 12%);
&:hover{
#gradient > .vertical(@start-color: lighten(@btn-color, 1%); @end-color: lighten(@btn-color, 3%));
......
src/less/basic/variables.chanzhi.less
浏览文件 @ cf935add
......@@ -466,8 +466,8 @@
// Code
// ------------------------
@code-color: @color-important;
@code-bg: @gray-pale;
@code-color: #c7254e;
@code-bg: #f9f2f4;
@pre-bg: #f5f5f5;
@pre-color: @gray-dark;
......
src/less/components/alerts.less
浏览文件 @ cf935add
......@@ -13,7 +13,6 @@
border: 1px solid transparent;
border-radius: @alert-border-radius;
.alert-variant(@alert-default-bg; @alert-default-border; @alert-default-text);
.transition(all,@animation-speed-fast,@animation-type);
// Headings for larger alerts
h4
......@@ -58,11 +57,6 @@
display: table-cell;
vertical-align: middle;
}
&.alert-block
{
margin: 0;
}
}
// Dismissable alerts
......
src/less/components/button-groups.less
浏览文件 @ cf935add
......@@ -118,63 +118,63 @@
// Vertical button groups
// ----------------------
.btn-group-vertical
{
> .btn, > .btn-group { display: block; float: none; width: 100%; max-width: 100%; }
// Clear floats so dropdown menus can be properly placed
> .btn-group
{
.clearfix();
> .btn { float: none; }
}
> .btn + .btn, > .btn + .btn-group, > .btn-group + .btn, > .btn-group + .btn-group
{
margin-top: -1px;
margin-left: 0;
}
}
.btn-group-vertical > .btn
{
&:not(:first-child):not(:last-child) { border-radius: 0; }
&:first-child:not(:last-child)
{
border-top-right-radius: @border-radius-base;
.border-bottom-radius(0);
}
&:last-child:not(:first-child)
{
border-bottom-left-radius: @border-radius-base;
.border-top-radius(0);
}
}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; }
.btn-group-vertical > .btn-group:first-child
{
> .btn:last-child,
> .dropdown-toggle { .border-bottom-radius(0); }
}
.btn-group-vertical > .btn-group:last-child > .btn:first-child { .border-top-radius(0); }
// .btn-group-vertical
// {
// > .btn, > .btn-group { display: block; float: none; width: 100%; max-width: 100%; }
// // Clear floats so dropdown menus can be properly placed
// > .btn-group
// {
// .clearfix();
// > .btn { float: none; }
// }
// > .btn + .btn, > .btn + .btn-group, > .btn-group + .btn, > .btn-group + .btn-group
// {
// margin-top: -1px;
// margin-left: 0;
// }
// }
// .btn-group-vertical > .btn
// {
// &:not(:first-child):not(:last-child) { border-radius: 0; }
// &:first-child:not(:last-child)
// {
// border-top-right-radius: @border-radius-base;
// .border-bottom-radius(0);
// }
// &:last-child:not(:first-child)
// {
// border-bottom-left-radius: @border-radius-base;
// .border-top-radius(0);
// }
// }
// .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; }
// .btn-group-vertical > .btn-group:first-child
// {
// > .btn:last-child,
// > .dropdown-toggle { .border-bottom-radius(0); }
// }
// .btn-group-vertical > .btn-group:last-child > .btn:first-child { .border-top-radius(0); }
// Justified button groups
// ----------------------
.btn-group-justified
{
display: table;
width: 100%;
table-layout: fixed;
border-collapse: separate;
.btn
{
float: none;
display: table-cell;
width: 1%;
}
}
// .btn-group-justified
// {
// display: table;
// width: 100%;
// table-layout: fixed;
// border-collapse: separate;
// .btn
// {
// float: none;
// display: table-cell;
// width: 1%;
// }
// }
// Checkbox and radio options
......
src/less/components/forms.less
浏览文件 @ cf935add
......@@ -283,12 +283,16 @@ input[type="radio"], input[type="checkbox"], .radio, .radio-inline, .checkbox, .
}
}
.required:after
.required
{
content: '*';
color: @state-danger-text;
display: inline-block;
position: absolute;
top: 3px;
font-size: @font-size-large;
position: relative;
&:after
{
content: '*';
color: @state-danger-text;
display: inline-block;
position: absolute;
top: 3px;
font-size: @font-size-large;
}
}
src/less/components/input-groups.less
浏览文件 @ cf935add
......@@ -15,20 +15,6 @@
.form-control { width: 100%; margin-bottom: 0; }
}
// Sizing options
//
// Remix the default form control sizing classes into new ones for easier
// manipulation.
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-lg(); }
.input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn { .input-sm(); }
// Display as table-cell
// -------------------------
.input-group-addon, .input-group-btn, .input-group .form-control
......@@ -58,20 +44,6 @@
border: 1px solid @input-group-addon-border-color;
border-radius: @border-radius-base;
// Sizing
&.input-sm
{
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
}
&.input-lg
{
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
}
// Nuke default margins from checkboxes and radios to vertically center within.
input[type="radio"], input[type="checkbox"] { margin-top: 0; }
}
......
src/less/components/input-groups.size.less 0 → 100644
浏览文件 @ cf935add
// Sizing options
//
// Remix the default form control sizing classes into new ones for easier
// manipulation.
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-lg(); }
.input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn { .input-sm(); }
// Text input groups
// -------------------------
.input-group-addon
{
// Sizing
&.input-sm
{
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
}
&.input-lg
{
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
}
}
src/less/components/list-group.less
浏览文件 @ cf935add
......@@ -30,8 +30,8 @@
&:last-child { margin-bottom: 0; .border-bottom-radius(@list-group-border-radius); }
// Align badges within list items
> .badge { float: right; }
> .badge + .badge { margin-right: 5px; }
> .label-badge { float: right; }
> .label-badge + .label-badge { margin-right: 5px; }
// Linked list items
a&
......@@ -54,8 +54,8 @@
color: @white;
// Force color to inherit for custom content
.list-group-item-heading { color: @gray-dark; }
.list-group-item-text { color: lighten(@color-fore, 40%); }
.list-group-item-heading { color: @white; }
.list-group-item-text { color: darken(@white, 10%); }
}
}
......
src/less/components/navs.less
浏览文件 @ cf935add
......@@ -73,15 +73,15 @@
}
}
// Nav dividers (deprecated with v3.0.1)
//
// This should have been removed in v3 with the dropping of `.nav-list`, but
// we missed it. We don't currently support this anywhere, but in the interest
// of maintaining backward compatibility in case you use it, it's deprecated.
.nav-divider
{
.nav-divider();
}
// // Nav dividers (deprecated with v3.0.1)
// //
// // This should have been removed in v3 with the dropping of `.nav-list`, but
// // we missed it. We don't currently support this anywhere, but in the interest
// // of maintaining backward compatibility in case you use it, it's deprecated.
// .nav-divider
// {
// .nav-divider();
// }
// Prevent IE8 from misplacing imgs
//
......@@ -92,56 +92,6 @@
}
}
// Tabs
// -------------------------
// Give the tabs something to sit on
.nav-tabs {
border-bottom: 1px solid @nav-tabs-border-color;
> li
{
float: left;
// Make the list-items overlay the bottom border
margin-bottom: -1px;
// Actual tabs (as links)
> a
{
margin-right: 2px;
line-height: @line-height-base;
border: 1px solid transparent;
border-radius: @border-radius-base @border-radius-base 0 0;
&:hover
{
border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
}
}
// Active state, and it's :hover to override normal :hover
&.active > a
{
&,
&:hover,
&:focus
{
color: @nav-tabs-active-link-hover-color;
background-color: @nav-tabs-active-link-hover-bg;
border: 1px solid @nav-tabs-active-link-hover-border-color;
border-bottom-color: transparent;
cursor: default;
}
}
}
// pulling this in mainly for less shorthand
&.nav-justified
{
.nav-justified();
.nav-tabs-justified();
}
}
// Pills
// -------------------------
.nav-pills
......@@ -432,68 +382,6 @@
}
}
// Move borders to anchors instead of bottom of list
.nav-tabs-justified
{
border-bottom: 0;
> li > a
{
// Override margin from .nav-tabs
margin-right: 0;
border-radius: @border-radius-base;
}
> .active > a,
> .active > a:hover,
> .active > a:focus
{
border: 1px solid @nav-tabs-justified-link-border-color;
}
@media (min-width: @screen-sm-min)
{
> li > a
{
border-bottom: 1px solid @nav-tabs-justified-link-border-color;
border-radius: @border-radius-base @border-radius-base 0 0;
}
> .active > a,
> .active > a:hover,
> .active > a:focus
{
border-bottom-color: @nav-tabs-justified-active-link-border-color;
}
}
}
// Tabbable tabs
// -------------------------
// Clear any floats
.tabbable
{
.clearfix();
}
// Show/hide tabbable areas
.tab-content > .tab-pane,
.pill-content > .pill-pane
{
display: none;
}
.tab-content,
.pill-content
{
> .active
{
display: block;
}
}
// Dropdowns
// -------------------------
......@@ -508,12 +396,3 @@
border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color;
}
// Specific dropdowns
.nav-tabs .dropdown-menu
{
// make dropdown border overlap tab border
margin-top: -1px;
// Remove the top rounded corners here since there is a hard edge above the menu
.border-top-radius(0);
}
src/less/components/navs.tabs.less 0 → 100644
浏览文件 @ cf935add
// Move borders to anchors instead of bottom of list
.nav-tabs-justified
{
border-bottom: 0;
> li > a
{
// Override margin from .nav-tabs
margin-right: 0;
border-radius: @border-radius-base;
}
> .active > a,
> .active > a:hover,
> .active > a:focus
{
border: 1px solid @nav-tabs-justified-link-border-color;
}
@media (min-width: @screen-sm-min)
{
> li > a
{
border-bottom: 1px solid @nav-tabs-justified-link-border-color;
border-radius: @border-radius-base @border-radius-base 0 0;
}
> .active > a,
> .active > a:hover,
> .active > a:focus
{
border-bottom-color: @nav-tabs-justified-active-link-border-color;
}
}
}
// Tabs
// -------------------------
// Give the tabs something to sit on
.nav-tabs
{
border-bottom: 1px solid @nav-tabs-border-color;
> li
{
float: left;
// Make the list-items overlay the bottom border
margin-bottom: -1px;
// Actual tabs (as links)
> a
{
margin-right: 2px;
line-height: @line-height-base;
border: 1px solid transparent;
border-radius: @border-radius-base @border-radius-base 0 0;
&:hover
{
border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
}
}
// Active state, and it's :hover to override normal :hover
&.active > a
{
&,
&:hover,
&:focus
{
color: @nav-tabs-active-link-hover-color;
background-color: @nav-tabs-active-link-hover-bg;
border: 1px solid @nav-tabs-active-link-hover-border-color;
border-bottom-color: transparent;
cursor: default;
}
}
}
// pulling this in mainly for less shorthand
&.nav-justified
{
.nav-justified();
.nav-tabs-justified();
}
}
// Tabbable tabs
// -------------------------
// Clear any floats
.tabbable
{
.clearfix();
}
// Show/hide tabbable areas
.tab-content > .tab-pane,
.pill-content > .pill-pane
{
display: none;
}
.tab-content,
.pill-content
{
> .active
{
display: block;
}
}
// Specific dropdowns
.nav-tabs .dropdown-menu
{
// make dropdown border overlap tab border
margin-top: -1px;
// Remove the top rounded corners here since there is a hard edge above the menu
.border-top-radius(0);
}
src/less/components/pager.less
浏览文件 @ cf935add
......@@ -108,12 +108,4 @@
}
}
&.pager-pills > li
{
> a,
> span
{
border-radius: @pager-border-radius;
}
}
}
src/less/components/pager.types.less
浏览文件 @ cf935add
......@@ -20,6 +20,16 @@
border-radius: 0 @pager-border-radius @pager-border-radius 0;
}
}
&.pager-justify > li
{
> a,
> span
{
border-radius: @pager-border-radius;
}
}
}
.pager-loose
......
src/less/components/panels.group.less 0 → 100644
浏览文件 @ cf935add
// Collapsable panels (aka, accordion)
//
// Wrap a series of panels in `.panel-group` to turn them into an accordion with
// the help of our collapse JavaScript plugin.
.panel-group
{
// Tighten up margin so it's only between panels
.panel
{
margin-bottom: 0;
border-radius: @panel-border-radius;
overflow: hidden; // crop contents when collapsed
+ .panel { margin-top: 5px; }
}
.panel-heading
{
border-bottom: 0;
+ .panel-collapse .panel-body { border-top: 1px solid @panel-inner-border; }
}
.panel-footer
{
border-top: 0;
+ .panel-collapse .panel-body { border-bottom: 1px solid @panel-inner-border; }
}
// New subcomponent for wrapping collapsable content for proper animations
.panel-collapse { }
}
src/less/components/panels.less
浏览文件 @ cf935add
......@@ -17,37 +17,6 @@
// Panel contents
.panel-body { padding: 15px; .clearfix(); }
// List groups in panels
//
// By default, space out list group content from panel headings to account for
// any kind of custom content between the two.
.panel
{
> .list-group
{
margin-bottom: 0;
.list-group-item
{
border-width: 1px 0;
// Remove border radius for top one
&:first-child { .border-top-radius(0); }
// But keep it for the last one
&:last-child { border-bottom: 0; }
}
}
}
// Collapse space between when there's no additional content.
.panel-heading + .list-group
{
.list-group-item:first-child
{
border-top-width: 0;
}
}
// Tables in panels
//
......@@ -77,43 +46,12 @@
> a { color: inherit; }
}
// Optional footer (stays gray in every modifier class)
.panel-footer
{
padding: 10px 15px;
background-color: @panel-footer-bg;
border-top: 1px solid @panel-inner-border;
.border-bottom-radius(@panel-border-radius - 1);
}
// Collapsable panels (aka, accordion)
//
// Wrap a series of panels in `.panel-group` to turn them into an accordion with
// the help of our collapse JavaScript plugin.
.panel-group
{
// Tighten up margin so it's only between panels
.panel
{
margin-bottom: 0;
border-radius: @panel-border-radius;
overflow: hidden; // crop contents when collapsed
+ .panel { margin-top: 5px; }
}
// // Optional footer (stays gray in every modifier class)
// .panel-footer
// {
// padding: 10px 15px;
// background-color: @panel-footer-bg;
// border-top: 1px solid @panel-inner-border;
// .border-bottom-radius(@panel-border-radius - 1);
// }
.panel-heading
{
border-bottom: 0;
+ .panel-collapse .panel-body { border-top: 1px solid @panel-inner-border; }
}
.panel-footer
{
border-top: 0;
+ .panel-collapse .panel-body { border-bottom: 1px solid @panel-inner-border; }
}
// New subcomponent for wrapping collapsable content for proper animations
.panel-collapse { }
}
src/less/components/panels.list-group.less 0 → 100644
浏览文件 @ cf935add
// List groups in panels
//
// By default, space out list group content from panel headings to account for
// any kind of custom content between the two.
.panel
{
> .list-group
{
margin-bottom: 0;
.list-group-item
{
border-width: 1px 0;
// Remove border radius for top one
&:first-child { .border-top-radius(0); }
// But keep it for the last one
&:last-child { border-bottom: 0; }
}
}
}
// Collapse space between when there's no additional content.
.panel-heading + .list-group
{
.list-group-item:first-child
{
border-top-width: 0;
}
}
src/less/components/tables.less
浏览文件 @ cf935add
......@@ -25,25 +25,18 @@ th
margin-bottom: @line-height-computed;
// Cells
>thead,
>tbody,
>tfoot
th,
td
{
>tr
{
>th,
>td
{
padding: @table-cell-padding;
line-height: @line-height-base;
vertical-align: top;
border-bottom: 1px solid @table-border-color;
// border-top: 1px solid lighten(@table-border-color, 5%);
.transition(all,@animation-speed-fast,@animation-type);
}
}
padding: @table-cell-padding;
line-height: @line-height-base;
vertical-align: top;
border-bottom: 1px solid @table-border-color;
// border-top: 1px solid lighten(@table-border-color, 5%);
.transition(all,@animation-speed-fast,@animation-type);
}
// Bottom align for column headings
> thead > tr > th
{
......@@ -58,18 +51,10 @@ th
.table-condensed
{
> thead,
> tbody,
> tfoot
th,
td
{
> tr
{
> th,
> td
{
padding: @table-condensed-cell-padding;
}
}
padding: @table-condensed-cell-padding;
}
}
......@@ -80,18 +65,10 @@ th
.table-bordered
{
border: 1px solid @table-border-color;
> thead,
> tbody,
> tfoot
th,
td
{
> tr
{
> th,
> td
{
border: 1px solid @table-border-color;
}
}
border: 1px solid @table-border-color;
}
}
......@@ -150,9 +127,7 @@ table
// Exact selectors below required to override `.table-striped` and prevent
// inheritance to nested tables.
.table > thead > tr,
.table > tbody > tr,
.table > tfoot > tr
.table tr
{
> td.active,
> th.active,
......
src/less/controls/buttons.less
浏览文件 @ cf935add
......@@ -2,20 +2,6 @@
// Buttons
// ==================================================
// Mixins
// --------------------------------------------------
// Button sizes
.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius)
{
padding: @padding-vertical @padding-horizontal;
font-size: @font-size;
line-height: @line-height;
border-radius: @border-radius;
}
// Base styles
// --------------------------------------------------
......@@ -34,7 +20,7 @@
white-space: nowrap;
.button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
.user-select(none);
.transition(all,@animation-speed-normal,@animation-type);
.transition(all,@animation-speed-slow,@animation-type);
@shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
.box-shadow(@shadow);
......@@ -78,20 +64,20 @@
.btn
{
.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
.button-styles(@btn-default-bg;);
// .button-styles(@btn-default-bg;);
text-shadow: 0 1px 0 #fff; border-color: #ccc;
}
.btn-primary
{
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
.button-styles(@btn-primary-bg);
// .button-styles(@btn-primary-bg);
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
}
// Warning appears as orange
.btn-warning
{
.button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
.button-styles(@btn-warning-bg);
// .button-styles(@btn-warning-bg);
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
}
// Danger and error appear as red
......@@ -105,14 +91,14 @@
.btn-success
{
.button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
.button-styles(@btn-success-bg);
// .button-styles(@btn-success-bg);
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
}
// Info appears as blue-green
.btn-info
{
.button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
.button-styles(@btn-info-bg);
// .button-styles(@btn-info-bg);
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
}
......@@ -424,89 +410,89 @@ input[type="button"]
// Vertical button groups
// ----------------------
.btn-group-vertical
{
> .btn,
> .btn-group
{
display: block;
float: none;
width: 100%;
max-width: 100%;
}
// Clear floats so dropdown menus can be properly placed
> .btn-group
{
.clearfix();
> .btn
{
float: none;
}
}
> .btn + .btn,
> .btn + .btn-group,
> .btn-group + .btn,
> .btn-group + .btn-group
{
margin-top: -1px;
margin-left: 0;
}
}
.btn-group-vertical > .btn
{
&:not(:first-child):not(:last-child)
{
border-radius: 0;
}
&:first-child:not(:last-child)
{
border-top-right-radius: @border-radius-base;
.border-bottom-radius(0);
}
&:last-child:not(:first-child)
{
border-bottom-left-radius: @border-radius-base;
.border-top-radius(0);
}
}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn
{
border-radius: 0;
}
.btn-group-vertical > .btn-group:first-child
{
> .btn:last-child,
> .dropdown-toggle
{
.border-bottom-radius(0);
}
}
.btn-group-vertical > .btn-group:last-child > .btn:first-child
{
.border-top-radius(0);
}
// Justified button groups
// ----------------------
.btn-group-justified
{
display: table;
width: 100%;
table-layout: fixed;
border-collapse: separate;
.btn
{
float: none;
display: table-cell;
width: 1%;
}
}
// .btn-group-vertical
// {
// > .btn,
// > .btn-group
// {
// display: block;
// float: none;
// width: 100%;
// max-width: 100%;
// }
// // Clear floats so dropdown menus can be properly placed
// > .btn-group
// {
// .clearfix();
// > .btn
// {
// float: none;
// }
// }
// > .btn + .btn,
// > .btn + .btn-group,
// > .btn-group + .btn,
// > .btn-group + .btn-group
// {
// margin-top: -1px;
// margin-left: 0;
// }
// }
// .btn-group-vertical > .btn
// {
// &:not(:first-child):not(:last-child)
// {
// border-radius: 0;
// }
// &:first-child:not(:last-child)
// {
// border-top-right-radius: @border-radius-base;
// .border-bottom-radius(0);
// }
// &:last-child:not(:first-child)
// {
// border-bottom-left-radius: @border-radius-base;
// .border-top-radius(0);
// }
// }
// .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn
// {
// border-radius: 0;
// }
// .btn-group-vertical > .btn-group:first-child
// {
// > .btn:last-child,
// > .dropdown-toggle
// {
// .border-bottom-radius(0);
// }
// }
// .btn-group-vertical > .btn-group:last-child > .btn:first-child
// {
// .border-top-radius(0);
// }
// // Justified button groups
// // ----------------------
// .btn-group-justified
// {
// display: table;
// width: 100%;
// table-layout: fixed;
// border-collapse: separate;
// .btn
// {
// float: none;
// display: table-cell;
// width: 1%;
// }
// }
// Checkbox and radio options
......
src/less/controls/headers.less
浏览文件 @ cf935add
......@@ -25,20 +25,20 @@ h6
margin-top: (@line-height-computed / 2);
margin-bottom: (@line-height-computed / 2);
small {
small
{
font-size: 75%;
}
}
h1, .h1 { font-size: @font-size-h1; }
h2, .h2 { font-size: @font-size-h2; }
h3, .h3 { font-size: @font-size-h3; }
h4, .h4 { font-size: @font-size-h4; }
h5, .h5 { font-size: @font-size-h5; }
h6, .h6 { font-size: @font-size-h6; }
h1{ font-size: @font-size-h1; }
h2{ font-size: @font-size-h2; }
h3{ font-size: @font-size-h3; }
h4{ font-size: @font-size-h4; }
h5{ font-size: @font-size-h5; }
h6{ font-size: @font-size-h6; }
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6
h1, h2, h3, h4, h5, h6
{
font-family: @headings-font-family;
font-weight: @headings-font-weight;
......@@ -51,30 +51,23 @@ h1, h2, h3, h4, h5, h6,
line-height: 1;
color: @headings-small-color;
&.block
{
display: block;
line-height: @headings-line-height;
font-size: @font-size-base;
}
}
.icon
{
display: inline-block;
margin-right: 0.25em;
line-height: 30px;
// &.block
// {
// display: block;
// line-height: @headings-line-height;
// font-size: @font-size-base;
// }
}
&.header-block
{
background-color: @headings-block-background;
padding: @padding-base-vertical @padding-base-horizontal;
}
// &.header-block
// {
// background-color: @headings-block-background;
// padding: @padding-base-vertical @padding-base-horizontal;
// }
&.header-dividing
{
border-bottom: 1px solid @header-dividing-color;
padding-bottom: ((@line-height-computed / 2) - 1);
}
}
\ No newline at end of file
}
src/less/controls/labels.less
浏览文件 @ cf935add
......@@ -30,41 +30,29 @@
// Empty labels collapse automatically (not available in IE8)
&:empty { display: none; }
}
&.label-badge
{
display: inline-block;
border-radius: @badge-border-radius;
min-width: 10px;
padding: 5px 7px;
font-size: @font-size-small;
// font-weight: @badge-font-weight;
line-height: @badge-line-height;
}
&.label-dot
{
text-indent: -9999em;
&:empty { display: inline-block; }
display: inline-block;
padding: 0px;
border-radius: 5px;
width: 10px;
height: 10px;
line-height: 14px;
}
.label-badge
{
display: inline-block;
border-radius: @badge-border-radius;
min-width: 10px;
padding: 5px 7px;
font-size: @font-size-small;
// font-weight: @badge-font-weight;
line-height: @badge-line-height;
}
// Hover state, but only for links
a.label-badge
.label-dot
{
&:hover,
&:focus
{
color: @badge-link-hover-color;
text-decoration: none;
cursor: pointer;
}
text-indent: -9999em;
&:empty { display: inline-block; }
display: inline-block;
padding: 0px;
border-radius: 5px;
width: 10px;
height: 10px;
line-height: 14px;
}
// Quick fix for labels/badges in buttons
......
src/less/controls/type.less
浏览文件 @ cf935add
......@@ -51,70 +51,42 @@ cite { font-style: normal; }
.text-primary
{
color: @color-primary;
&:hover
{
color: darken(@color-primary, 10%);
}
}
.text-warning
{
color: @state-warning-text;
&:hover
{
color: darken(@state-warning-text, 10%);
}
}
.text-danger
{
color: @state-danger-text;
&:hover
{
color: darken(@state-danger-text, 10%);
}
}
.text-success
{
color: @state-success-text;
&:hover
{
color: darken(@state-success-text, 10%);
}
}
.text-info
{
color: @state-info-text;
&:hover
{
color: darken(@state-info-text, 10%);
}
}
.text-important
{
color: @state-important-text;
&:hover
{
color: darken(@state-important-text, 10%);
}
}
.text-special
{
color: @state-special-text;
&:hover
{
color: darken(@state-special-text, 10%);
}
}
// link with text color
.text-link
{
color: @color-fore;
&:hover,
&:active
{
color: @link-color;
}
}
// // link with text color
// .text-link
// {
// color: @color-fore;
// &:hover,
// &:active
// {
// color: @link-color;
// }
// }
// Alignment
.text-left { text-align: left; }
......@@ -145,21 +117,22 @@ ol
padding-left: 0;
list-style: none;
}
// Inline turns list items into inline-block
.list-inline
{
.list-unstyled();
> li
{
display: inline-block;
padding-left: 5px;
padding-right: 5px;
&:first-child
{
padding-left: 0;
}
}
}
// .list-inline
// {
// .list-unstyled();
// > li
// {
// display: inline-block;
// padding-left: 5px;
// padding-right: 5px;
// &:first-child
// {
// padding-left: 0;
// }
// }
// }
// Description Lists
dl
......@@ -196,7 +169,6 @@ dd
padding-right: 0;
}
}
}
// Horizontal description lists
......
src/less/modules/carousel.less
浏览文件 @ cf935add
......@@ -39,6 +39,7 @@
position: absolute;
top: 0;
width: 100%;
}
> .next {
......@@ -75,6 +76,7 @@
color: @carousel-control-color;
text-align: center;
text-shadow: @carousel-text-shadow;
outline: none;
// We can't have this transition here because webkit cancels the carousel
// animation if you trip this while in the middle of another animation.
......@@ -93,6 +95,7 @@
&:focus {
color: @carousel-control-color;
text-decoration: none;
outline: none;
.opacity(.9);
}
......
src/less/modules/modals.less
浏览文件 @ cf935add
......@@ -42,14 +42,7 @@
margin-left: auto;
margin-right: auto;
width: auto;
padding: 10px;
z-index: (@zindex-modal-background + 10);
}
// Actual modal
.modal-content
{
position: relative;
background-color: @modal-content-bg;
border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
border: 1px solid @modal-content-border-color;
......@@ -120,11 +113,9 @@
{
.modal-dialog
{
left: 50%;
right: auto;
width: 75%;
padding-top: 30px;
padding-bottom: 30px;
margin-top: 30px;
margin-bottom: 30px;
.box-shadow(0 5px 15px rgba(0,0,0,.5));
}
.modal-content { .box-shadow(0 5px 15px rgba(0,0,0,.5)); }
}
src/less/views/article.less
浏览文件 @ cf935add
......@@ -7,9 +7,6 @@
h1,
h2,
h3,
.h1,
.h2,
.h3
{
line-height: 1.5;
}
......@@ -68,30 +65,39 @@
}
h4
{
margin-top: 20px;
margin-top: 15px;
font-size: @article-font-size-h4;
}
h5
{
margin-top: 20px;
margin-top: 15px;
font-size: @article-font-size-h5;
}
h6
{
margin-top: 20px;
margin-top: 15px;
font-size: @article-font-size-h6;
}
img
{
margin-bottom: @line-height-computed / 2;
border-radius: @border-radius-base;
margin: @line-height-computed / 2 0;
.transition(all,@animation-speed-normal,@animation-type);
.box-shadow(@article-img-shadow);
}
p
{
margin: 0;
&:hover
> img
{
.box-shadow(@article-img-shadow-hover);
margin-right: 10px;
&[align='right']
{
margin-left: 10px;
}
}
}
......@@ -107,24 +113,17 @@
margin-bottom: @line-height-computed;
// Cells
>thead,
>tbody,
>tfoot
th,
td
{
>tr
{
>th,
>td
{
padding: @table-cell-padding;
line-height: @line-height-base;
vertical-align: top;
border-bottom: 1px solid @table-border-color;
.transition(all,@animation-speed-fast,@animation-type);
}
}
padding: @table-cell-padding;
line-height: @line-height-base;
vertical-align: top;
border-bottom: 1px solid @table-border-color;
.transition(all,@animation-speed-fast,@animation-type);
}
// Bottom align for column headings
> thead > tr > th
{
......
src/less/views/cards.caption.less 0 → 100644
浏览文件 @ cf935add
.card
{
> .caption
{
position: absolute;
top: -100%;
left: 0;
width: 100%;
display: block;
background-color: #666;
background-color: rgba(0,0,0,0.7);
color: #fff;
overflow: hidden;
padding: 5px 10px;
text-align: center;
.transition(all, @animation-speed-slow, @animation-type);
.opacity(0);
}
&:hover
{
> .caption
{
top: 0;
.opacity(1);
}
}
}
src/less/views/cards.condensed.less 0 → 100644
浏览文件 @ cf935add
.cards-condensed
{
border: 1px solid @card-border-color;
border-left: 0;
border-top: 0;
padding: 0;
> [class^="col-"],
> [class*=" col-"]
{
padding: 0;
}
.card
{
border-right: 0;
border-bottom: 0;
margin: 0;
padding: 10px;
.box-shadow(0 1px 2px rgba(0,0,0,.015));
}
}
src/less/views/cards.less
浏览文件 @ cf935add
......@@ -39,23 +39,6 @@
}
}
> .caption
{
position: absolute;
top: -100%;
left: 0;
width: 100%;
display: block;
background-color: #666;
background-color: rgba(0,0,0,0.5);
color: #fff;
overflow: hidden;
padding: 5px 10px;
text-align: center;
.transition(all, @animation-speed-slow, @animation-type);
.opacity(0);
}
.card-heading
{
display: block;
......@@ -79,30 +62,9 @@
}
}
> .card-reveal
{
position: absolute;
top: 100%;
left: 0;
width: 100%;
height: 100%;
background-color: @card-reveal-bg;
.transition(all, @animation-speed-slow, @animation-type);
> .card-heading
{
padding: 20px 10px;
}
}
&:hover
{
.box-shadow(~"0 1px 5px rgba(0,0,0,.175)");
> .caption
{
top: 0;
.opacity(1);
}
> img,
> .media-wrapper
......@@ -128,29 +90,6 @@ a.card:hover,.card:hover a
text-decoration: none;
}
.cards-condensed
{
border: 1px solid @card-border-color;
border-left: 0;
border-top: 0;
padding: 0;
> [class^="col-"],
> [class*=" col-"]
{
padding: 0;
}
.card
{
border-right: 0;
border-bottom: 0;
margin: 0;
padding: 10px;
.box-shadow(0 1px 2px rgba(0,0,0,.015));
}
}
.cards-borderless
{
.card
......@@ -165,10 +104,5 @@ a.card:hover,.card:hover a
padding-left: 0;
padding-right: 0;
}
// > .media-wrapper
// {
// }
}
}
\ No newline at end of file
}
src/less/views/cards.reveal.less 0 → 100644
浏览文件 @ cf935add
.card
{
> .card-reveal
{
position: absolute;
top: 100%;
left: 0;
width: 100%;
height: 100%;
background-color: @card-reveal-bg;
.transition(all, @animation-speed-slow, @animation-type);
> .card-heading
{
padding: 20px 10px;
}
}
&:hover
{
> .card-reveal
{
top: 0;
}
}
}
src/less/views/comment.less
浏览文件 @ cf935add
......@@ -5,32 +5,31 @@
padding-bottom: 10px;
border-bottom: 1px solid @gray-lighter;
> .alert
{
padding: @alert-padding/2 @alert-padding;
margin-bottom: -10px;
}
// > .alert
// {
// padding: @alert-padding/2 @alert-padding;
// margin-bottom: -10px;
// }
}
> footer
{
padding-top: 10px;
> .reply-form
{
> .avatar
{
display: block;
width: 40px;
height: 40px;
float: left;
margin-top: 10px;
}
> .avatar + .form
{
padding-left: 50px;
}
}
// > .reply-form
// {
// > .avatar
// {
// display: block;
// width: 40px;
// height: 40px;
// float: left;
// margin-top: 10px;
// }
// > .avatar + .form
// {
// padding-left: 50px;
// }
// }
}
}
......@@ -110,4 +109,4 @@
}
}
}
}
\ No newline at end of file
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或