Browse Source

Fix doubling stackable grid, text alignment on some elements

pull/1129/head
jlukic 10 years ago
parent
commit
f6b55debf6
7 changed files with 50 additions and 47 deletions
  1. 72
      src/definitions/collections/grid.less
  2. 18
      src/definitions/elements/header.less
  3. 1
      src/definitions/elements/input.less
  4. 1
      src/definitions/modules/dropdown.less
  5. 2
      src/themes/packages/default/elements/icon.overrides
  6. 1
      src/themes/packages/default/elements/input.variables
  7. 2
      src/themes/packages/default/globals/site.variables

72
src/definitions/collections/grid.less

@ -873,64 +873,64 @@
padding-bottom: (@rowSpacing / 2) !important;
margin: 0em;
}
.ui[class*="two column"].doubling.grid > .row > .column,
.ui[class*="two column"].doubling.grid > .column,
.ui.grid > [class*="two column"].doubling.row > .column {
.ui[class*="two column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="two column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="two column"].doubling:not(.stackable).row > .column {
width: @oneColumn !important;
}
.ui[class*="three column"].doubling.grid > .row > .column,
.ui[class*="three column"].doubling.grid > .column,
.ui.grid > [class*="three column"].doubling.row > .column {
.ui[class*="three column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="three column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="three column"].doubling:not(.stackable).row > .column {
width: @twoColumn !important;
}
.ui[class*="four column"].doubling.grid > .row > .column,
.ui[class*="four column"].doubling.grid > .column,
.ui.grid > [class*="four column"].doubling.row > .column {
.ui[class*="four column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="four column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="four column"].doubling:not(.stackable).row > .column {
width: @twoColumn !important;
}
.ui[class*="five column"].doubling.grid > .row > .column,
.ui[class*="five column"].doubling.grid > .column,
.ui.grid > [class*="five column"].doubling.row > .column {
.ui[class*="five column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="five column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="five column"].doubling:not(.stackable).row > .column {
width: @twoColumn !important;
}
.ui[class*="six column"].doubling.grid > .row > .column,
.ui[class*="six column"].doubling.grid > .column,
.ui.grid > [class*="six column"].doubling.row > .column {
.ui[class*="six column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="six column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="six column"].doubling:not(.stackable).row > .column {
width: @twoColumn !important;
}
.ui[class*="seven column"].doubling.grid > .row > .column,
.ui[class*="seven column"].doubling.grid > .column,
.ui.grid > [class*="seven column"].doubling.row > .column {
.ui[class*="seven column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="seven column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="seven column"].doubling:not(.stackable).row > .column {
width: @threeColumn !important;
}
.ui[class*="eight column"].doubling.grid > .row > .column,
.ui[class*="eight column"].doubling.grid > .column,
.ui.grid > [class*="eight column"].doubling.row > .column {
.ui[class*="eight column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="eight column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="eight column"].doubling:not(.stackable).row > .column {
width: @threeColumn !important;
}
.ui[class*="nine column"].doubling.grid > .row > .column,
.ui[class*="nine column"].doubling.grid > .column,
.ui.grid > [class*="nine column"].doubling.row > .column {
.ui[class*="nine column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="nine column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="nine column"].doubling:not(.stackable).row > .column {
width: @threeColumn !important;
}
.ui[class*="ten column"].doubling.grid > .row > .column,
.ui[class*="ten column"].doubling.grid > .column,
.ui.grid > [class*="ten column"].doubling.row > .column {
.ui[class*="ten column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="ten column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="ten column"].doubling:not(.stackable).row > .column {
width: @threeColumn !important;
}
.ui[class*="twelve column"].doubling.grid > .row > .column,
.ui[class*="twelve column"].doubling.grid > .column,
.ui.grid > [class*="twelve column"].doubling.row > .column {
.ui[class*="twelve column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="twelve column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="twelve column"].doubling:not(.stackable).row > .column {
width: @fourColumn !important;
}
.ui[class*="fourteen column"].doubling.grid > .row > .column,
.ui[class*="fourteen column"].doubling.grid > .column,
.ui.grid > [class*="fourteen column"].doubling.row > .column {
.ui[class*="fourteen column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="fourteen column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="fourteen column"].doubling:not(.stackable).row > .column {
width: @fourColumn !important;
}
.ui[class*="sixteen column"].doubling.grid > .row > .column,
.ui[class*="sixteen column"].doubling.grid > .column,
.ui.grid > [class*="sixteen column"].doubling.row > .column {
.ui[class*="sixteen column"].doubling:not(.stackable).grid > .row > .column,
.ui[class*="sixteen column"].doubling:not(.stackable).grid > .column,
.ui.grid > [class*="sixteen column"].doubling:not(.stackable).row > .column {
width: @fourColumn !important;
}
}

18
src/definitions/elements/header.less

@ -144,7 +144,7 @@ h5.ui.header {
--------------------*/
.ui.icon.header {
display: inline-block;
display: block;
text-align: center;
}
.ui.icon.header .icon {
@ -199,56 +199,56 @@ a.ui.black.header:hover {
}
.ui.blue.header {
color: @blueHeaderColor !important;
color: @blue !important;
}
a.ui.blue.header:hover {
color: @blueHover !important;
}
.ui.green.header {
color: @greenHeaderColor !important;
color: @green !important;
}
a.ui.green.header:hover {
color: @greenHover !important;
}
.ui.orange.header {
color: @orangeHeaderColor !important;
color: @orange !important;
}
a.ui.orange.header:hover {
color: @orangeHover !important;
}
.ui.pink.header {
color: @pinkHeaderColor !important;
color: @pink !important;
}
a.ui.pink.header:hover {
color: @pinkHover !important;
}
.ui.purple.header {
color: @purpleHeaderColor !important;
color: @purple !important;
}
a.ui.purple.header:hover {
color: @purpleHover !important;
}
.ui.red.header {
color: @redHeaderColor !important;
color: @red !important;
}
a.ui.red.header:hover {
color: @redHover !important;
}
.ui.teal.header {
color: @tealHeaderColor !important;
color: @teal !important;
}
a.ui.teal.header:hover {
color: @tealHover !important;
}
.ui.yellow.header {
color: @yellowHeaderColor !important;
color: @yellow !important;
}
a.ui.yellow.header:hover {
color: @yellowHover !important;

1
src/definitions/elements/input.less

@ -37,6 +37,7 @@
margin: 0em;
width: 100%;
outline: none;
text-align: @textAlign;
line-height: @lineHeight;
font-family: @pageFont;

1
src/definitions/modules/dropdown.less

@ -31,6 +31,7 @@
transition: @transition;
tap-highlight-color: rgba(0, 0, 0, 0);
outline: none;
text-align: left;
}

2
src/themes/packages/default/elements/icon.overrides

@ -533,7 +533,6 @@ i.icon.wechat:before { content: "\f1d7"; }
i.icon.like:before { content: "\f004"; }
i.icon.favorite:before { content: "\f005"; }
i.icon.video:before { content: "\f008"; }
i.icon.sidebar:before { content: "\f00b"; }
i.icon.check:before { content: "\f00c"; }
i.icon.remove:before { content: "\f00d"; }
i.icon.close:before { content: "\f00d"; }
@ -598,6 +597,7 @@ i.icon.wrench:before { content: "\f0ad"; }
i.icon.briefcase:before { content: "\f0b1"; }
i.icon.group:before { content: "\f0c0"; }
i.icon.flask:before { content: "\f0c3"; }
i.icon.sidebar:before { content: "\f0c9"; }
i.icon.bars:before { content: "\f0c9"; }
i.icon.list.ul:before { content: "\f0ca"; }
i.icon.list.ol:before { content: "\f0cb"; }

1
src/themes/packages/default/elements/input.variables

@ -13,6 +13,7 @@
@lineHeight: 1.2em;
@padding: (@verticalPadding - @lineHeightOffset) @horizontalPadding;
@textAlign: left;
@background: #FFFFFF;
@borderWidth: 1px;
@border: @borderWidth solid rgba(0, 0, 0, 0.15);

2
src/themes/packages/default/globals/site.variables

@ -302,7 +302,7 @@
@circularRadius : 500rem;
@borderColor : rgba(0, 0, 0, 0.1);
@borderColor : rgba(0, 0, 0, 0.15);
@selectedBorderColor : rgba(0, 0, 0, 0.2);
@solidBorderColor : #DDDDDD;

Loading…
Cancel
Save