Browse Source

Merge branch 'css' of https://github.com/MohammadYounes/Semantic-UI

Conflicts:
	src/elements/input.less
pull/701/merge
jlukic 11 years ago
parent
commit
9c9740fd63
5 changed files with 48 additions and 47 deletions
  1. 2
      .travis.yml
  2. 6
      server/documents/elements/step.html.eco
  3. 4
      src/elements/basic.icon.less
  4. 12
      src/elements/input.less
  5. 71
      src/elements/step.less

2
.travis.yml

@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- "0.11"
before_script:
- npm install -g grunt-cli
- npm update

6
server/documents/elements/step.html.eco

@ -62,13 +62,13 @@ type : 'UI Element'
Shipping
</div>
<div class="ui active two line step">
Billing & <br> Order Confirmation
Billing & Order <br> Confirmation
</div>
<div class="ui disabled step">
Confirm Order
Review
</div>
<div class="ui disabled step">
Complete
Receipt
</div>
</div>
</div>

4
src/elements/basic.icon.less

@ -144,8 +144,8 @@ i.basic.icon.paint:before { content: '\e7b5'; } /* '' */
i.basic.icon.edit:before { content: '\270d'; } /* '✍' */
i.basic.icon.eject:before { content: '\2ecf'; } /* '⻏' */
i.basic.icon.export:before { content: '\e715'; } /* '' */
i.basic.icon.hide:before { content: '\e80f'; } /* '' */
i.basic.icon.unhide:before { content: '\e70b'; } /* '' */
i.basic.icon.hide:before { content: '\e70b'; } /* '' */
i.basic.icon.unhide:before { content: '\e80f'; } /* '' */
i.basic.icon.facebook:before { content: '\f301'; } /* '' */
i.basic.icon.fast-forward:before { content: '\e804'; } /* '' */
i.basic.icon.fire:before { content: '🔥'; } /* '\1f525' */

12
src/elements/input.less

@ -249,10 +249,14 @@
.ui.labeled.input .corner.label {
font-size: 0.7em;
-webkit-border-top-right-radius: 0.3125em;
-moz-border-top-right-radius: 0.3125em;
border-top-right-radius: 0.3125em;
-webkit-border-radius: 0 0.3125em;
-moz-border-radius: 0 0.3125em;
border-radius: 0 0.3125em;
}
.ui.labeled.input .left.corner.label {
-webkit-border-radius: 0.3125em 0;
-moz-border-radius: 0.3125em 0;
border-radius: 0.3125em 0;
}
.ui.labeled.input input {
padding-right: 2.5em !important;

71
src/elements/step.less

@ -33,41 +33,45 @@
position: absolute;
z-index: 2;
content: '';
top: 0em;
right: -1.45em;
border-bottom: 1.5em solid transparent;
border-left: 1.5em solid #FFFFFF;
border-top: 1.5em solid transparent;
width: 0em;
height: 0em;
top: 0.42em;
right: -1em;
border: medium none;
background-color: #FFFFFF;
width: 2.2em;
height: 2.2em;
transform: rotate(-45deg);
box-shadow: -1px -1px 0 0 rgba(0, 0, 0, 0.15) inset;
}
.ui.step,
.ui.steps .step,
.ui.steps .step:after {
-webkit-transition:
background-color 0.1s ease,
opacity 0.1s ease,
color 0.1s ease,
box-shadow 0.1s ease
;
-moz-transition:
background-color 0.1s ease,
opacity 0.1s ease,
color 0.1s ease,
box-shadow 0.1s ease
;
-o-transition:
background-color 0.1s ease,
opacity 0.1s ease,
color 0.1s ease,
box-shadow 0.1s ease
;
-ms-transition:
background-color 0.1s ease,
opacity 0.1s ease,
color 0.1s ease,
box-shadow 0.1s ease
;
transition:
background-color 0.1s ease,
opacity 0.1s ease,
color 0.1s ease,
box-shadow 0.1s ease
@ -78,6 +82,7 @@
Types
*******************************/
/* Vertical */
.ui.vertical.steps {
overflow: visible;
}
@ -101,12 +106,6 @@
display: none;
}
/* Disabled */
.ui.vertical.steps .disabled.step:after {
padding: 1em 2em;
}
/* Active Arrow */
.ui.vertical.steps .active.step:after {
display: block;
@ -117,9 +116,20 @@
line-height: 1.3;
}
.ui.vertical.steps .two.line.active.step:after {
border-top-width: 2.35em;
border-bottom-width: 2.35em;
border-left-width: 1.5em;
position: absolute;
z-index: 2;
content: '';
top: 0em;
right: -1.45em;
background-color: transparent;
border-bottom: 2.35em solid transparent;
border-left: 1.55em solid #555555;
border-top: 2.35em solid transparent;
width: 0em;
height: 0em;
transform: none;
}
@ -190,7 +200,7 @@
.ui.steps .step:hover:after,
.ui.step:hover,
.ui.step.hover::after {
border-left-color: #F7F7F7;
background-color: #F7F7F7;
}
/* Hover */
@ -204,7 +214,7 @@
.ui.steps .step:active:after,
.ui.steps.down::after,
.ui.steps:active::after {
border-left-color: #F0F0F0;
background-color: #F0F0F0;
}
/* Active */
@ -218,7 +228,8 @@
}
.ui.steps .step.active:after,
.ui.active.steps:after {
border-left-color: #555555;
background-color: #555555;
box-shadow: none;
}
/* Disabled */
@ -228,26 +239,12 @@
background-color: #FFFFFF;
color: #CBCBCB;
}
.ui.steps .disabled.step:after,
.ui.disabled.step:after {
border: none;
background-color: #FFFFFF;
top: 0.42em;
right: -1em;
width: 2.15em;
height: 2.15em;
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
-ms-transform: rotate(-45deg);
transform: rotate(-45deg);
-webkit-box-shadow: -1px -1px 0px 0px rgba(0, 0, 0, 0.1) inset;
-moz-box-shadow: -1px -1px 0px 0px rgba(0, 0, 0, 0.1) inset;
box-shadow: -1px -1px 0px 0px rgba(0, 0, 0, 0.1) inset;
}
/*******************************
Variations
*******************************/

Loading…
Cancel
Save