Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/scss/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Contextual colors and backgrounds http://v4-alpha.getbootstrap.com/components/utilities/#contextual-colors-and-backgrounds
.text-primary {
@include colorize($color: accent);
}

.text-danger {
color: const(error);
}

.bg-primary {
@include colorize($color: accent);
color: $white;
}

.bg-danger {
background-color: const(error);
color: $white;
}

// Image shapes http://v4-alpha.getbootstrap.com/content/images/#image-shapes
.img-rounded {
border-radius: const(border-radius-sm);
}

.img-circle {
border-radius: const(border-radius-lg);
}

5 changes: 5 additions & 0 deletions src/scss/_controls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@

// Forms

@include form-skin(
('Form',
'.nt-form')
);

@include form-fields-skin();

@include input-component-skin(
Expand Down
1 change: 1 addition & 0 deletions src/scss/_index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Specifics
@import './controls';
@import './bootstrap';

/* Dividers */

Expand Down
28 changes: 0 additions & 28 deletions src/scss/core/primitives/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@

// # BOOTSTRAP #
// ## Utilities ##
// Image shapes http://v4-alpha.getbootstrap.com/content/images/#image-shapes
.img-rounded {
border-radius: const(border-radius-sm);
}

.img-circle {
border-radius: const(border-radius-lg);
}

.img-thumbnail {
border-radius: 0;
}
Expand All @@ -35,22 +26,3 @@
.m-y-auto {
vertical-align: center;
}

// Contextual colors and backgrounds http://v4-alpha.getbootstrap.com/components/utilities/#contextual-colors-and-backgrounds
.text-primary {
color: light(accent);
}

.text-danger {
color: const(error);
}

.bg-primary {
background-color: light(accent);
color: $white;
}

.bg-danger {
background-color: const(error);
color: $white;
}
39 changes: 20 additions & 19 deletions src/scss/mixins/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@

@mixin form($selectors) {
#{$selectors} {
font-family: 'Roboto Regular';
padding: 16 0 10;

.ns-ios & {
font-family: 'SF UI Text Regular', system;
}

.-center {
horizontal-align: center;
}
Expand All @@ -17,21 +12,12 @@
margin: 20 0;
}

.nt-form__link {
@include colorize($color: accent);
}

.nt-form__title {
font-size: const(btn-font-size);
}

.nt-form__logo {
margin: 20 0;
width: 50%;
}

.nt-form__validation-message {
color: const(error);
margin: 1 0 0;
padding: 0;
height: 19;
Expand All @@ -46,11 +32,6 @@
margin: 5;
}
}

// Set isEnabled="false" on the whole form
&[isEnabled=false] * {
opacity: const(disabled-opacity);
}
}
}

Expand Down Expand Up @@ -332,6 +313,26 @@
}
}

@mixin form-skin($selectors) {
#{$selectors} {
.nt-form__title {
font-size: const(btn-font-size);
}

.nt-form__link {
@include colorize($color: accent);
}

.nt-form__validation-message {
color: const(error);
}

// Set isEnabled="false" on the whole form
&[isEnabled=false] * {
opacity: const(disabled-opacity);
}
}
}

@mixin form-fields-skin() {

Expand Down